[feat]

1、优化预警生成触发流程获取流程code逻辑

dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java

@@ -126,6 +126,6 @@ public interface RemoteWorkflowService {
      */
     List<RemoteUserVo> currentTaskAllUser(Long taskId);
 
-    FlowLabelVo getFlowLabel(String labelId);
+    String getFlowCode(String postCode);
 
 }

dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java

@@ -8,6 +8,7 @@ import org.dromara.workflow.api.domain.FlowLabelVo;
 import org.dromara.workflow.api.domain.RemoteCompleteTask;
 import org.dromara.workflow.api.domain.RemoteStartProcess;
 import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
+import org.dromara.workflow.service.IFlwDefinitionService;
 import org.dromara.workflow.service.IFlwTaskService;
 import org.dromara.workflow.service.WorkflowService;
 import org.springframework.stereotype.Service;
@@ -32,6 +33,8 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService {
 
     private final IFlwTaskService flwTaskService;
 
+    private final IFlwDefinitionService flwDefinitionService;
+
     private static final ExecutorService executor = Executors.newFixedThreadPool(10);
 
     @Override
@@ -100,8 +103,8 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService {
     }
 
     @Override
-    public FlowLabelVo getFlowLabel(String labelId) {
+    public String getFlowCode(String postCode){
-        return flwTaskService.getFlowLabel(labelId);
+        return flwDefinitionService.getFlowCode(postCode);
     }
 
     @Override

dk-modules/workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java

@@ -1,6 +1,7 @@
 package org.dromara.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -57,4 +58,5 @@ public interface FlwCategoryMapper extends BaseMapperPlus<FlowCategory, FlowCate
         ).collect(Collectors.toList());
     }
 
+    String getFlowCode(@Param("postCode") String postCode);
 }

dk-modules/workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java

@@ -76,4 +76,7 @@ public interface IFlwDefinitionService {
      * @param tenantId 租户id
      */
     void syncDef(String tenantId);
+
+    String getFlowCode(String postCode);
+
 }

dk-modules/workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java

@@ -207,10 +207,4 @@ public interface IFlwTaskService {
      */
     List<Node> getByNodeCodes(String nodeCode,Long definitionId);
 
-    /**
-     * 根据部门获取流程
-     * @param labelId
-     * @return
-     */
-    FlowLabelVo getFlowLabel(String labelId);
 }

dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java

@@ -67,7 +67,6 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
     private final FlowNodeMapper flowNodeMapper;
     private final FlowSkipMapper flowSkipMapper;
     private final FlwCategoryMapper flwCategoryMapper;
-    private final FlwLabelService flwDepartService;
 
     /**
      * 查询流程定义列表
@@ -84,12 +83,6 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
         TableDataInfo<FlowDefinitionVo> build = TableDataInfo.build();
         build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class));
         build.setTotal(page.getTotal());
-        build.getRows().forEach(p ->{
-            FlowLabel info = flwDepartService.getInfo(p.getFlowCode());
-            if(ObjectUtil.isNotEmpty(info)){
-                p.setLabelIds(info.getLabelIds());
-            }
-        });
         return build;
     }
 
@@ -278,4 +271,9 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
             }
         }
     }
+
+    @Override
+    public String getFlowCode(String postCode) {
+        return flwCategoryMapper.getFlowCode(postCode);
+    }
 }

dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@@ -321,14 +321,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
         return nodeService.getByNodeCodes(Collections.singletonList(nodeCode), definitionId);
     }
 
-    @Override
-    public FlowLabelVo getFlowLabel(String labelId) {
-        FlowLabel flowDepart = flwDepartService.getFlowLabel(labelId);
-        FlowLabelVo flowDepartVo = new FlowLabelVo();
-        BeanUtils.copyProperties(flowDepart, flowDepartVo);
-
-        return flowDepartVo;
-    }
 
     /**
      * 查询当前用户的已办任务

dk-modules/workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml

@@ -8,4 +8,8 @@
         select count(*) from flow_category where del_flag = '0' and category_id = #{categoryId}
     </select>
 
+    <select id="getFlowCode" resultType="java.lang.String">
+        select flow_code from flow_definition fd where fd.remark like concat('%',#{postCode},'%')
+    </select>
+
 </mapper>