From 5eef27da6e0bb1dbe8ad2d5411dce33a00201bd2 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 3 Jan 2022 19:03:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../definition/BpmDefinitionController.java | 5 +++-- .../controller/model/BpmModelController.java | 20 ++++++++++++------- yudao-admin-ui/src/views/bpm/model/index.vue | 16 +++++++++------ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmDefinitionController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmDefinitionController.java index 39d628c82..097004878 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmDefinitionController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmDefinitionController.java @@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,10 +28,9 @@ public class BpmDefinitionController { @Resource private BpmDefinitionService bpmDefinitionService; - // TODO 芋艿：权限 - @GetMapping ("/page") @ApiOperation(value = "获得流程定义分页") + @PreAuthorize("@ss.hasPermission('bpm:model:query')") // 暂时使用 model 的权限标识 public CommonResult> getDefinitionPage(BpmProcessDefinitionPageReqVO pageReqVO) { return success(bpmDefinitionService.getDefinitionPage(pageReqVO)); } @@ -48,6 +48,7 @@ public class BpmDefinitionController { @GetMapping ("/get-bpmn-xml") @ApiOperation(value = "获得流程定义的 BPMN XML") @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = String.class) + @PreAuthorize("@ss.hasPermission('bpm:model:query')") // 暂时使用 model 的权限标识 public CommonResult getDefinitionBpmnXML(@RequestParam("id") String id) { String bpmnXML = bpmDefinitionService.getDefinitionBpmnXML(id); return success(bpmnXML); diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/BpmModelController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/BpmModelController.java index d4fe10624..9da0a7166 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/BpmModelController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/BpmModelController.java @@ -9,10 +9,12 @@ import cn.iocoder.yudao.framework.common.util.io.IoUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.IOException; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -26,8 +28,6 @@ public class BpmModelController { @Resource private BpmModelService bpmModelService; - // TODO @芋艿：权限、参数校验 - @GetMapping("/page") @ApiOperation(value = "获得模型分页") public CommonResult> getModelPage(ModelPageReqVO pageVO) { @@ -37,7 +37,7 @@ public class BpmModelController { @GetMapping("/get") @ApiOperation("获得模型") @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = String.class) -// @PreAuthorize("@ss.hasPermission('bpm:form:query')") + @PreAuthorize("@ss.hasPermission('bpm:model:query')") public CommonResult getModel(@RequestParam("id") String id) { BpmModelRespVO model = bpmModelService.getModel(id); return success(model); @@ -45,13 +45,15 @@ public class BpmModelController { @PostMapping("/create") @ApiOperation(value = "新建模型") - public CommonResult createModel(@RequestBody BpmModelCreateReqVO createRetVO) { + @PreAuthorize("@ss.hasPermission('bpm:model:create')") + public CommonResult createModel(@Valid @RequestBody BpmModelCreateReqVO createRetVO) { return success(bpmModelService.createModel(createRetVO)); } @PostMapping("/import") @ApiOperation(value = "导入模型") - public CommonResult importModel(BpmModeImportReqVO importReqVO) throws IOException { + @PreAuthorize("@ss.hasPermission('bpm:model:import')") + public CommonResult importModel(@Valid BpmModeImportReqVO importReqVO) throws IOException { BpmModelCreateReqVO createReqVO = BpmModelConvert.INSTANCE.convert(importReqVO); // 读取文件 createReqVO.setBpmnXml(IoUtils.readUtf8(importReqVO.getBpmnFile().getInputStream(), false)); @@ -60,7 +62,8 @@ public class BpmModelController { @PutMapping("/update") @ApiOperation(value = "修改模型") - public CommonResult updateModel(@RequestBody BpmModelUpdateReqVO modelVO) { + @PreAuthorize("@ss.hasPermission('bpm:model:update')") + public CommonResult updateModel(@Valid @RequestBody BpmModelUpdateReqVO modelVO) { bpmModelService.updateModel(modelVO); return success(true); } @@ -68,6 +71,7 @@ public class BpmModelController { @DeleteMapping("/delete") @ApiOperation("删除模型") @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = String.class) + @PreAuthorize("@ss.hasPermission('bpm:model:delete')") public CommonResult deleteModel(@RequestParam("id") String id) { bpmModelService.deleteModel(id); return success(true); @@ -76,6 +80,7 @@ public class BpmModelController { @PostMapping("/deploy") @ApiOperation(value = "部署模型") @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = String.class) + @PreAuthorize("@ss.hasPermission('bpm:model:deploy')") public CommonResult deployModel(@RequestParam("id") String id) { bpmModelService.deployModel(id); return success(true); @@ -83,7 +88,8 @@ public class BpmModelController { @PutMapping("/update-state") @ApiOperation(value = "修改模型的状态", notes = "实际更新的部署的流程定义的状态") - public CommonResult updateModelState(@RequestBody BpmModelUpdateStateReqVO reqVO) { + @PreAuthorize("@ss.hasPermission('bpm:model:update')") + public CommonResult updateModelState(@Valid @RequestBody BpmModelUpdateStateReqVO reqVO) { bpmModelService.updateModelState(reqVO.getId(), reqVO.getState()); return success(true); } diff --git a/yudao-admin-ui/src/views/bpm/model/index.vue b/yudao-admin-ui/src/views/bpm/model/index.vue index db9d8f946..469184fe5 100644 --- a/yudao-admin-ui/src/views/bpm/model/index.vue +++ b/yudao-admin-ui/src/views/bpm/model/index.vue @@ -26,11 +26,11 @@ 新建流程模型 + v-hasPermi="['bpm:model:create']">新建流程模型 导入流程模型 + v-hasPermi="['bpm:model:import']">导入流程模型 @@ -84,10 +84,14 @@