微调

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/TodoVOConvert.java

@@ -29,7 +29,9 @@ public class TodoVOConvert {
         return bpmTaskVOS.stream().map(temp -> {
             TodoVO todoVO = new TodoVO();
             todoVO.setId(temp.getId());
-            todoVO.setTaskName(temp.getName());
+            String processDefinitionId = temp.getProcessInstance().getProcessDefinitionId();
+            String key = processDefinitionId.substring(0, processDefinitionId.indexOf(":"));
+            todoVO.setTaskName(SupervisionKeyEnum.getBusinessNameByKey(key));
             todoVO.setTaskContent(temp.getInstanceSign());
             todoVO.setTaskCreateTime(temp.getCreateTime());
             // 1. 待办流程
@@ -53,7 +55,7 @@ public class TodoVOConvert {
         return rejectProcessInstanceList.stream().map(temp -> {
             TodoVO todoVO = new TodoVO();
             todoVO.setId(temp.getBusinessKey());
-            todoVO.setTaskName(temp.getName());
+
             todoVO.setTaskContent(temp.getInstanceSign());
             todoVO.setTaskCreateTime(temp.getEndTime());
             // 1. 待办流程
@@ -62,6 +64,7 @@ public class TodoVOConvert {
             String processDefinitionId = temp.getProcessDefinitionId();
             String key = processDefinitionId.substring(0, processDefinitionId.indexOf(":"));
             todoVO.setRoutePath(SupervisionKeyEnum.getRoutePathByKey(key));
+            todoVO.setTaskName(SupervisionKeyEnum.getBusinessNameByKey(key));
             todoVO.setStartUser(RequestUtil.getUserNickname());
             todoVO.setProcessInstanceId(temp.getId());
             todoVO.setHistoryInstanceId(temp.getHistoryInstanceId());

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java

@@ -8,27 +8,27 @@ import java.util.List;
 @Getter
 public enum SupervisionKeyEnum {
     // 干扰源接入
-    BUILD_USER_INFO("build_user_info", "user", "干扰源建档流程", "UserReportPOServiceImpl","supervision/interferencemanagement"),
+    BUILD_USER_INFO("build_user_info", "user", "干扰源建档", "UserReportPOServiceImpl","supervision/interferencemanagement"),
-    USER_REPORT_RENEWAL("user_report_update", "user", "干扰源常态化信息编辑流程", "UserReportRenewalServiceImpl","supervision/interferencemanagement"),
+    USER_REPORT_RENEWAL("user_report_update", "user", "干扰源常态化信息编辑", "UserReportRenewalServiceImpl","supervision/interferencemanagement"),
-    USER_GO_NET("user_go_net", "user", "入网设计方案流程", "UserReportNormalServiceImpl","supervision/interferencemanagement"),
+    USER_GO_NET("user_go_net", "user", "入网设计方案", "UserReportNormalServiceImpl","supervision/interferencemanagement"),
-    USER_TREAT_CHECK("user_treat_check", "user", "治理工程流程", "UserReportNormalServiceImpl","supervision/interferencemanagement"),
+    USER_TREAT_CHECK("user_treat_check", "user", "治理工程验收", "UserReportNormalServiceImpl","supervision/interferencemanagement"),
     // 终端检测
-    DEVICE_INFO_ADD("device_info_add", "device", "电能质量监测装置设备管理流程", "SupervisionDevMainReportPOServiceImpl","terminalNetwotk"),
+    DEVICE_INFO_ADD("device_info_add", "device", "电能质量监测装置管理", "SupervisionDevMainReportPOServiceImpl","terminalNetwotk"),
-    LINE_INFO_ADD("line_info_add", "device", "电能质量监测点管理流程", "SupervisionTempLineReportServiceImpl","terminalNetwotk"),
+    LINE_INFO_ADD("line_info_add", "device", "电能质量监测点管理", "SupervisionTempLineReportServiceImpl","terminalNetwotk"),
-    TEMP_LINE_DEBUG("temp_line_debug", "device", "监测点联调流程", "SupervisionTempLineDebugPOServiceImpl","terminalNetwotk"),
+    TEMP_LINE_DEBUG("temp_line_debug", "device", "监测点联调", "SupervisionTempLineDebugPOServiceImpl","terminalNetwotk"),
     TIMING_CHECK_DEVICE("timing_check_device", "device", "终端周期检测", "CheckDeviceServiceImpl","terminalNetwotk"),
     // 试运行评估
-    LINE_RUN_TEST("line_run_test", "device", "监测点试运行评估流程", "SupervisionTempLineRunTestServiceImpl","testRun"),
+    LINE_RUN_TEST("line_run_test", "device", "监测点试运行评估", "SupervisionTempLineRunTestServiceImpl","testRun"),
     // 台账管理 干扰源用户台账
-    BUILD_USER_INFO_ARCHIVIST("build_user_info_archivist","user","干扰源用户台账归档流程","UserReportPOServiceImpl","Supervision/Terminaldetection"),
+    BUILD_USER_INFO_ARCHIVIST("build_user_info_archivist","user","干扰源用户台账归档","UserReportPOServiceImpl","Supervision/Terminaldetection"),
     // 技术监督计划
     SUP_PLAN_ADD("sup_plan_add", "plan", "技术监督计划流程（计划和测试）", "SupervisionPlanPOServiceImpl","supervision/harmonicmanagement"),
-    SURVEY_PLAN("survey_plan", "survey", "监督计划流程", "SurveyPlanServiceImpl","supervision/harmonicmanagement"),
+    SURVEY_PLAN("survey_plan", "survey", "技术监督计划", "SurveyPlanServiceImpl","supervision/harmonicmanagement"),
-    SURVEY_TEST("survey_test", "survey", "监督测试流程", "SurveyTestServiceImpl","supervision/harmonicmanagement"),
+    SURVEY_TEST("survey_test", "survey", "技术监督测试", "SurveyTestServiceImpl","supervision/harmonicmanagement"),
     // 预告警单
-    WARN_LEAFLET("warn_leaflet", "leaflet", "预告警单流程", "WarningLeafletServiceImpl","supervision/supervision/manage"),
+    WARN_LEAFLET("warn_leaflet", "leaflet", "预/告警单", "WarningLeafletServiceImpl","supervision/supervision/manage"),
     // 终端状态管理
-    QUIT_RUNNING_DEVICE("quit_running_device", "device", "终端状态变更流程", "QuitRunningDeviceServiceImpl","supervision/retire"),
+    QUIT_RUNNING_DEVICE("quit_running_device", "device", "终端/监测点状态变更", "QuitRunningDeviceServiceImpl","supervision/retire"),
 
     // 弃用
     USER_REPORT_DELETE("user_report_delete", "user", "干扰源常态化信息删除流程", "UserReportDeleteServiceImpl","");
@@ -74,6 +74,18 @@ public enum SupervisionKeyEnum {
         return null;
     }
 
+    /**
+     * 根据流程key获取类的全路径，用于获取业务名称
+     */
+    public static String getBusinessNameByKey(String key) {
+        for (SupervisionKeyEnum supervisionKeyEnum : SupervisionKeyEnum.values()) {
+            if (supervisionKeyEnum.key.equalsIgnoreCase(key)) {
+                return supervisionKeyEnum.getDescribe();
+            }
+        }
+        return null;
+    }
+
     /**
      * 根据流程key获取页面路由路径
      */