From 9af6e362988e8c319d1f53e8482d4253a54e667d Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 13 Mar 2025 17:20:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E8=8E=B7=E5=8F=96=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1376091359379456]IT服务-获取流程图信息接口优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1376091359379456 --- .../dao/mapper/process/ProcessMapper.java | 6 ++- .../dao/mapper/process/ProcessMapper.xml | 52 ++++++++++++++++++- .../process/service/ProcessServiceImpl.java | 23 +++++++- .../WorkerPolicyConfigMakeupHandler.java | 5 +- 4 files changed, 79 insertions(+), 7 deletions(-) diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.java index 1733e7f81..8024a713b 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.java @@ -104,10 +104,14 @@ public interface ProcessMapper extends IProcessCrossoverMapper { int insertProcessStep(ProcessStepVo processStepVo); + int insertProcessStepList(List processStepVo); + // int insertProcessStepFormAttribute(ProcessStepFormAttributeVo processStepFormAttributeVo); int insertProcessStepRel(ProcessStepRelVo processStepRelVo); + int insertProcessStepRelList(List processStepRelList); + // int insertProcessStepTeam(ProcessStepTeamVo processStepTeamVo); int insertProcessStepWorkerPolicy(ProcessStepWorkerPolicyVo processStepWorkerPolicyVo); @@ -135,7 +139,7 @@ public interface ProcessMapper extends IProcessCrossoverMapper { int deleteProcessStepRelByProcessUuid(String processUuid); // int deleteProcessStepTeamByProcessUuid(String processUuid); -// int deleteProcessStepWorkerPolicyByProcessUuid(String processUuid); + int deleteProcessStepWorkerPolicyByProcessUuid(String processUuid); int deleteProcessStepWorkerPolicyByProcessStepUuid(String processUuid); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml index 76d804b02..568583027 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml @@ -549,6 +549,30 @@ ) + + INSERT INTO `process_step` ( + `process_uuid`, + `uuid`, + `name`, + `type`, + `handler`, + `config`, + `description` + ) + VALUES + + ( + #{item.processUuid}, + #{item.uuid}, + #{item.name}, + #{item.type}, + #{item.handler}, + #{item.config, typeHandler=CompressHandler}, + #{item.description} + ) + + + INSERT INTO `process_step_worker_policy` ( `process_uuid`, @@ -589,6 +613,30 @@ ) + + INSERT INTO `process_step_rel` ( + `process_uuid`, + `uuid`, + `from_step_uuid`, + `to_step_uuid`, + `condition`, + `name`, + `type` + ) + VALUES + + ( + #{item.processUuid}, + #{item.uuid}, + #{item.fromStepUuid}, + #{item.toStepUuid}, + #{item.condition}, + #{item.name}, + #{item.type} + ) + + + - + DELETE diff --git a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java index 4f0349792..06d4a9641 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java @@ -118,6 +118,9 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ return; } + if (Objects.equals(action, "delete")) { + processMapper.deleteProcessStepWorkerPolicyByProcessUuid(processVo.getUuid()); + } JSONObject formConfig = processObj.getJSONObject("formConfig"); if (MapUtils.isNotEmpty(formConfig)) { String formUuid = formConfig.getString("uuid"); @@ -253,9 +256,17 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ } } } + List processStepList = new ArrayList<>(); for (Map.Entry entry : stepMap.entrySet()) { ProcessStepVo processStepVo = entry.getValue(); - processMapper.insertProcessStep(processStepVo); + processStepList.add(processStepVo); + if (processStepList.size() > 50) { + processMapper.insertProcessStepList(processStepList); + processStepList.clear(); + } + } + if (!processStepList.isEmpty()) { + processMapper.insertProcessStepList(processStepList); } } if (Objects.equals(action, "delete")) { @@ -266,6 +277,7 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ JSONArray relList = processObj.getJSONArray("connectionList"); if (CollectionUtils.isNotEmpty(relList)) { if (Objects.equals(action, "save")) { + List processStepRelList = new ArrayList<>(); for (int i = 0; i < relList.size(); i++) { JSONObject relObj = relList.getJSONObject(i); String uuid = relObj.getString("uuid"); @@ -281,7 +293,14 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ type = ProcessFlowDirection.FORWARD.getValue(); } processStepRelVo.setType(type); - processMapper.insertProcessStepRel(processStepRelVo); + processStepRelList.add(processStepRelVo); + if (processStepRelList.size() > 50) { + processMapper.insertProcessStepRelList(processStepRelList); + processStepRelList.clear(); + } + } + if (!processStepRelList.isEmpty()) { + processMapper.insertProcessStepRelList(processStepRelList); } } else if (Objects.equals(action, "delete")) { processMapper.deleteProcessStepRelByProcessUuid(processVo.getUuid()); diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/WorkerPolicyConfigMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/WorkerPolicyConfigMakeupHandler.java index 34efc6e21..926ae43d9 100644 --- a/src/main/java/neatlogic/module/process/stephandler/makeup/WorkerPolicyConfigMakeupHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/makeup/WorkerPolicyConfigMakeupHandler.java @@ -63,9 +63,10 @@ public class WorkerPolicyConfigMakeupHandler implements IProcessStepMakeupHandle processStepWorkerPolicyVo.setConfig(policyObj.getString("config")); processMapper.insertProcessStepWorkerPolicy(processStepWorkerPolicyVo); } - } else if (Objects.equals(action, "delete")) { - processMapper.deleteProcessStepWorkerPolicyByProcessStepUuid(processStepVo.getUuid()); } +// else if (Objects.equals(action, "delete")) { +// processMapper.deleteProcessStepWorkerPolicyByProcessStepUuid(processStepVo.getUuid()); +// } } } } -- Gitee From 70419049adb731fdc7245f0dd183a2aa33e296a7 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 13 Mar 2025 18:29:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E8=8E=B7=E5=8F=96=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1376091359379456]IT服务-获取流程图信息接口优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1376091359379456 --- .../module/process/service/ProcessServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java index 06d4a9641..9f5ae7cda 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java @@ -34,7 +34,7 @@ import neatlogic.framework.process.crossover.IProcessCrossoverService; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.dto.score.ProcessScoreTemplateVo; import neatlogic.framework.process.exception.process.ProcessNameRepeatException; -import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; +import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.exception.sla.SlaCalculateHandlerNotFoundException; import neatlogic.framework.process.sla.core.ISlaCalculateHandler; import neatlogic.framework.process.sla.core.SlaCalculateHandlerFactory; @@ -197,7 +197,6 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ DependencyManager.delete(NotifyPolicyProcessSlaDependencyHandler.class, slaUuidList); processMapper.deleteProcessSlaByProcessUuid(processVo.getUuid()); } - } String virtualStartStepUuid = "";// 虚拟开始节点uuid Map stepMap = new HashMap<>(); @@ -235,7 +234,9 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ processStepUtilHandler.makeupProcessStep(processStepVo, stepConfigObj, action); } } else { - throw new ProcessStepHandlerNotFoundException(handler); + if (Objects.equals(action, "save")) { + throw new ProcessStepUtilHandlerNotFoundException(handler); + } } } stepMap.put(processStepVo.getUuid(), processStepVo); -- Gitee