更新

src/main/java/com/keymobile/rest/controller/ExcelController.java

@@ -2,7 +2,7 @@ package com.keymobile.rest.controller;
 
 import com.keymobile.rest.common.utils.DateUtil;
 import com.keymobile.rest.common.validator.CommonValidator;
-import com.keymobile.rest.controller.constant.TaskConstant;
+import com.keymobile.rest.controller.constant.CtrlConstant;
 import com.keymobile.rest.model.User;
 import com.keymobile.rest.model.Activity;
 import com.keymobile.rest.model.DataInfo;
@@ -92,7 +92,7 @@ public class ExcelController {
             if (nrOfCompletedInstances == nrOfInstances - 1) {
                 if (activity.getNeedConfirm() == Activity.NEED_CONFIRM) {
                     vars.put("NeedConfirm", true);
-                    vars.put("manager", TaskConstant.USER_NAME_MANAGER);
+                    vars.put("manager", CtrlConstant.USER_NAME_MANAGER);
                 } else {
                     vars.put("NeedConfirm", false);
 //                if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {

src/main/java/com/keymobile/rest/controller/TaskController.java

@@ -5,7 +5,7 @@ import com.keymobile.rest.common.bean.SimplePage;
 import com.keymobile.rest.common.utils.BeanUti;
 import com.keymobile.rest.common.utils.DateUtil;
 import com.keymobile.rest.common.validator.CommonValidator;
-import com.keymobile.rest.controller.constant.TaskConstant;
+import com.keymobile.rest.controller.constant.CtrlConstant;
 import com.keymobile.rest.model.User;
 import com.keymobile.rest.model.*;
 import com.keymobile.rest.model.Process;
@@ -103,7 +103,7 @@ public class TaskController {
         // 获取个人任务
         List<Task> tasks = taskService.createTaskQuery().taskAssignee(username).active().list();
         tasks.forEach(task -> {
-            missions.add(convertTaskToMission(task, ImmutableMap.of("username", username, "type", TaskConstant.TASK_TYPE_PERSONAL)));
+            missions.add(convertTaskToMission(task, ImmutableMap.of("username", username, "type", CtrlConstant.TASK_TYPE_PERSONAL)));
         });
 
         // 获取组任务
@@ -120,7 +120,7 @@ public class TaskController {
                             // 组id
                             String groupId = "id:" + templateId;
                             if (groupId.equals(identityLink.getGroupId())) {
-                                missions.add(convertTaskToMission(groupTask, ImmutableMap.of("username", username, "type", TaskConstant.TASK_TYPE_GROUP, "templateId", templateId)));
+                                missions.add(convertTaskToMission(groupTask, ImmutableMap.of("username", username, "type", CtrlConstant.TASK_TYPE_GROUP, "templateId", templateId)));
                             }
                         });
                     }
@@ -142,7 +142,7 @@ public class TaskController {
         // 新建活动
         Activity activity = new Activity();
         activity = BeanUti.convertTo(form, activity);
-        User admin = sessionService.getUserByName(TaskConstant.USER_NAME_ADMIN);
+        User admin = sessionService.getUserByName(CtrlConstant.USER_NAME_ADMIN);
         activity.setUserId(admin.getId());
         activity.setCreateAt(DateUtil.getTimestamp());
         activity.setStatus(Activity.STATUS_WAIT);
@@ -254,7 +254,7 @@ public class TaskController {
     public Object passTask(@PathVariable String taskId, @PathVariable int status) {
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         CommonValidator.notNull(task, "任务不存在");
-        boolean pass = status == TaskConstant.STATUS_PASS;
+        boolean pass = status == CtrlConstant.STATUS_PASS;
         Map vars = new HashMap();
         vars.put("DataAudit", pass);
         if (pass) {
@@ -271,7 +271,7 @@ public class TaskController {
             if (nrOfCompletedInstances == nrOfInstances - 1) {
                 if (activity.getNeedConfirm() == Activity.NEED_CONFIRM) {
                     vars.put("NeedConfirm", true);
-                    vars.put("manager", TaskConstant.USER_NAME_MANAGER);
+                    vars.put("manager", CtrlConstant.USER_NAME_MANAGER);
                 } else {
                     vars.put("NeedConfirm", false);
 //                if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
@@ -299,7 +299,7 @@ public class TaskController {
     public Object confirmTask(@PathVariable String taskId, @PathVariable int status) {
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         CommonValidator.notNull(task, "任务不存在");
-        boolean pass = status == TaskConstant.STATUS_PASS;
+        boolean pass = status == CtrlConstant.STATUS_PASS;
         Map vars = new HashMap();
         vars.put("Confirm", pass);
         return "审核通过成功";
@@ -331,11 +331,11 @@ public class TaskController {
                 .createAt(DateUtil.formatDateTime(task.getCreateTime()));
         int missionType = 0;
         String mission = "";
-        if (task.getTaskDefinitionKey().equals(TaskConstant.MISSION_KEY_DATA_ENTER)) {
-            missionType = TaskConstant.MISSION_TYPE_DATA_ENTER;
-            mission = TaskConstant.MISSION_TEXT_DATA_ENTER;
+        if (task.getTaskDefinitionKey().equals(CtrlConstant.MISSION_KEY_DATA_ENTER)) {
+            missionType = CtrlConstant.MISSION_TYPE_DATA_ENTER;
+            mission = CtrlConstant.MISSION_TEXT_DATA_ENTER;
             long templateId = 0;
-            if (type == TaskConstant.TASK_TYPE_PERSONAL) {
+            if (type == CtrlConstant.TASK_TYPE_PERSONAL) {
                 String assignee = task.getAssignee();
                 String[] array = assignee.split(":");
                 try {
@@ -343,19 +343,19 @@ public class TaskController {
                 } catch (Exception e) {
 
                 }
-            } else if (type == TaskConstant.TASK_TYPE_GROUP) {
+            } else if (type == CtrlConstant.TASK_TYPE_GROUP) {
                 templateId = Long.parseLong(params.get("templateId").toString());
             }
             builder.excelId(templateId);
-        } else if (task.getTaskDefinitionKey().equals(TaskConstant.MISSION_KEY_DATA_AUDIT)) {
-            missionType = TaskConstant.MISSION_TYPE_DATA_AUDIT;
-            mission = TaskConstant.MISSION_TEXT_DATA_AUDIT;
-        } else if (task.getTaskDefinitionKey().equals(TaskConstant.MISSION_KEY_MANAGER_AUDIT)) {
-            missionType = TaskConstant.MISSION_TYPE_MANAGER_AUDIT;
-            mission = TaskConstant.MISSION_TEXT_MANAGER_AUDIT;
-        } else if (task.getTaskDefinitionKey().equals(TaskConstant.MISSION_KEY_DATA_BACK_FLOW)) {
-            missionType = TaskConstant.MISSION_TYPE_DATA_BACK_FLOW;
-            mission = TaskConstant.MISSION_TEXT_DATA_BACK_FLOW;
+        } else if (task.getTaskDefinitionKey().equals(CtrlConstant.MISSION_KEY_DATA_AUDIT)) {
+            missionType = CtrlConstant.MISSION_TYPE_DATA_AUDIT;
+            mission = CtrlConstant.MISSION_TEXT_DATA_AUDIT;
+        } else if (task.getTaskDefinitionKey().equals(CtrlConstant.MISSION_KEY_MANAGER_AUDIT)) {
+            missionType = CtrlConstant.MISSION_TYPE_MANAGER_AUDIT;
+            mission = CtrlConstant.MISSION_TEXT_MANAGER_AUDIT;
+        } else if (task.getTaskDefinitionKey().equals(CtrlConstant.MISSION_KEY_DATA_BACK_FLOW)) {
+            missionType = CtrlConstant.MISSION_TYPE_DATA_BACK_FLOW;
+            mission = CtrlConstant.MISSION_TEXT_DATA_BACK_FLOW;
         }
         builder.mission(mission)
                 .missionType(missionType);

src/main/java/com/keymobile/rest/controller/constant/TaskConstant.java → src/main/java/com/keymobile/rest/controller/constant/CtrlConstant.java

 package com.keymobile.rest.controller.constant;
 
-public interface TaskConstant {
+public interface CtrlConstant {
 
     int TASK_TYPE_PERSONAL = 1;
     int TASK_TYPE_GROUP = 2;

src/test/java/com/keymobile/ProcessTest.java

 package com.keymobile;
 
 import com.google.common.collect.ImmutableMap;
-import com.keymobile.rest.controller.constant.TaskConstant;
 import com.keymobile.rest.service.ActivityService;
 import org.activiti.engine.*;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -22,7 +21,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -42,7 +40,7 @@ public class ProcessTest {
 //    @Value("${app.active-process}")
     private String process = "SubProcessStandard.bpmn";
 
-        @Test
+//        @Test
     public void createActivitiTask() {
         // 加载的我们创建好的demo.bpmn 文件还有png文件
         // 获取流的引擎
@@ -105,7 +103,7 @@ public class ProcessTest {
 
     }
 
-    @Test
+//    @Test
     public void start() {
 
 //        65046
@@ -171,7 +169,7 @@ public class ProcessTest {
 
     }
 
-    @Test
+//    @Test
     public void zhuguan() {
 //        try {
 
@@ -232,7 +230,7 @@ public class ProcessTest {
 //        }
     }
 
-    @Test
+//    @Test
     public void asdsa() {
         try {
 //            taskService.complete(   "28",  ImmutableMap.of("needDataAudit", false, "needConfirm", false, "NeedDataBack", false));