소스 검색

角色修改

wangliang 3 년 전
부모
커밋
19be8c87da

+ 37 - 37
distributed-print/src/main/java/com/qmth/distributed/print/api/ActivitiController.java

@@ -36,12 +36,12 @@ public class ActivitiController {
     @Resource
     private ActivitiService activitiService;
 
-//    @ApiOperation(value = "注册流程")
-//    @RequestMapping(value = "/createDeployment", method = RequestMethod.POST)
-//    public Result createDeployment(@RequestParam(value = "processFileName") String processFileName) {
-//        activitiService.createDeployment(processFileName);
-//        return ResultUtil.ok();
-//    }
+    @ApiOperation(value = "注册流程")
+    @RequestMapping(value = "/createDeployment", method = RequestMethod.POST)
+    public Result createDeployment(@RequestParam(value = "processFileName") String processFileName) {
+        activitiService.createDeployment(processFileName);
+        return ResultUtil.ok();
+    }
 
     @ApiOperation(value = "上传流程")
     @RequestMapping(value = "/updateDeployment", method = RequestMethod.POST)
@@ -50,35 +50,35 @@ public class ActivitiController {
         return ResultUtil.ok();
     }
 
-//    @ApiOperation(value = "启动流程")
-//    @RequestMapping(value = "/startActivity", method = RequestMethod.POST)
-//    public Result startActivity(@RequestParam(value = "processKey") String processKey) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("userId", 1L);
-//        map.put("approveId", 2L);
-//        map.put("assigneeId", 3L);
-//        activitiService.startActivity(processKey, map);
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "获取待办")
-//    @RequestMapping(value = "/getTaskList", method = RequestMethod.POST)
-//    public Result getTaskList() {
-//        activitiService.getTaskList();
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "提交")
-//    @RequestMapping(value = "/complete", method = RequestMethod.POST)
-//    public Result complete(@RequestParam(value = "taskId") String taskId) {
-//        activitiService.complete(taskId);
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "根据流程id直接结束流程")
-//    @RequestMapping(value = "/deleteProcessInstance", method = RequestMethod.POST)
-//    public Result deleteProcessInstance(@RequestParam(value = "flowId") String flowId) {
-//        activitiService.deleteProcessInstance(flowId);
-//        return ResultUtil.ok();
-//    }
+    @ApiOperation(value = "启动流程")
+    @RequestMapping(value = "/startActivity", method = RequestMethod.POST)
+    public Result startActivity(@RequestParam(value = "processKey") String processKey) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("userId", 1L);
+        map.put("approveId", 2L);
+        map.put("assigneeId", 3L);
+        activitiService.startActivity(processKey, map);
+        return ResultUtil.ok();
+    }
+
+    @ApiOperation(value = "获取待办")
+    @RequestMapping(value = "/getTaskList", method = RequestMethod.POST)
+    public Result getTaskList() {
+        activitiService.getTaskList();
+        return ResultUtil.ok();
+    }
+
+    @ApiOperation(value = "提交")
+    @RequestMapping(value = "/complete", method = RequestMethod.POST)
+    public Result complete(@RequestParam(value = "taskId") String taskId) {
+        activitiService.complete(taskId);
+        return ResultUtil.ok();
+    }
+
+    @ApiOperation(value = "根据流程id直接结束流程")
+    @RequestMapping(value = "/deleteProcessInstance", method = RequestMethod.POST)
+    public Result deleteProcessInstance(@RequestParam(value = "flowId") String flowId) {
+        activitiService.deleteProcessInstance(flowId);
+        return ResultUtil.ok();
+    }
 }

+ 3 - 3
distributed-print/src/main/resources/application-dev.properties

@@ -12,14 +12,14 @@ spring.application.name=distributed-print
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=distributed-136
+db.name=distributed-v2.2.0
 db.username=root
 db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
 com.qmth.redis.port=6379
-com.qmth.redis.db=0
+com.qmth.redis.db=15
 #com.qmth.redis.password=
 
 #mysql\u914D\u7F6E
@@ -84,7 +84,7 @@ org.center.orgQueryApi=/api/open/org/query
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
-com.qmth.api.global-auth=true
+com.qmth.api.global-auth=false
 #com.qmth.api.global-strict=false
 #com.qmth.api.global-rate-limit=1/5s