From ed36e8bd0c634c90cc8d93825d1d03d255d0eaad Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 10:29:00 +0800
Subject: [PATCH 1/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=9D=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1320124261302272]IT服务-流程图保存逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1320124261302272
---
 .../module/process/api/process/ProcessGetApi.java |  7 +++++--
 .../process/dao/mapper/process/ProcessMapper.xml  |  8 ++++----
 .../module/process/service/ProcessService.java    | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java
index f83fe676a..59e9c5b6d 100644
--- a/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java
+++ b/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java
@@ -1,5 +1,6 @@
 package neatlogic.module.process.api.process;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
@@ -72,9 +73,11 @@ public class ProcessGetApi extends PrivateApiComponentBase {
                     processVo.setIsActive(1);
                 }
                 processVo.setName(processVo.getName() + "【工单：" + processTaskVo.getTitle()+ "】");
-                processVo.setConfig(configStr);
+                JSONObject config = JSON.parseObject(configStr);
+//                processVo.setConfig(configStr);
                 ProcessMessageManager.setOperationType(OperationTypeEnum.SEARCH);
-                processVo.setConfig(ProcessConfigUtil.regulateProcessConfig(processVo.getConfig()));
+                config = ProcessConfigUtil.regulateProcessConfig(config);
+                processVo.setConfig(config);
                 processVo.setReferenceCount(1);
                 return processVo;
             }
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 463ace875..4573ebade 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
@@ -140,7 +140,7 @@
 		<result column="name" property="name" />
 		<result column="isActive" property="isActive" />
 		<result column="formUuid" property="formUuid" />
-		<result column="config" property="config" />
+		<result column="configStr" property="configStr" />
 	</resultMap>
 
 	<select id="getProcessByUuid" parameterType="java.lang.String" resultMap="processDetailMap">
@@ -148,7 +148,7 @@
 		a.`uuid`,
 		a.`name`,
 		a.`is_active` AS isActive,
-		a.`config`,
+		a.`config` AS configStr,
 		d.`form_uuid` AS formUuid
 		FROM
 		`process` a
@@ -162,7 +162,7 @@
 		a.`uuid`,
 		a.`name`,
 		a.`is_active` AS isActive,
-		a.`config`,
+		a.`config` AS configStr,
 		d.`form_uuid` AS formUuid
 		FROM
 		`process` a
@@ -176,7 +176,7 @@
 		`uuid`,
 		`name`,
 		`is_active` AS isActive,
-		`config`
+		`config` AS configStr
 		FROM
 		`process`
 		WHERE
diff --git a/src/main/java/neatlogic/module/process/service/ProcessService.java b/src/main/java/neatlogic/module/process/service/ProcessService.java
index 100463d4d..05f2efaaf 100755
--- a/src/main/java/neatlogic/module/process/service/ProcessService.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessService.java
@@ -1,5 +1,6 @@
 package neatlogic.module.process.service;
 
+import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.dto.ProcessVo;
 import neatlogic.framework.process.exception.process.ProcessNameRepeatException;
 
@@ -12,4 +13,18 @@ public interface ProcessService {
 	 * @param uuid 流程uuid
 	 */
 	void deleteProcessRelevantData(String uuid);
+
+	/**
+	 * 保存或删除流程的依赖关系数据
+	 * @param processVo 流程信息
+	 * @param action 保存或删除
+	 */
+	void saveOrDeleteProcessDependency(ProcessVo processVo, String action);
+
+	/**
+	 * 保存或删除流程步骤的依赖关系数据
+	 * @param processStepVo 流程步骤信息
+	 * @param action 保存或删除
+	 */
+	void saveOrDeleteProcessStepDependency(ProcessStepVo processStepVo, String action);
 }
-- 
Gitee


From d2e60e87774787db08a386d889be52beebbba4fe Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 12:10:45 +0800
Subject: [PATCH 2/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=B7=BB=E5=8A=A0=E5=BC=95=E7=94=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1318905102958592]组合工具添加引用列表 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1318905102958592
---
 .../dao/mapper/process/ProcessMapper.java        |  8 ++++++--
 .../process/dao/mapper/process/ProcessMapper.xml | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 4 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 1203b4933..51e3a950e 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
@@ -133,7 +133,9 @@ 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);
 
 //    int deleteProcessStepFormAttributeByProcessUuid(String processUuid);
 
@@ -149,7 +151,9 @@ public interface ProcessMapper extends IProcessCrossoverMapper {
 
     int deleteProcessStepCommentTemplate(String stepUuid);
 
-    int deleteProcessStepTagByProcessUuid(String processUuid);
+//    int deleteProcessStepTagByProcessUuid(String processUuid);
+
+    int deleteProcessStepTagByProcessStepUuid(String processStepUuid);
 
     int deleteProcessStepTaskByProcessStepUuid(String processStepUuid);
 
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 4573ebade..b782167ec 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
@@ -678,11 +678,18 @@
 		WHERE `process_uuid` = #{value}
 	</delete>-->
 
-	<delete id="deleteProcessStepWorkerPolicyByProcessUuid" parameterType="java.lang.String">
+	<!--<delete id="deleteProcessStepWorkerPolicyByProcessUuid" parameterType="java.lang.String">
 		DELETE
 		FROM
 		`process_step_worker_policy`
 		WHERE process_uuid = #{value}
+	</delete>-->
+
+	<delete id="deleteProcessStepWorkerPolicyByProcessStepUuid" parameterType="java.lang.String">
+		DELETE
+		FROM
+			`process_step_worker_policy`
+		WHERE process_step_uuid = #{value}
 	</delete>
 
 	<delete id="deleteProcessByUuid" parameterType="java.lang.String">
@@ -716,9 +723,14 @@
 		DELETE FROM `process_step_comment_template` WHERE `process_step_uuid` = #{value}
 	</delete>
 
-	<delete id="deleteProcessStepTagByProcessUuid" parameterType="java.lang.String">
+	<!--<delete id="deleteProcessStepTagByProcessUuid" parameterType="java.lang.String">
 		DELETE FROM `process_step_tag` WHERE `process_uuid` = #{value}
+	</delete>-->
+
+	<delete id="deleteProcessStepTagByProcessStepUuid" parameterType="java.lang.String">
+		DELETE FROM `process_step_tag` WHERE `process_step_uuid` = #{value}
 	</delete>
+
     <delete id="deleteProcessStepTaskByProcessStepUuid">
 		DELETE FROM `process_step_task_config` WHERE `process_step_uuid` = #{value}
 	</delete>
-- 
Gitee


From 3777e51ef4a40187f0ce0fa67ea2fe751e171cfe Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 12:15:28 +0800
Subject: [PATCH 3/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=B7=BB=E5=8A=A0=E5=BC=95=E7=94=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1318905102958592]组合工具添加引用列表 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1318905102958592
---
 .../process/api/process/ProcessCopyApi.java   | 22 +++++++++----------
 .../process/api/process/ProcessDeleteApi.java |  6 +++--
 .../process/api/process/ProcessImportApi.java |  1 -
 .../process/api/process/ProcessSaveApi.java   |  5 ++---
 .../handler/ProcessImportExportHandler.java   |  4 ++--
 .../process/service/ProcessService.java       |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessCopyApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessCopyApi.java
index f05dc2457..e25c3e956 100644
--- a/src/main/java/neatlogic/module/process/api/process/ProcessCopyApi.java
+++ b/src/main/java/neatlogic/module/process/api/process/ProcessCopyApi.java
@@ -17,6 +17,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum;
 import neatlogic.framework.restful.core.IValid;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
 import neatlogic.framework.util.RegexUtils;
+import neatlogic.framework.util.UuidUtil;
 import neatlogic.module.process.dao.mapper.process.ProcessMapper;
 import neatlogic.module.process.service.ProcessService;
 import org.springframework.stereotype.Service;
@@ -24,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.UUID;
 
 @Service
 @Transactional
@@ -75,29 +75,29 @@ public class ProcessCopyApi extends PrivateApiComponentBase {
             throw new ProcessNameRepeatException(name);
         }
 
-        String newUuid = processVo.getUuid();
-        String config = processVo.getConfigStr();
-        config = config.replace(uuid, newUuid);
+        String newUuid = UuidUtil.randomUuid();
+        String configStr = processVo.getConfigStr();
+        configStr = configStr.replace(uuid, newUuid);
 
         ProcessStepVo processStepVo = new ProcessStepVo();
         processStepVo.setProcessUuid(uuid);
         List<ProcessStepVo> processStepList = processMapper.searchProcessStep(processStepVo);
         for (ProcessStepVo processStep : processStepList) {
-            String newStepUuid = UUID.randomUUID().toString().replace("-", "");
-            config = config.replace(processStep.getUuid(), newStepUuid);
+            String newStepUuid = UuidUtil.randomUuid();
+            configStr = configStr.replace(processStep.getUuid(), newStepUuid);
         }
         List<ProcessStepRelVo> processStepRelList = processMapper.getProcessStepRelByProcessUuid(uuid);
         for (ProcessStepRelVo processStepRel : processStepRelList) {
-            String newRelUuid = UUID.randomUUID().toString().replace("-", "");
-            config = config.replace(processStepRel.getUuid(), newRelUuid);
+            String newRelUuid = UuidUtil.randomUuid();
+            configStr = configStr.replace(processStepRel.getUuid(), newRelUuid);
         }
         List<ProcessSlaVo> processSlaList = processMapper.getProcessSlaByProcessUuid(uuid);
         for (ProcessSlaVo processSla : processSlaList) {
-            String newSlaUuid = UUID.randomUUID().toString().replace("-", "");
-            config = config.replace(processSla.getUuid(), newSlaUuid);
+            String newSlaUuid = UuidUtil.randomUuid();
+            configStr = configStr.replace(processSla.getUuid(), newSlaUuid);
         }
+        JSONObject config = JSON.parseObject(configStr);
         processVo.setConfig(config);
-        processVo.makeupConfigObj();
         processService.saveProcess(processVo);
         processVo.setConfig(null);
         return processVo;
diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessDeleteApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessDeleteApi.java
index 1dc2be252..02d875df8 100644
--- a/src/main/java/neatlogic/module/process/api/process/ProcessDeleteApi.java
+++ b/src/main/java/neatlogic/module/process/api/process/ProcessDeleteApi.java
@@ -5,6 +5,7 @@ import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.process.auth.PROCESS_MODIFY;
 import neatlogic.framework.process.dto.ProcessDraftVo;
+import neatlogic.framework.process.dto.ProcessVo;
 import neatlogic.framework.process.exception.process.ProcessNotFoundException;
 import neatlogic.framework.process.exception.process.ProcessReferencedCannotBeDeleteException;
 import neatlogic.framework.restful.annotation.*;
@@ -54,13 +55,14 @@ public class ProcessDeleteApi extends PrivateApiComponentBase {
 	@Override
 	public Object myDoService(JSONObject jsonObj) throws Exception {
 		String uuid = jsonObj.getString("uuid");
-		if(processMapper.checkProcessIsExists(uuid) == 0) {
+		ProcessVo oldProcessVo = processMapper.getProcessByUuid(uuid);
+		if(oldProcessVo == null) {
 			throw new ProcessNotFoundException(uuid);
 		}
 		if(processMapper.getProcessReferenceCount(uuid) > 0) {
 			throw new ProcessReferencedCannotBeDeleteException(uuid);
 		}
-		processService.deleteProcessRelevantData(uuid);
+		processService.saveOrDeleteProcessDependency(oldProcessVo, "delete");
 		processMapper.deleteProcessByUuid(uuid);
 		ProcessDraftVo processDraftVo = new ProcessDraftVo();
 		processDraftVo.setProcessUuid(uuid);
diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessImportApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessImportApi.java
index 63af75b71..57b7d9b78 100644
--- a/src/main/java/neatlogic/module/process/api/process/ProcessImportApi.java
+++ b/src/main/java/neatlogic/module/process/api/process/ProcessImportApi.java
@@ -95,7 +95,6 @@ public class ProcessImportApi extends PrivateBinaryStreamApiComponentBase {
 					result = "更新流程：'" + processVo.getName() +"'";
 				}
 				processVo.setFcu(UserContext.get().getUserUuid(true));
-				processVo.makeupConfigObj();
 				processService.saveProcess(processVo);
 				return result;
 			}else {
diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java
index 8b34c2dea..1def29194 100644
--- a/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java
+++ b/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java
@@ -53,7 +53,7 @@ public class ProcessSaveApi extends PrivateApiComponentBase {
     @Input({
             @Param(name = "uuid", type = ApiParamType.STRING, desc = "流程uuid", isRequired = true),
             @Param(name = "name", type = ApiParamType.REGEX, rule = RegexUtils.NAME, isRequired = true, maxLength = 50, desc = "流程名称"),
-            @Param(name = "config", type = ApiParamType.JSONOBJECT, desc = "流程配置内容", isRequired = true)
+            @Param(name = "config", type = ApiParamType.JSONOBJECT, desc = "流程配置内容", minSize = 1, isRequired = true)
     })
     @Output({
             @Param(name = "uuid", type = ApiParamType.STRING, desc = "流程uuid")
@@ -62,8 +62,7 @@ public class ProcessSaveApi extends PrivateApiComponentBase {
     public Object myDoService(JSONObject jsonObj) throws Exception {
         ProcessVo processVo = JSON.toJavaObject(jsonObj, ProcessVo.class);
         ProcessMessageManager.setOperationType(OperationTypeEnum.UPDATE);
-        processVo.setConfig(ProcessConfigUtil.regulateProcessConfig(processVo.getConfig()));
-        processVo.makeupConfigObj();
+        ProcessConfigUtil.regulateProcessConfig(processVo.getConfig());
         processService.saveProcess(processVo);
         return processVo.getUuid();
     }
diff --git a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java
index 5ef84d36b..05e329bcb 100644
--- a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java
+++ b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java
@@ -1,5 +1,6 @@
 package neatlogic.module.process.importexport.handler;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.exception.core.ApiRuntimeException;
@@ -83,7 +84,6 @@ public class ProcessImportExportHandler extends ImportExportHandlerBase {
             }
         }
         importHandle(process, primaryChangeList, isChangeUuid);
-        process.makeupConfigObj();
         processService.saveProcess(process);
         return process.getUuid();
     }
@@ -543,7 +543,7 @@ public class ProcessImportExportHandler extends ImportExportHandlerBase {
                 for (Map.Entry<String, String> entry : oldUuid2NewUuidMap.entrySet()) {
                     configStr = configStr.replace(entry.getKey(), entry.getValue());
                 }
-                process.setConfig(configStr);
+                process.setConfig(JSON.parseObject(configStr));
             }
         }
     }
diff --git a/src/main/java/neatlogic/module/process/service/ProcessService.java b/src/main/java/neatlogic/module/process/service/ProcessService.java
index 05f2efaaf..4e107b703 100755
--- a/src/main/java/neatlogic/module/process/service/ProcessService.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessService.java
@@ -12,7 +12,7 @@ public interface ProcessService {
 	 * 删除流程相关数据
 	 * @param uuid 流程uuid
 	 */
-	void deleteProcessRelevantData(String uuid);
+//	void deleteProcessRelevantData(String uuid);
 
 	/**
 	 * 保存或删除流程的依赖关系数据
-- 
Gitee


From 73433b55504bddae6e4708bac19d212b914f1f0f Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 15:45:28 +0800
Subject: [PATCH 4/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=9D=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1320124261302272]IT服务-流程图保存逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1320124261302272
---
 .../process/service/ProcessService.java       | 10 +-
 .../AutomaticProcessUtilHandler.java          | 98 +------------------
 .../ConditionProcessUtilHandler.java          |  6 --
 .../DistributaryProcessUtilHandler.java       |  6 --
 .../utilhandler/EndProcessUtilHandler.java    |  5 -
 .../OmnipotentProcessUtilHandler.java         | 70 -------------
 .../utilhandler/StartProcessUtilHandler.java  |  6 --
 .../utilhandler/TimerProcessUtilHandler.java  | 31 ------
 8 files changed, 5 insertions(+), 227 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/service/ProcessService.java b/src/main/java/neatlogic/module/process/service/ProcessService.java
index 4e107b703..9031f3fb3 100755
--- a/src/main/java/neatlogic/module/process/service/ProcessService.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessService.java
@@ -1,12 +1,11 @@
 package neatlogic.module.process.service;
 
-import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.dto.ProcessVo;
 import neatlogic.framework.process.exception.process.ProcessNameRepeatException;
 
 public interface ProcessService {
 
-	public int saveProcess(ProcessVo processVo) throws ProcessNameRepeatException;
+	int saveProcess(ProcessVo processVo) throws ProcessNameRepeatException;
 
 	/**
 	 * 删除流程相关数据
@@ -20,11 +19,4 @@ public interface ProcessService {
 	 * @param action 保存或删除
 	 */
 	void saveOrDeleteProcessDependency(ProcessVo processVo, String action);
-
-	/**
-	 * 保存或删除流程步骤的依赖关系数据
-	 * @param processStepVo 流程步骤信息
-	 * @param action 保存或删除
-	 */
-	void saveOrDeleteProcessStepDependency(ProcessStepVo processStepVo, String action);
 }
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java
index abe890dc2..9af847c9d 100644
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java
@@ -6,13 +6,13 @@ import neatlogic.framework.common.constvalue.SystemUser;
 import neatlogic.framework.crossover.CrossoverServiceFactory;
 import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService;
 import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo;
-import neatlogic.framework.process.constvalue.*;
-import neatlogic.framework.process.dto.ProcessStepVo;
-import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo;
+import neatlogic.framework.process.constvalue.ProcessStepHandlerType;
+import neatlogic.framework.process.constvalue.ProcessTaskOperationType;
+import neatlogic.framework.process.constvalue.ProcessTaskStatus;
+import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType;
 import neatlogic.framework.process.dto.ProcessTaskStepDataVo;
 import neatlogic.framework.process.dto.ProcessTaskStepVo;
 import neatlogic.framework.process.dto.processconfig.AutomaticCallbackConfigVo;
-import neatlogic.framework.process.dto.processconfig.AutomaticIntervalCallbackConfigVo;
 import neatlogic.framework.process.dto.processconfig.AutomaticRequestConfigVo;
 import neatlogic.framework.process.dto.processconfig.AutomaticTimeWindowConfigVo;
 import neatlogic.framework.process.operationauth.core.IOperationType;
@@ -21,14 +21,9 @@ import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBa
 import neatlogic.framework.process.util.ProcessConfigUtil;
 import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper;
 import neatlogic.module.process.notify.handler.AutomaticNotifyPolicyHandler;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 @Service
@@ -80,91 +75,6 @@ public class AutomaticProcessUtilHandler extends ProcessStepInternalHandlerBase
         return stepDataJson;
     }
 
-    @Override
-    public void makeupProcessStep(ProcessStepVo processStepVo, JSONObject stepConfigObj) {
-        /** 组装通知策略id **/
-        JSONObject notifyPolicyConfig = stepConfigObj.getJSONObject("notifyPolicyConfig");
-        InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = JSONObject.toJavaObject(notifyPolicyConfig, InvokeNotifyPolicyConfigVo.class);
-        if (invokeNotifyPolicyConfigVo != null) {
-            processStepVo.setNotifyPolicyConfig(invokeNotifyPolicyConfigVo);
-        }
-
-//        JSONObject actionConfig = stepConfigObj.getJSONObject("actionConfig");
-//        ActionConfigVo actionConfigVo = JSONObject.toJavaObject(actionConfig, ActionConfigVo.class);
-//        if (actionConfigVo != null) {
-//            List<ActionConfigActionVo> actionList = actionConfigVo.getActionList();
-//            if (CollectionUtils.isNotEmpty(actionList)) {
-//                List<String> integrationUuidList = new ArrayList<>();
-//                for (ActionConfigActionVo actionVo : actionList) {
-//                    String integrationUuid = actionVo.getIntegrationUuid();
-//                    if (StringUtils.isNotBlank(integrationUuid)) {
-//                        integrationUuidList.add(integrationUuid);
-//                    }
-//                }
-//                processStepVo.setIntegrationUuidList(integrationUuidList);
-//            }
-//        }
-
-        /** 组装分配策略 **/
-        JSONObject workerPolicyConfig = stepConfigObj.getJSONObject("workerPolicyConfig");
-        if (MapUtils.isNotEmpty(workerPolicyConfig)) {
-            JSONArray policyList = workerPolicyConfig.getJSONArray("policyList");
-            if (CollectionUtils.isNotEmpty(policyList)) {
-                List<ProcessStepWorkerPolicyVo> workerPolicyList = new ArrayList<>();
-                for (int k = 0; k < policyList.size(); k++) {
-                    JSONObject policyObj = policyList.getJSONObject(k);
-                    if (!"1".equals(policyObj.getString("isChecked"))) {
-                        continue;
-                    }
-                    ProcessStepWorkerPolicyVo processStepWorkerPolicyVo = new ProcessStepWorkerPolicyVo();
-                    processStepWorkerPolicyVo.setProcessUuid(processStepVo.getProcessUuid());
-                    processStepWorkerPolicyVo.setProcessStepUuid(processStepVo.getUuid());
-                    processStepWorkerPolicyVo.setPolicy(policyObj.getString("type"));
-                    processStepWorkerPolicyVo.setSort(k + 1);
-                    processStepWorkerPolicyVo.setConfig(policyObj.getString("config"));
-                    workerPolicyList.add(processStepWorkerPolicyVo);
-                }
-                processStepVo.setWorkerPolicyList(workerPolicyList);
-            }
-        }
-
-        JSONArray tagList = stepConfigObj.getJSONArray("tagList");
-        if (CollectionUtils.isNotEmpty(tagList)) {
-            processStepVo.setTagList(tagList.toJavaList(String.class));
-        }
-        /** 收集引用的外部调用uuid **/
-        JSONObject automaticConfig = stepConfigObj.getJSONObject("automaticConfig");
-        if (MapUtils.isNotEmpty(automaticConfig)) {
-            List<String> integrationUuidList = new ArrayList<>();
-            JSONObject requestConfig = automaticConfig.getJSONObject("requestConfig");
-            AutomaticRequestConfigVo requestConfigVo = JSONObject.toJavaObject(requestConfig, AutomaticRequestConfigVo.class);
-            if (requestConfigVo != null) {
-                String integrationUuid = requestConfigVo.getIntegrationUuid();
-                if (StringUtils.isNotBlank(integrationUuid)) {
-                    integrationUuidList.add(integrationUuid);
-                }
-            }
-
-            JSONObject callbackConfig = automaticConfig.getJSONObject("callbackConfig");
-            AutomaticCallbackConfigVo callbackConfigVo = JSONObject.toJavaObject(callbackConfig, AutomaticCallbackConfigVo.class);
-            if (callbackConfigVo != null) {
-                AutomaticIntervalCallbackConfigVo configVo = callbackConfigVo.getConfig();
-                if (configVo != null) {
-                    String integrationUuid = configVo.getIntegrationUuid();
-                    if (StringUtils.isNotBlank(integrationUuid)) {
-                        integrationUuidList.add(integrationUuid);
-                    }
-                }
-            }
-            processStepVo.setIntegrationUuidList(integrationUuidList);
-        }
-        // 保存表单场景
-        String formSceneUuid = stepConfigObj.getString("formSceneUuid");
-        if (StringUtils.isNotBlank(formSceneUuid)) {
-            processStepVo.setFormSceneUuid(formSceneUuid);
-        }
-    }
-
     @Override
     public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) {
     }
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java
index 767e942a5..4c7b002de 100755
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java
@@ -27,12 +27,6 @@ public class ConditionProcessUtilHandler extends ProcessStepInternalHandlerBase
 		return null;
 	}
 
-	@Override
-	public void makeupProcessStep(ProcessStepVo processStepVo, JSONObject stepConfigObj) {
-		// TODO Auto-generated method stub
-
-	}
-
 	@Override
 	public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) {
 		// TODO Auto-generated method stub
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/DistributaryProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/DistributaryProcessUtilHandler.java
index db0108388..f12ce9c02 100755
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/DistributaryProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/DistributaryProcessUtilHandler.java
@@ -27,12 +27,6 @@ public class DistributaryProcessUtilHandler extends ProcessStepInternalHandlerBa
         return null;
     }
 
-    @Override
-    public void makeupProcessStep(ProcessStepVo processStepVo, JSONObject stepConfigObj) {
-        // TODO Auto-generated method stub
-
-    }
-
     @Override
     public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) {
         // TODO Auto-generated method stub
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java
index 9f257497f..dfa4b6ed1 100644
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java
@@ -30,11 +30,6 @@ public class EndProcessUtilHandler extends ProcessStepInternalHandlerBase {
         return null;
     }
 
-    @Override
-    public void makeupProcessStep(ProcessStepVo processStepVo, JSONObject stepConfigObj) {
-
-    }
-
     @Override
     public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) {
 
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java
index dfe004e11..aff6d3a61 100644
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java
@@ -44,76 +44,6 @@ public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase
         return null;
     }
 
-    @Override
-    public void makeupProcessStep(ProcessStepVo processStepVo, JSONObject stepConfigObj) {
-        /** 组装通知策略id **/
-        JSONObject notifyPolicyConfig = stepConfigObj.getJSONObject("notifyPolicyConfig");
-        InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = JSON.toJavaObject(notifyPolicyConfig, InvokeNotifyPolicyConfigVo.class);
-        if (invokeNotifyPolicyConfigVo != null) {
-            processStepVo.setNotifyPolicyConfig(invokeNotifyPolicyConfigVo);
-        }
-
-        JSONObject actionConfig = stepConfigObj.getJSONObject("actionConfig");
-        ActionConfigVo actionConfigVo = JSON.toJavaObject(actionConfig, ActionConfigVo.class);
-        if (actionConfigVo != null) {
-            List<ActionConfigActionVo> actionList = actionConfigVo.getActionList();
-            if (CollectionUtils.isNotEmpty(actionList)) {
-                List<String> integrationUuidList = new ArrayList<>();
-                for (ActionConfigActionVo actionVo : actionList) {
-                    String integrationUuid = actionVo.getIntegrationUuid();
-                    if (StringUtils.isNotBlank(integrationUuid)) {
-                        integrationUuidList.add(integrationUuid);
-                    }
-                }
-                processStepVo.setIntegrationUuidList(integrationUuidList);
-            }
-        }
-
-        /** 组装分配策略 **/
-        JSONObject workerPolicyConfig = stepConfigObj.getJSONObject("workerPolicyConfig");
-        if (MapUtils.isNotEmpty(workerPolicyConfig)) {
-            JSONArray policyList = workerPolicyConfig.getJSONArray("policyList");
-            if (CollectionUtils.isNotEmpty(policyList)) {
-                List<ProcessStepWorkerPolicyVo> workerPolicyList = new ArrayList<>();
-                for (int k = 0; k < policyList.size(); k++) {
-                    JSONObject policyObj = policyList.getJSONObject(k);
-                    if (!"1".equals(policyObj.getString("isChecked"))) {
-                        continue;
-                    }
-                    ProcessStepWorkerPolicyVo processStepWorkerPolicyVo = new ProcessStepWorkerPolicyVo();
-                    processStepWorkerPolicyVo.setProcessUuid(processStepVo.getProcessUuid());
-                    processStepWorkerPolicyVo.setProcessStepUuid(processStepVo.getUuid());
-                    processStepWorkerPolicyVo.setPolicy(policyObj.getString("type"));
-                    processStepWorkerPolicyVo.setSort(k + 1);
-                    processStepWorkerPolicyVo.setConfig(policyObj.getString("config"));
-                    workerPolicyList.add(processStepWorkerPolicyVo);
-                }
-                processStepVo.setWorkerPolicyList(workerPolicyList);
-            }
-        }
-        //保存回复模版ID
-        Long commentTemplateId = stepConfigObj.getLong("commentTemplateId");
-        processStepVo.setCommentTemplateId(commentTemplateId);
-
-        JSONArray tagList = stepConfigObj.getJSONArray("tagList");
-        if (CollectionUtils.isNotEmpty(tagList)) {
-            processStepVo.setTagList(tagList.toJavaList(String.class));
-        }
-
-        //保存子任务
-        JSONObject taskConfig = stepConfigObj.getJSONObject("taskConfig");
-        if (MapUtils.isNotEmpty(taskConfig)) {
-            ProcessStepTaskConfigVo taskConfigVo = JSON.toJavaObject(taskConfig, ProcessStepTaskConfigVo.class);
-            processStepVo.setTaskConfigVo(taskConfigVo);
-        }
-        // 保存表单场景
-        String formSceneUuid = stepConfigObj.getString("formSceneUuid");
-        if (StringUtils.isNotBlank(formSceneUuid)) {
-            processStepVo.setFormSceneUuid(formSceneUuid);
-        }
-    }
-
-
     @Override
     public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) {
         defaultUpdateProcessTaskStepUserAndWorker(processTaskId, processTaskStepId);
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/StartProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/StartProcessUtilHandler.java
index 6e5fc1d3b..64edef9e0 100755
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/StartProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/StartProcessUtilHandler.java
@@ -27,12 +27,6 @@ public class StartProcessUtilHandler extends ProcessStepInternalHandlerBase {
         return null;
     }
 
-    @Override
-    public void makeupProcessStep(ProcessStepVo processStepVo, JSONObject stepConfigObj) {
-        // TODO Auto-generated method stub
-
-    }
-
     @Override
     public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) {
         // TODO Auto-generated method stub
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java
index 947e773ac..eff886d39 100644
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java
@@ -65,37 +65,6 @@ public class TimerProcessUtilHandler extends ProcessStepInternalHandlerBase {
         return resultObj;
     }
 
-    @Override
-    public void makeupProcessStep(ProcessStepVo processStepVo, JSONObject stepConfigObj) {
-    /** 组装分配策略 **/
-        JSONObject workerPolicyConfig = stepConfigObj.getJSONObject("workerPolicyConfig");
-        if (MapUtils.isNotEmpty(workerPolicyConfig)) {
-            JSONArray policyList = workerPolicyConfig.getJSONArray("policyList");
-            if (CollectionUtils.isNotEmpty(policyList)) {
-                List<ProcessStepWorkerPolicyVo> workerPolicyList = new ArrayList<>();
-                for (int k = 0; k < policyList.size(); k++) {
-                    JSONObject policyObj = policyList.getJSONObject(k);
-                    if (!"1".equals(policyObj.getString("isChecked"))) {
-                        continue;
-                    }
-                    ProcessStepWorkerPolicyVo processStepWorkerPolicyVo = new ProcessStepWorkerPolicyVo();
-                    processStepWorkerPolicyVo.setProcessUuid(processStepVo.getProcessUuid());
-                    processStepWorkerPolicyVo.setProcessStepUuid(processStepVo.getUuid());
-                    processStepWorkerPolicyVo.setPolicy(policyObj.getString("type"));
-                    processStepWorkerPolicyVo.setSort(k + 1);
-                    processStepWorkerPolicyVo.setConfig(policyObj.getString("config"));
-                    workerPolicyList.add(processStepWorkerPolicyVo);
-                }
-                processStepVo.setWorkerPolicyList(workerPolicyList);
-            }
-        }
-        // 保存表单场景
-        String formSceneUuid = stepConfigObj.getString("formSceneUuid");
-        if (StringUtils.isNotBlank(formSceneUuid)) {
-            processStepVo.setFormSceneUuid(formSceneUuid);
-        }
-    }
-
     @Override
     public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) {
 
-- 
Gitee


From 0e9c4b6be024a9c94d1b7b8dc59258b02639fcc3 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 15:48:15 +0800
Subject: [PATCH 5/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=9D=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1320124261302272]IT服务-流程图保存逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1320124261302272
---
 .../makeup/ActionConfigMakeupHandler.java     | 30 +++++--
 .../makeup/AutomaticConfigMakeupHandler.java  | 85 +++++++++++++++++++
 .../CommentTemplateIdMakeupHandler.java       | 18 +++-
 .../makeup/FormSceneUuidMakeupHandler.java    | 16 +++-
 .../NotifyPolicyConfigMakeupHandler.java      | 23 +++--
 .../makeup/TagListMakeupHandler.java          | 43 +++++++++-
 .../makeup/TaskConfigMakeupHandler.java       | 63 ++++++++++++++
 .../WorkerPolicyConfigMakeupHandler.java      | 39 +++++----
 8 files changed, 281 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/neatlogic/module/process/stephandler/makeup/AutomaticConfigMakeupHandler.java
 create mode 100644 src/main/java/neatlogic/module/process/stephandler/makeup/TaskConfigMakeupHandler.java

diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/ActionConfigMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/ActionConfigMakeupHandler.java
index c4007a5ed..b1b13818c 100644
--- a/src/main/java/neatlogic/module/process/stephandler/makeup/ActionConfigMakeupHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/ActionConfigMakeupHandler.java
@@ -19,41 +19,55 @@ package neatlogic.module.process.stephandler.makeup;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.dependency.core.DependencyManager;
+import neatlogic.framework.exception.integration.IntegrationNotFoundException;
+import neatlogic.framework.integration.dao.mapper.IntegrationMapper;
 import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.dto.processconfig.ActionConfigActionVo;
 import neatlogic.framework.process.dto.processconfig.ActionConfigVo;
 import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
 import neatlogic.framework.process.stephandler.core.IProcessStepMakeupHandler;
+import neatlogic.module.process.dependency.handler.IntegrationProcessStepDependencyHandler;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class ActionConfigMakeupHandler implements IProcessStepMakeupHandler {
+
+    @Resource
+    private IntegrationMapper integrationMapper;
+
     @Override
     public String getName() {
         return "actionConfig";
     }
 
     @Override
-    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj) {
+    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj, String action) {
         /* 组装动作 **/
         JSONObject actionConfig = stepConfigObj.getJSONObject("actionConfig");
         ActionConfigVo actionConfigVo = JSON.toJavaObject(actionConfig, ActionConfigVo.class);
         if (actionConfigVo != null) {
             List<ActionConfigActionVo> actionList = actionConfigVo.getActionList();
             if (CollectionUtils.isNotEmpty(actionList)) {
-                List<String> integrationUuidList = new ArrayList<>();
-                for (ActionConfigActionVo actionVo : actionList) {
-                    String integrationUuid = actionVo.getIntegrationUuid();
-                    if (StringUtils.isNotBlank(integrationUuid)) {
-                        integrationUuidList.add(integrationUuid);
+                if (Objects.equals(action, "save")) {
+                    for (ActionConfigActionVo actionVo : actionList) {
+                        String integrationUuid = actionVo.getIntegrationUuid();
+                        if (StringUtils.isNotBlank(integrationUuid)) {
+                            if (integrationMapper.checkIntegrationExists(integrationUuid) == 0) {
+                                throw new IntegrationNotFoundException(integrationUuid);
+                            }
+                            DependencyManager.insert(IntegrationProcessStepDependencyHandler.class, integrationUuid, processStepVo.getUuid());
+                        }
                     }
+                } else if (Objects.equals(action, "delete")) {
+                    DependencyManager.delete(IntegrationProcessStepDependencyHandler.class, processStepVo.getUuid());
                 }
-                processStepVo.setIntegrationUuidList(integrationUuidList);
             }
         }
     }
diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/AutomaticConfigMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/AutomaticConfigMakeupHandler.java
new file mode 100644
index 000000000..dfa10109e
--- /dev/null
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/AutomaticConfigMakeupHandler.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2024  深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package neatlogic.module.process.stephandler.makeup;
+
+import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.dependency.core.DependencyManager;
+import neatlogic.framework.exception.integration.IntegrationNotFoundException;
+import neatlogic.framework.integration.dao.mapper.IntegrationMapper;
+import neatlogic.framework.process.dto.ProcessStepVo;
+import neatlogic.framework.process.dto.processconfig.AutomaticCallbackConfigVo;
+import neatlogic.framework.process.dto.processconfig.AutomaticIntervalCallbackConfigVo;
+import neatlogic.framework.process.dto.processconfig.AutomaticRequestConfigVo;
+import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
+import neatlogic.framework.process.stephandler.core.IProcessStepMakeupHandler;
+import neatlogic.module.process.dependency.handler.IntegrationProcessStepDependencyHandler;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+@Service
+public class AutomaticConfigMakeupHandler implements IProcessStepMakeupHandler {
+
+    @Resource
+    private IntegrationMapper integrationMapper;
+
+    @Override
+    public String getName() {
+        return "automaticConfig";
+    }
+
+    @Override
+    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj, String action) {
+        JSONObject automaticConfig = stepConfigObj.getJSONObject("automaticConfig");
+        if (MapUtils.isNotEmpty(automaticConfig)) {
+            if (Objects.equals(action, "save")) {
+                JSONObject requestConfig = automaticConfig.getJSONObject("requestConfig");
+                AutomaticRequestConfigVo requestConfigVo = JSONObject.toJavaObject(requestConfig, AutomaticRequestConfigVo.class);
+                if (requestConfigVo != null) {
+                    String integrationUuid = requestConfigVo.getIntegrationUuid();
+                    if (StringUtils.isNotBlank(integrationUuid)) {
+                        if (integrationMapper.checkIntegrationExists(integrationUuid) == 0) {
+                            throw new IntegrationNotFoundException(integrationUuid);
+                        }
+                        DependencyManager.insert(IntegrationProcessStepDependencyHandler.class, integrationUuid, processStepVo.getUuid());
+                    }
+                }
+
+                JSONObject callbackConfig = automaticConfig.getJSONObject("callbackConfig");
+                AutomaticCallbackConfigVo callbackConfigVo = JSONObject.toJavaObject(callbackConfig, AutomaticCallbackConfigVo.class);
+                if (callbackConfigVo != null) {
+                    AutomaticIntervalCallbackConfigVo configVo = callbackConfigVo.getConfig();
+                    if (configVo != null) {
+                        String integrationUuid = configVo.getIntegrationUuid();
+                        if (StringUtils.isNotBlank(integrationUuid)) {
+                            if (integrationMapper.checkIntegrationExists(integrationUuid) == 0) {
+                                throw new IntegrationNotFoundException(integrationUuid);
+                            }
+                            DependencyManager.insert(IntegrationProcessStepDependencyHandler.class, integrationUuid, processStepVo.getUuid());
+                        }
+                    }
+                }
+            } else if (Objects.equals(action, "delete")) {
+                DependencyManager.delete(IntegrationProcessStepDependencyHandler.class, processStepVo.getUuid());
+            }
+        }
+    }
+}
diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/CommentTemplateIdMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/CommentTemplateIdMakeupHandler.java
index e2c1acd17..c6a0c2e61 100644
--- a/src/main/java/neatlogic/module/process/stephandler/makeup/CommentTemplateIdMakeupHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/CommentTemplateIdMakeupHandler.java
@@ -21,19 +21,33 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
 import neatlogic.framework.process.stephandler.core.IProcessStepMakeupHandler;
+import neatlogic.module.process.dao.mapper.process.ProcessMapper;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Objects;
+
 @Service
 public class CommentTemplateIdMakeupHandler implements IProcessStepMakeupHandler {
+
+    @Resource
+    private ProcessMapper processMapper;
+
     @Override
     public String getName() {
         return "commentTemplateId";
     }
 
     @Override
-    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj) {
+    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj, String action) {
         //保存回复模版ID
         Long commentTemplateId = stepConfigObj.getLong("commentTemplateId");
-        processStepVo.setCommentTemplateId(commentTemplateId);
+        if (commentTemplateId != null) {
+            if (Objects.equals(action, "save")) {
+                processMapper.insertProcessStepCommentTemplate(processStepVo);
+            } else if (Objects.equals(action, "delete")) {
+                processMapper.deleteProcessStepCommentTemplate(processStepVo.getUuid());
+            }
+        }
     }
 }
diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/FormSceneUuidMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/FormSceneUuidMakeupHandler.java
index 15a313706..3db818752 100644
--- a/src/main/java/neatlogic/module/process/stephandler/makeup/FormSceneUuidMakeupHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/FormSceneUuidMakeupHandler.java
@@ -18,12 +18,16 @@
 package neatlogic.module.process.stephandler.makeup;
 
 import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.dependency.core.DependencyManager;
 import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
 import neatlogic.framework.process.stephandler.core.IProcessStepMakeupHandler;
+import neatlogic.module.process.dependency.handler.FormScene2ProcessStepDependencyHandler;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 @Service
 public class FormSceneUuidMakeupHandler implements IProcessStepMakeupHandler {
     @Override
@@ -32,11 +36,19 @@ public class FormSceneUuidMakeupHandler implements IProcessStepMakeupHandler {
     }
 
     @Override
-    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj) {
+    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj, String action) {
         // 保存表单场景
         String formSceneUuid = stepConfigObj.getString("formSceneUuid");
         if (StringUtils.isNotBlank(formSceneUuid)) {
-            processStepVo.setFormSceneUuid(formSceneUuid);
+            if (Objects.equals(action, "save")) {
+                JSONObject config = new JSONObject();
+                config.put("processUuid", processStepVo.getProcessUuid());
+                config.put("stepUuid", processStepVo.getUuid());
+                config.put("stepName", processStepVo.getName());
+                DependencyManager.insert(FormScene2ProcessStepDependencyHandler.class, formSceneUuid, processStepVo.getUuid(), config);
+            } else if (Objects.equals(action, "delete")) {
+                DependencyManager.delete(FormScene2ProcessStepDependencyHandler.class, processStepVo.getUuid());
+            }
         }
     }
 }
diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/NotifyPolicyConfigMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/NotifyPolicyConfigMakeupHandler.java
index 8b00b1c22..0e5d8130f 100644
--- a/src/main/java/neatlogic/module/process/stephandler/makeup/NotifyPolicyConfigMakeupHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/NotifyPolicyConfigMakeupHandler.java
@@ -17,14 +17,19 @@
 
 package neatlogic.module.process.stephandler.makeup;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.crossover.CrossoverServiceFactory;
+import neatlogic.framework.dependency.core.DependencyManager;
+import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService;
 import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo;
 import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
 import neatlogic.framework.process.stephandler.core.IProcessStepMakeupHandler;
+import neatlogic.module.process.dependency.handler.NotifyPolicyProcessStepDependencyHandler;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 @Service
 public class NotifyPolicyConfigMakeupHandler implements IProcessStepMakeupHandler {
     @Override
@@ -33,12 +38,18 @@ public class NotifyPolicyConfigMakeupHandler implements IProcessStepMakeupHandle
     }
 
     @Override
-    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj) {
+    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj, String action) {
         /* 组装通知策略id **/
-        JSONObject notifyPolicyConfig = stepConfigObj.getJSONObject("notifyPolicyConfig");
-        InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = JSON.toJavaObject(notifyPolicyConfig, InvokeNotifyPolicyConfigVo.class);
-        if (invokeNotifyPolicyConfigVo != null) {
-            processStepVo.setNotifyPolicyConfig(invokeNotifyPolicyConfigVo);
+        InvokeNotifyPolicyConfigVo notifyPolicyConfig = stepConfigObj.getObject("notifyPolicyConfig", InvokeNotifyPolicyConfigVo.class);
+        if (notifyPolicyConfig != null) {
+            INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class);
+            if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) {
+                if (Objects.equals(action, "save")) {
+                    DependencyManager.insert(NotifyPolicyProcessStepDependencyHandler.class, notifyPolicyConfig.getPolicyId(), processStepVo.getUuid());
+                } else if (Objects.equals(action, "delete")) {
+                    DependencyManager.delete(NotifyPolicyProcessStepDependencyHandler.class, processStepVo.getUuid());
+                }
+            }
         }
     }
 }
diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/TagListMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/TagListMakeupHandler.java
index 143aa4ec5..d10174aac 100644
--- a/src/main/java/neatlogic/module/process/stephandler/makeup/TagListMakeupHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/TagListMakeupHandler.java
@@ -19,24 +19,63 @@ package neatlogic.module.process.stephandler.makeup;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.process.dto.ProcessStepTagVo;
 import neatlogic.framework.process.dto.ProcessStepVo;
+import neatlogic.framework.process.dto.ProcessTagVo;
 import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
 import neatlogic.framework.process.stephandler.core.IProcessStepMakeupHandler;
+import neatlogic.module.process.dao.mapper.process.ProcessMapper;
+import neatlogic.module.process.dao.mapper.process.ProcessTagMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+
 @Service
 public class TagListMakeupHandler implements IProcessStepMakeupHandler {
+
+    @Resource
+    private ProcessMapper processMapper;
+
+    @Resource
+    private ProcessTagMapper processTagMapper;
     @Override
     public String getName() {
         return "tagList";
     }
 
     @Override
-    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj) {
+    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj, String action) {
         JSONArray tagList = stepConfigObj.getJSONArray("tagList");
         if (CollectionUtils.isNotEmpty(tagList)) {
-            processStepVo.setTagList(tagList.toJavaList(String.class));
+            if (Objects.equals(action, "save")) {
+                List<String> tagNameList = tagList.toJavaList(String.class);
+                if (CollectionUtils.isNotEmpty(tagNameList)) {
+                    ProcessStepTagVo processStepTagVo = new ProcessStepTagVo();
+                    processStepTagVo.setProcessUuid(processStepVo.getProcessUuid());
+                    processStepTagVo.setProcessStepUuid(processStepVo.getUuid());
+                    List<ProcessTagVo> processTagList = processTagMapper.getProcessTagByNameList(tagNameList);
+                    for (ProcessTagVo processTagVo : processTagList) {
+                        processStepTagVo.setTagId(processTagVo.getId());
+                        tagNameList.remove(processTagVo.getName());
+                        processStepTagVo.setProcessUuid(processStepVo.getProcessUuid());
+                        processMapper.insertProcessStepTag(processStepTagVo);
+                    }
+                    if (CollectionUtils.isNotEmpty(tagNameList)) {
+                        for (String tagName : tagNameList) {
+                            ProcessTagVo processTagVo = new ProcessTagVo(tagName);
+                            processTagMapper.insertProcessTag(processTagVo);
+                            processStepTagVo.setTagId(processTagVo.getId());
+                            processStepTagVo.setProcessUuid(processStepVo.getProcessUuid());
+                            processMapper.insertProcessStepTag(processStepTagVo);
+                        }
+                    }
+                }
+            } else if (Objects.equals(action, "delete")) {
+                processMapper.deleteProcessStepTagByProcessStepUuid(processStepVo.getUuid());
+            }
         }
     }
 }
diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/TaskConfigMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/TaskConfigMakeupHandler.java
new file mode 100644
index 000000000..3bfb27bf5
--- /dev/null
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/TaskConfigMakeupHandler.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2024  深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package neatlogic.module.process.stephandler.makeup;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.process.dto.ProcessStepTaskConfigVo;
+import neatlogic.framework.process.dto.ProcessStepVo;
+import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
+import neatlogic.framework.process.stephandler.core.IProcessStepMakeupHandler;
+import neatlogic.module.process.dao.mapper.process.ProcessMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+@Service
+public class TaskConfigMakeupHandler implements IProcessStepMakeupHandler {
+
+    @Resource
+    private ProcessMapper processMapper;
+
+    @Override
+    public String getName() {
+        return "taskConfig";
+    }
+
+    @Override
+    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj, String action) {
+        //保存子任务
+        JSONObject taskConfig = stepConfigObj.getJSONObject("taskConfig");
+        if (MapUtils.isNotEmpty(taskConfig)) {
+            ProcessStepTaskConfigVo taskConfigVo = JSON.toJavaObject(taskConfig, ProcessStepTaskConfigVo.class);
+            if (CollectionUtils.isNotEmpty(taskConfigVo.getIdList())) {
+                if (Objects.equals(action, "save")) {
+                    taskConfigVo.getIdList().forEach(id -> {
+                        ProcessStepTaskConfigVo tmpVo = new ProcessStepTaskConfigVo(processStepVo.getUuid(), id);
+                        processMapper.insertProcessStepTask(tmpVo);
+                    });
+                } else if (Objects.equals(action, "delete")) {
+                    processMapper.deleteProcessStepTaskByProcessStepUuid(processStepVo.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 b52ecdb54..34efc6e21 100644
--- a/src/main/java/neatlogic/module/process/stephandler/makeup/WorkerPolicyConfigMakeupHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/WorkerPolicyConfigMakeupHandler.java
@@ -23,42 +23,49 @@ import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo;
 import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
 import neatlogic.framework.process.stephandler.core.IProcessStepMakeupHandler;
+import neatlogic.module.process.dao.mapper.process.ProcessMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.Objects;
 
 @Service
 public class WorkerPolicyConfigMakeupHandler implements IProcessStepMakeupHandler {
+
+    @Resource
+    private ProcessMapper processMapper;
+
     @Override
     public String getName() {
         return "workerPolicyConfig";
     }
 
     @Override
-    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj) {
+    public void makeup(IProcessStepInternalHandler processStepInternalHandler, ProcessStepVo processStepVo, JSONObject stepConfigObj, String action) {
         /* 组装分配策略 **/
         JSONObject workerPolicyConfig = stepConfigObj.getJSONObject("workerPolicyConfig");
         if (MapUtils.isNotEmpty(workerPolicyConfig)) {
             JSONArray policyList = workerPolicyConfig.getJSONArray("policyList");
             if (CollectionUtils.isNotEmpty(policyList)) {
-                List<ProcessStepWorkerPolicyVo> workerPolicyList = new ArrayList<>();
-                for (int k = 0; k < policyList.size(); k++) {
-                    JSONObject policyObj = policyList.getJSONObject(k);
-                    if (!"1".equals(policyObj.getString("isChecked"))) {
-                        continue;
+                if (Objects.equals(action, "save")) {
+                    for (int k = 0; k < policyList.size(); k++) {
+                        JSONObject policyObj = policyList.getJSONObject(k);
+                        if (!"1".equals(policyObj.getString("isChecked"))) {
+                            continue;
+                        }
+                        ProcessStepWorkerPolicyVo processStepWorkerPolicyVo = new ProcessStepWorkerPolicyVo();
+                        processStepWorkerPolicyVo.setProcessUuid(processStepVo.getProcessUuid());
+                        processStepWorkerPolicyVo.setProcessStepUuid(processStepVo.getUuid());
+                        processStepWorkerPolicyVo.setPolicy(policyObj.getString("type"));
+                        processStepWorkerPolicyVo.setSort(k + 1);
+                        processStepWorkerPolicyVo.setConfig(policyObj.getString("config"));
+                        processMapper.insertProcessStepWorkerPolicy(processStepWorkerPolicyVo);
                     }
-                    ProcessStepWorkerPolicyVo processStepWorkerPolicyVo = new ProcessStepWorkerPolicyVo();
-                    processStepWorkerPolicyVo.setProcessUuid(processStepVo.getProcessUuid());
-                    processStepWorkerPolicyVo.setProcessStepUuid(processStepVo.getUuid());
-                    processStepWorkerPolicyVo.setPolicy(policyObj.getString("type"));
-                    processStepWorkerPolicyVo.setSort(k + 1);
-                    processStepWorkerPolicyVo.setConfig(policyObj.getString("config"));
-                    workerPolicyList.add(processStepWorkerPolicyVo);
+                } else if (Objects.equals(action, "delete")) {
+                    processMapper.deleteProcessStepWorkerPolicyByProcessStepUuid(processStepVo.getUuid());
                 }
-                processStepVo.setWorkerPolicyList(workerPolicyList);
             }
         }
     }
-- 
Gitee


From a19873c93de4ce289ae05a0eed41cb6b40121a37 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 16:02:19 +0800
Subject: [PATCH 6/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=9D=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1320124261302272]IT服务-流程图保存逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1320124261302272
---
 .../process/service/ProcessService.java       |   6 -
 .../process/service/ProcessServiceImpl.java   | 364 ++++++++++--------
 2 files changed, 208 insertions(+), 162 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/service/ProcessService.java b/src/main/java/neatlogic/module/process/service/ProcessService.java
index 9031f3fb3..f45dba4af 100755
--- a/src/main/java/neatlogic/module/process/service/ProcessService.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessService.java
@@ -7,12 +7,6 @@ public interface ProcessService {
 
 	int saveProcess(ProcessVo processVo) throws ProcessNameRepeatException;
 
-	/**
-	 * 删除流程相关数据
-	 * @param uuid 流程uuid
-	 */
-//	void deleteProcessRelevantData(String uuid);
-
 	/**
 	 * 保存或删除流程的依赖关系数据
 	 * @param processVo 流程信息
diff --git a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java
index dfb599040..ed82617b9 100644
--- a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java
@@ -15,6 +15,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.module.process.service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.asynchronization.threadlocal.UserContext;
 import neatlogic.framework.crossover.CrossoverServiceFactory;
@@ -25,24 +27,33 @@ import neatlogic.framework.form.exception.FormNotFoundException;
 import neatlogic.framework.integration.dao.mapper.IntegrationMapper;
 import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService;
 import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo;
+import neatlogic.framework.process.constvalue.ProcessFlowDirection;
+import neatlogic.framework.process.constvalue.ProcessStepHandlerType;
+import neatlogic.framework.process.constvalue.ProcessStepType;
 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.sla.SlaCalculateHandlerNotFoundException;
 import neatlogic.framework.process.sla.core.ISlaCalculateHandler;
 import neatlogic.framework.process.sla.core.SlaCalculateHandlerFactory;
+import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
+import neatlogic.framework.process.stephandler.core.ProcessStepHandlerTypeFactory;
+import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory;
 import neatlogic.framework.util.UuidUtil;
 import neatlogic.module.process.dao.mapper.process.ProcessMapper;
-import neatlogic.module.process.dao.mapper.process.ProcessTagMapper;
 import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper;
-import neatlogic.module.process.dependency.handler.*;
+import neatlogic.module.process.dependency.handler.IntegrationProcessDependencyHandler;
+import neatlogic.module.process.dependency.handler.NotifyPolicyProcessDependencyHandler;
+import neatlogic.module.process.dependency.handler.NotifyPolicyProcessSlaDependencyHandler;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 @Service
 public class ProcessServiceImpl implements ProcessService, IProcessCrossoverService {
@@ -50,15 +61,9 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ
     @Resource
     private ProcessMapper processMapper;
 
-    @Resource
-    private ProcessTagMapper processTagMapper;
-
     @Resource
     private FormMapper formMapper;
 
-    //@Resource
-    //private NotifyMapper notifyMapper;
-
     @Resource
     private IntegrationMapper integrationMapper;
 
@@ -67,196 +72,243 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ
 
     @Override
     public int saveProcess(ProcessVo processVo) throws ProcessNameRepeatException {
-        INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class);
         if (processMapper.checkProcessNameIsRepeat(processVo) > 0) {
             throw new ProcessNameRepeatException(processVo.getName());
         }
         String uuid = processVo.getUuid();
-        if (processMapper.checkProcessIsExists(uuid) > 0) {
-            deleteProcessRelevantData(uuid);
+        ProcessVo oldProcessVo = processMapper.getProcessByUuid(uuid);
+        if (oldProcessVo != null) {
+            saveOrDeleteProcessDependency(oldProcessVo, "delete");
             processMapper.updateProcess(processVo);
         } else {
             processVo.setFcu(UserContext.get().getUserUuid(true));
             processMapper.insertProcess(processVo);
         }
-
+        saveOrDeleteProcessDependency(processVo, "save");
         /* 清空自己的草稿 **/
         ProcessDraftVo processDraftVo = new ProcessDraftVo();
         processDraftVo.setProcessUuid(uuid);
         processDraftVo.setFcu(UserContext.get().getUserUuid(true));
         processMapper.deleteProcessDraft(processDraftVo);
+        return 1;
+    }
 
-        String formUuid = processVo.getFormUuid();
-        if (StringUtils.isNotBlank(formUuid)) {
-            if (formMapper.checkFormIsExists(formUuid) == 0) {
-                throw new FormNotFoundException(formUuid);
-            }
-            processMapper.insertProcessForm(new ProcessFormVo(uuid, formUuid));
+    @Override
+    public void saveOrDeleteProcessDependency(ProcessVo processVo, String action) {
+        JSONObject config = processVo.getConfig();
+        if (MapUtils.isEmpty(config)) {
+            return;
+        }
+        JSONObject processObj = config.getJSONObject("process");
+        if (MapUtils.isEmpty(processObj)) {
+            return;
         }
 
-        if (CollectionUtils.isNotEmpty(processVo.getSlaList())) {
-            for (ProcessSlaVo slaVo : processVo.getSlaList()) {
-                ISlaCalculateHandler slaCalculateHandler = SlaCalculateHandlerFactory.getHandler(slaVo.getCalculateHandler());
-                if (slaCalculateHandler == null) {
-                    throw new SlaCalculateHandlerNotFoundException(slaVo.getCalculateHandler());
-                }
-                if (CollectionUtils.isEmpty(slaVo.getProcessStepUuidList())) {
-                    continue;
-                }
-                if (Objects.equals(slaCalculateHandler.isSum(), 1)) {
-                    //关联的多个步骤共用一个时效
-                    processMapper.insertProcessSla(slaVo);
-                    for (String stepUuid : slaVo.getProcessStepUuidList()) {
-                        processMapper.insertProcessStepSla(stepUuid, slaVo.getUuid());
+        JSONObject formConfig = processObj.getJSONObject("formConfig");
+        if (MapUtils.isNotEmpty(formConfig)) {
+            String formUuid = formConfig.getString("uuid");
+            if (StringUtils.isNotBlank(formUuid)) {
+                if (Objects.equals(action, "save")) {
+                    if (formMapper.checkFormIsExists(formUuid) == 0) {
+                        throw new FormNotFoundException(formUuid);
                     }
-                    for (InvokeNotifyPolicyConfigVo notifyPolicyConfig : slaVo.getNotifyPolicyConfigList()) {
-                        if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) {
-                            DependencyManager.insert(NotifyPolicyProcessSlaDependencyHandler.class, notifyPolicyConfig.getPolicyId(), slaVo.getUuid());
+                    processMapper.insertProcessForm(new ProcessFormVo(processVo.getUuid(), formUuid));
+                } else if (Objects.equals(action, "delete")) {
+                    processMapper.deleteProcessFormByProcessUuid(processVo.getUuid());
+                }
+            }
+        }
+        JSONArray slaList = processObj.getJSONArray("slaList");
+        if (CollectionUtils.isNotEmpty(slaList)) {
+            if (Objects.equals(action, "save")) {
+                for (int i = 0; i < slaList.size(); i++) {
+                    JSONObject slaObj = slaList.getJSONObject(i);
+                    /* 关联了步骤的sla策略才保存 **/
+                    JSONArray processStepUuidList = slaObj.getJSONArray("processStepUuidList");
+                    if (CollectionUtils.isNotEmpty(processStepUuidList)) {
+                        String calculateHandler = slaObj.getString("calculateHandler");
+                        ISlaCalculateHandler slaCalculateHandler = SlaCalculateHandlerFactory.getHandler(calculateHandler);
+                        if (slaCalculateHandler == null) {
+                            throw new SlaCalculateHandlerNotFoundException(calculateHandler);
                         }
-                    }
-                } else {
-                    //关联的多个步骤各用一个时效
-                    for (String stepUuid : slaVo.getProcessStepUuidList()) {
-                        slaVo.setUuid(UuidUtil.randomUuid());
-                        processMapper.insertProcessSla(slaVo);
-                        processMapper.insertProcessStepSla(stepUuid, slaVo.getUuid());
-                        for (InvokeNotifyPolicyConfigVo notifyPolicyConfig : slaVo.getNotifyPolicyConfigList()) {
-                            if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) {
-                                DependencyManager.insert(NotifyPolicyProcessSlaDependencyHandler.class, notifyPolicyConfig.getPolicyId(), slaVo.getUuid());
+                        List<String> slaUuidList = new ArrayList<>();
+                        ProcessSlaVo processSlaVo = new ProcessSlaVo();
+                        processSlaVo.setProcessUuid(processVo.getUuid());
+                        processSlaVo.setName(slaObj.getString("name"));
+                        processSlaVo.setCalculateHandler(calculateHandler);
+                        processSlaVo.setConfig(slaObj.toJSONString());
+
+                        if (Objects.equals(slaCalculateHandler.isSum(), 1)) {
+                            //关联的多个步骤共用一个时效
+                            processSlaVo.setUuid(slaObj.getString("uuid"));
+                            processMapper.insertProcessSla(processSlaVo);
+                            for (int p = 0; p < processStepUuidList.size(); p++) {
+                                String stepUuid = processStepUuidList.getString(p);
+                                processMapper.insertProcessStepSla(stepUuid, processSlaVo.getUuid());
+                            }
+                            slaUuidList.add(processSlaVo.getUuid());
+                        } else {
+                            //关联的多个步骤各用一个时效
+                            for (int p = 0; p < processStepUuidList.size(); p++) {
+                                String stepUuid = processStepUuidList.getString(p);
+                                processSlaVo.setUuid(UuidUtil.randomUuid());
+                                processMapper.insertProcessSla(processSlaVo);
+                                processMapper.insertProcessStepSla(stepUuid, processSlaVo.getUuid());
+                                slaUuidList.add(processSlaVo.getUuid());
+                            }
+                        }
+
+                        JSONArray notifyPolicyList = slaObj.getJSONArray("notifyPolicyList");
+                        if (CollectionUtils.isNotEmpty(notifyPolicyList)) {
+                            INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class);
+                            for (int j = 0; j < notifyPolicyList.size(); j++) {
+                                JSONObject notifyPolicy = notifyPolicyList.getJSONObject(j);
+                                if (MapUtils.isNotEmpty(notifyPolicy)) {
+                                    InvokeNotifyPolicyConfigVo notifyPolicyConfig = notifyPolicy.getObject("notifyPolicyConfig", InvokeNotifyPolicyConfigVo.class);
+                                    if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) {
+                                        for (String slaUuid : slaUuidList) {
+                                            DependencyManager.insert(NotifyPolicyProcessSlaDependencyHandler.class, notifyPolicyConfig.getPolicyId(), slaUuid);
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
                 }
+            } else if (Objects.equals(action, "delete")) {
+                List<String> slaUuidList = processMapper.getSlaUuidListByProcessUuid(processVo.getUuid());
+                DependencyManager.delete(NotifyPolicyProcessSlaDependencyHandler.class, slaUuidList);
+                processMapper.deleteProcessSlaByProcessUuid(processVo.getUuid());
             }
+
         }
+        String virtualStartStepUuid = "";// 虚拟开始节点uuid
+        Map<String, ProcessStepVo> stepMap = new HashMap<>();
+        JSONArray stepList = processObj.getJSONArray("stepList");
+        if (CollectionUtils.isNotEmpty(stepList)) {
+            for (int i = 0; i < stepList.size(); i++) {
+                JSONObject stepObj = stepList.getJSONObject(i);
+                String handler = stepObj.getString("handler");
+                if (ProcessStepHandlerType.START.getHandler().equals(handler)) {// 找到虚拟开始节点uuid,虚拟开始节点不写入process_step表
+                    virtualStartStepUuid = stepObj.getString("uuid");
+                    continue;
+                }
+                ProcessStepVo processStepVo = new ProcessStepVo();
+                processStepVo.setProcessUuid(processVo.getUuid());
+                processStepVo.setConfig(stepObj.getString("stepConfig"));
 
-        if (CollectionUtils.isNotEmpty(processVo.getStepList())) {
-            for (ProcessStepVo stepVo : processVo.getStepList()) {
-                List<String> integrationUuidList = stepVo.getIntegrationUuidList();
-                if (CollectionUtils.isNotEmpty(integrationUuidList)) {
-                    for (String integrationUuid : integrationUuidList) {
-                        if (integrationMapper.checkIntegrationExists(integrationUuid) == 0) {
-                            throw new IntegrationNotFoundException(integrationUuid);
-                        }
-                        DependencyManager.insert(IntegrationProcessStepDependencyHandler.class, integrationUuid, stepVo.getUuid());
-                    }
+                String uuid = stepObj.getString("uuid");
+                if (StringUtils.isNotBlank(uuid)) {
+                    processStepVo.setUuid(uuid);
                 }
-                processMapper.insertProcessStep(stepVo);
-//                if (CollectionUtils.isNotEmpty(stepVo.getFormAttributeList())) {
-//                    for (ProcessStepFormAttributeVo processStepAttributeVo : stepVo.getFormAttributeList()) {
-//                        processMapper.insertProcessStepFormAttribute(processStepAttributeVo);
-//                    }
-//                }
-                if (StringUtils.isNotBlank(stepVo.getFormSceneUuid())) {
-                    JSONObject config = new JSONObject();
-                    config.put("processUuid", uuid);
-                    config.put("processName", processVo.getName());
-                    config.put("stepUuid", stepVo.getUuid());
-                    config.put("stepName", stepVo.getName());
-                    DependencyManager.insert(FormScene2ProcessStepDependencyHandler.class, stepVo.getFormSceneUuid(), stepVo.getUuid(), config);
+                String name = stepObj.getString("name");
+                if (StringUtils.isNotBlank(name)) {
+                    processStepVo.setName(name);
                 }
-                if (CollectionUtils.isNotEmpty(stepVo.getEoaTemplateIdList())) {
-                    for (Long eoaTemplateId : stepVo.getEoaTemplateIdList()) {
-                        JSONObject config = new JSONObject();
-                        config.put("processUuid", uuid);
-                        config.put("processName", processVo.getName());
-                        config.put("stepUuid", stepVo.getUuid());
-                        config.put("stepName", stepVo.getName());
-                        DependencyManager.insert(EoaTemplate2ProcessStepDependencyHandler.class, eoaTemplateId, stepVo.getUuid(), config);
-                    }
-                }
-                if (CollectionUtils.isNotEmpty(stepVo.getWorkerPolicyList())) {
-                    for (ProcessStepWorkerPolicyVo processStepWorkerPolicyVo : stepVo.getWorkerPolicyList()) {
-                        processMapper.insertProcessStepWorkerPolicy(processStepWorkerPolicyVo);
+
+                if (StringUtils.isNotBlank(handler)) {
+                    processStepVo.setHandler(handler);
+                    String type = ProcessStepHandlerTypeFactory.getType(handler);
+                    processStepVo.setType(type);
+                    IProcessStepInternalHandler processStepUtilHandler = ProcessStepInternalHandlerFactory.getHandler(handler);
+                    if (processStepUtilHandler != null) {
+                        JSONObject stepConfigObj = stepObj.getJSONObject("stepConfig");
+                        if (stepConfigObj != null) {
+                            processStepVo.setProcessUuid(processVo.getUuid());
+                            processStepUtilHandler.makeupProcessStep(processStepVo, stepConfigObj, action);
+                        }
+                    } else {
+                        throw new ProcessStepHandlerNotFoundException(handler);
                     }
                 }
-                InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = stepVo.getNotifyPolicyConfig();
-                if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(invokeNotifyPolicyConfigVo)) {
-                    DependencyManager.insert(NotifyPolicyProcessStepDependencyHandler.class, invokeNotifyPolicyConfigVo.getPolicyId(), stepVo.getUuid());
-                }
-                processMapper.deleteProcessStepCommentTemplate(stepVo.getUuid());
-                if (stepVo.getCommentTemplateId() != null) {
-                    processMapper.insertProcessStepCommentTemplate(stepVo);
+                if (Objects.equals(action, "save")) {
+                    processMapper.insertProcessStep(processStepVo);
                 }
-                List<String> tagNameList = stepVo.getTagList();
-                if (CollectionUtils.isNotEmpty(tagNameList)) {
-                    ProcessStepTagVo processStepTagVo = new ProcessStepTagVo();
-                    processStepTagVo.setProcessUuid(stepVo.getProcessUuid());
-                    processStepTagVo.setProcessStepUuid(stepVo.getUuid());
-                    List<ProcessTagVo> processTagList = processTagMapper.getProcessTagByNameList(tagNameList);
-                    for (ProcessTagVo processTagVo : processTagList) {
-                        processStepTagVo.setTagId(processTagVo.getId());
-                        tagNameList.remove(processTagVo.getName());
-                        processMapper.insertProcessStepTag(processStepTagVo);
-                    }
-                    if (CollectionUtils.isNotEmpty(tagNameList)) {
-                        for (String tagName : tagNameList) {
-                            ProcessTagVo processTagVo = new ProcessTagVo(tagName);
-                            processTagMapper.insertProcessTag(processTagVo);
-                            processStepTagVo.setTagId(processTagVo.getId());
-                            processMapper.insertProcessStepTag(processStepTagVo);
+                stepMap.put(processStepVo.getUuid(), processStepVo);
+            }
+            if (Objects.equals(action, "delete")) {
+                processMapper.deleteProcessStepByProcessUuid(processVo.getUuid());
+            }
+        }
+
+        JSONArray relList = processObj.getJSONArray("connectionList");
+        if (CollectionUtils.isNotEmpty(relList)) {
+            if (Objects.equals(action, "save")) {
+                for (int i = 0; i < relList.size(); i++) {
+                    ProcessStepRelVo processStepRelVo = relList.getObject(i, ProcessStepRelVo.class);
+                    String fromStepUuid = processStepRelVo.getFromStepUuid();
+                    String toStepUuid = processStepRelVo.getToStepUuid();
+                    if (virtualStartStepUuid.equals(fromStepUuid)) {// 通过虚拟开始节点连线找到真正的开始步骤
+                        ProcessStepVo startStep = stepMap.get(toStepUuid);
+                        if (startStep != null) {
+                            startStep.setType(ProcessStepType.START.getValue());
                         }
+                        continue;
                     }
-                }
-
-                //子任务
-                ProcessStepTaskConfigVo taskConfigVo = stepVo.getTaskConfigVo();
-                processMapper.deleteProcessStepTaskByProcessStepUuid(stepVo.getUuid());
-                if (taskConfigVo != null) {
-                    if (CollectionUtils.isNotEmpty(taskConfigVo.getIdList())) {
-                        taskConfigVo.getIdList().forEach(id -> {
-                            ProcessStepTaskConfigVo tmpVo = new ProcessStepTaskConfigVo(stepVo.getUuid(), id);
-                            processMapper.insertProcessStepTask(tmpVo);
-                        });
+                    processStepRelVo.setProcessUuid(processVo.getUuid());
+                    String type = processStepRelVo.getType();
+                    if (!ProcessFlowDirection.BACKWARD.getValue().equals(type)) {
+                        type = ProcessFlowDirection.FORWARD.getValue();
                     }
+                    processStepRelVo.setType(type);
+                    processMapper.insertProcessStepRel(processStepRelVo);
                 }
+            } else if (Objects.equals(action, "delete")) {
+                processMapper.deleteProcessStepRelByProcessUuid(processVo.getUuid());
             }
         }
 
-        if (CollectionUtils.isNotEmpty(processVo.getStepRelList())) {
-            for (ProcessStepRelVo stepRelVo : processVo.getStepRelList()) {
-                processMapper.insertProcessStepRel(stepRelVo);
-            }
-        }
+        /* 组装评分设置 */
+        JSONObject scoreConfig = processObj.getJSONObject("scoreConfig");
+        if (MapUtils.isNotEmpty(scoreConfig)) {
+            Integer isActive = scoreConfig.getInteger("isActive");
+            if (Objects.equals(isActive, 1)) {
+                if (Objects.equals(action, "save")) {
+                    ProcessScoreTemplateVo processScoreTemplateVo = JSON.toJavaObject(scoreConfig, ProcessScoreTemplateVo.class);
+                    processScoreTemplateVo.setProcessUuid(processVo.getUuid());
+                    scoreTemplateMapper.insertProcessScoreTemplate(processScoreTemplateVo);
+                } else if (Objects.equals(action, "delete")) {
+                    scoreTemplateMapper.deleteProcessScoreTemplateByProcessUuid(processVo.getUuid());
+                }
 
-        if (processVo.getProcessScoreTemplateVo() != null) {
-            scoreTemplateMapper.insertProcessScoreTemplate(processVo.getProcessScoreTemplateVo());
+            }
         }
 
-        InvokeNotifyPolicyConfigVo notifyPolicyConfig = processVo.getNotifyPolicyConfig();
-        if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) {
-            DependencyManager.insert(NotifyPolicyProcessDependencyHandler.class, notifyPolicyConfig.getPolicyId(), uuid);
-        }
-        if (CollectionUtils.isNotEmpty(processVo.getIntegrationUuidList())) {
-            for (String integrationUuid : processVo.getIntegrationUuidList()) {
-                if (integrationMapper.checkIntegrationExists(integrationUuid) == 0) {
-                    throw new IntegrationNotFoundException(integrationUuid);
+        /* 组装通知策略 **/
+        JSONObject processConfig = processObj.getJSONObject("processConfig");
+        if (MapUtils.isNotEmpty(processConfig)) {
+            InvokeNotifyPolicyConfigVo notifyPolicyConfig = processConfig.getObject("notifyPolicyConfig", InvokeNotifyPolicyConfigVo.class);
+            if (notifyPolicyConfig != null) {
+                INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class);
+                if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) {
+                    if (Objects.equals(action, "save")) {
+                        DependencyManager.insert(NotifyPolicyProcessDependencyHandler.class, notifyPolicyConfig.getPolicyId(), processVo.getUuid());
+                    } else if (Objects.equals(action, "delete")) {
+                        DependencyManager.delete(NotifyPolicyProcessDependencyHandler.class, processVo.getUuid());
+                    }
                 }
-                DependencyManager.insert(IntegrationProcessDependencyHandler.class, integrationUuid, uuid);
             }
-        }
-        return 1;
-    }
 
-    @Override
-    public void deleteProcessRelevantData(String uuid) {
-        List<String> slaUuidList = processMapper.getSlaUuidListByProcessUuid(uuid);
-        List<String> processStepUuidList = processMapper.getProcessStepUuidListByProcessUuid(uuid);
-        DependencyManager.delete(NotifyPolicyProcessSlaDependencyHandler.class, slaUuidList);
-        DependencyManager.delete(NotifyPolicyProcessStepDependencyHandler.class, processStepUuidList);
-        DependencyManager.delete(IntegrationProcessStepDependencyHandler.class, processStepUuidList);
-        DependencyManager.delete(NotifyPolicyProcessDependencyHandler.class, uuid);
-        DependencyManager.delete(IntegrationProcessDependencyHandler.class, uuid);
-        processMapper.deleteProcessStepWorkerPolicyByProcessUuid(uuid);
-        processMapper.deleteProcessStepByProcessUuid(uuid);
-        processMapper.deleteProcessStepRelByProcessUuid(uuid);
-        processMapper.deleteProcessFormByProcessUuid(uuid);
-        processMapper.deleteProcessSlaByProcessUuid(uuid);
-        scoreTemplateMapper.deleteProcessScoreTemplateByProcessUuid(uuid);
-        processMapper.deleteProcessStepTagByProcessUuid(uuid);
-        for (String stepUuid : processStepUuidList) {
-            DependencyManager.delete(FormScene2ProcessStepDependencyHandler.class, stepUuid);
-            DependencyManager.delete(EoaTemplate2ProcessStepDependencyHandler.class, stepUuid);
+            JSONObject actionConfig = processConfig.getJSONObject("actionConfig");
+            if (MapUtils.isNotEmpty(actionConfig)) {
+                JSONArray actionList = actionConfig.getJSONArray("actionList");
+                if (CollectionUtils.isNotEmpty(actionList)) {
+                    if (Objects.equals(action, "save")) {
+                        for (int i = 0; i < actionList.size(); i++) {
+                            JSONObject ationObj = actionList.getJSONObject(i);
+                            String integrationUuid = ationObj.getString("integrationUuid");
+                            if (StringUtils.isNotBlank(integrationUuid)) {
+                                if (integrationMapper.checkIntegrationExists(integrationUuid) == 0) {
+                                    throw new IntegrationNotFoundException(integrationUuid);
+                                }
+                                DependencyManager.insert(IntegrationProcessDependencyHandler.class, integrationUuid, processVo.getUuid());
+                            }
+                        }
+                    } else if (Objects.equals(action, "delete")) {
+                        DependencyManager.delete(IntegrationProcessDependencyHandler.class, processVo.getUuid());
+                    }
+                }
+            }
         }
     }
 
-- 
Gitee


From 96dd82fffb446677882ecba9d83e064b0c8dcee6 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 16:15:59 +0800
Subject: [PATCH 7/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=9D=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1320124261302272]IT服务-流程图保存逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1320124261302272
---
 ...Template2ProcessStepDependencyHandler.java | 77 -------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java

diff --git a/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java
deleted file mode 100644
index b3f1189ad..000000000
--- a/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package neatlogic.module.process.dependency.handler;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import neatlogic.framework.asynchronization.threadlocal.TenantContext;
-import neatlogic.framework.dependency.core.DefaultDependencyHandlerBase;
-import neatlogic.framework.dependency.core.IFromType;
-import neatlogic.framework.dependency.dto.DependencyInfoVo;
-import neatlogic.framework.dependency.dto.DependencyVo;
-import neatlogic.framework.process.constvalue.ProcessFromType;
-import neatlogic.framework.process.dto.ProcessVo;
-import neatlogic.module.process.dao.mapper.process.ProcessMapper;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-@Component
-public class EoaTemplate2ProcessStepDependencyHandler extends DefaultDependencyHandlerBase {
-
-    @Resource
-    private ProcessMapper processMapper;
-
-    @Override
-    protected DependencyInfoVo parse(DependencyVo dependencyVo) {
-        JSONObject config = dependencyVo.getConfig();
-        if (MapUtils.isEmpty(config)) {
-            return null;
-        }
-        String stepUuid = dependencyVo.getTo();
-        String processUuid = config.getString("processUuid");
-        ProcessVo processVo = processMapper.getProcessBaseInfoByUuid(processUuid);
-        if (processVo == null) {
-            return null;
-        }
-        JSONObject processConfig = processVo.getConfig();
-        if (MapUtils.isEmpty(processConfig)) {
-            return null;
-        }
-        JSONObject processObj = processConfig.getJSONObject("process");
-        if (MapUtils.isEmpty(processObj)) {
-            return null;
-        }
-        JSONArray stepList = processObj.getJSONArray("stepList");
-        if (CollectionUtils.isEmpty(stepList)) {
-            return null;
-        }
-        for (int i = 0; i < stepList.size(); i++) {
-            JSONObject stepObj = stepList.getJSONObject(i);
-            if (MapUtils.isEmpty(stepObj)) {
-                continue;
-            }
-            String uuid = stepObj.getString("uuid");
-            if (!Objects.equals(uuid, stepUuid)) {
-                continue;
-            }
-            JSONObject dependencyInfoConfig = new JSONObject();
-            dependencyInfoConfig.put("processUuid", processUuid);
-            dependencyInfoConfig.put("stepUuid", stepUuid);
-            List<String> pathList = new ArrayList<>();
-            pathList.add("流程管理");
-            pathList.add(processVo.getName());
-            String urlFormat = "/" + TenantContext.get().getTenantUuid() + "/process.html#/flow-edit?uuid=${DATA.processUuid}&stepUuid=${DATA.stepUuid}";
-            return new DependencyInfoVo(stepUuid, dependencyInfoConfig, stepObj.getString("name"), pathList, urlFormat, this.getGroupName());
-        }
-        return null;
-    }
-
-    @Override
-    public IFromType getFromType() {
-        return ProcessFromType.EOATEMPLATE;
-    }
-}
-- 
Gitee


From d8dd05a3ef92447aa4ceea9a4d175a8e3ad8429e Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 16:40:03 +0800
Subject: [PATCH 8/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=9D=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1320124261302272]IT服务-流程图保存逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1320124261302272
---
 .../module/process/dao/mapper/process/ProcessMapper.java      | 2 +-
 .../module/process/dao/mapper/process/ProcessMapper.xml       | 4 ++--
 .../stephandler/makeup/CommentTemplateIdMakeupHandler.java    | 2 +-
 3 files changed, 4 insertions(+), 4 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 51e3a950e..7388ad111 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
@@ -120,7 +120,7 @@ public interface ProcessMapper extends IProcessCrossoverMapper {
 
     int insertProcessStepTag(ProcessStepTagVo processStepTagVo);
 
-    int insertProcessStepCommentTemplate(ProcessStepVo vo);
+    int insertProcessStepCommentTemplate(@Param("processStepUuid") String processStepUuid, @Param("commentTemplateId") Long commentTemplateId);
 
     int insertProcessStepTask(ProcessStepTaskConfigVo tmpVo);
 
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 b782167ec..edce4944d 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
@@ -616,9 +616,9 @@
 		VALUES (#{processUuid}, #{processStepUuid}, #{tagId})
 	</insert>
 
-	<insert id="insertProcessStepCommentTemplate" parameterType="neatlogic.framework.process.dto.ProcessStepVo">
+	<insert id="insertProcessStepCommentTemplate">
 		INSERT INTO `process_step_comment_template` (`process_step_uuid`, `comment_template_id`)
-		VALUES (#{uuid}, #{commentTemplateId})
+		VALUES (#{processStepUuid}, #{commentTemplateId})
 	</insert>
 	<insert id="insertProcessStepTask">
 		insert into `process_step_task_config` (
diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/CommentTemplateIdMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/CommentTemplateIdMakeupHandler.java
index c6a0c2e61..00c7c7cae 100644
--- a/src/main/java/neatlogic/module/process/stephandler/makeup/CommentTemplateIdMakeupHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/makeup/CommentTemplateIdMakeupHandler.java
@@ -44,7 +44,7 @@ public class CommentTemplateIdMakeupHandler implements IProcessStepMakeupHandler
         Long commentTemplateId = stepConfigObj.getLong("commentTemplateId");
         if (commentTemplateId != null) {
             if (Objects.equals(action, "save")) {
-                processMapper.insertProcessStepCommentTemplate(processStepVo);
+                processMapper.insertProcessStepCommentTemplate(processStepVo.getUuid(), commentTemplateId);
             } else if (Objects.equals(action, "delete")) {
                 processMapper.deleteProcessStepCommentTemplate(processStepVo.getUuid());
             }
-- 
Gitee


From 226e7fbea1a93693d7a4b47a7368d23be1bbe8a8 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 26 Dec 2024 21:15:32 +0800
Subject: [PATCH 9/9] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?-=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=9D=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1320124261302272]IT服务-流程图保存逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1320124261302272
---
 .../AutomaticConfigRegulateHandler.java       |  68 ++++++++
 .../AutomaticProcessUtilHandler.java          | 138 +--------------
 .../ConditionProcessUtilHandler.java          |  47 -----
 .../utilhandler/EndProcessUtilHandler.java    |  29 +---
 .../OmnipotentProcessUtilHandler.java         | 160 ++----------------
 5 files changed, 98 insertions(+), 344 deletions(-)
 create mode 100644 src/main/java/neatlogic/module/process/stephandler/regulatehandler/AutomaticConfigRegulateHandler.java

diff --git a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/AutomaticConfigRegulateHandler.java b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/AutomaticConfigRegulateHandler.java
new file mode 100644
index 000000000..5678e7ef3
--- /dev/null
+++ b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/AutomaticConfigRegulateHandler.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2024  深圳极向量科技有限公司 All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package neatlogic.module.process.stephandler.regulatehandler;
+
+import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.process.dto.processconfig.AutomaticCallbackConfigVo;
+import neatlogic.framework.process.dto.processconfig.AutomaticRequestConfigVo;
+import neatlogic.framework.process.dto.processconfig.AutomaticTimeWindowConfigVo;
+import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler;
+import neatlogic.framework.process.stephandler.core.IRegulateHandler;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AutomaticConfigRegulateHandler implements IRegulateHandler {
+    @Override
+    public String getName() {
+        return "automaticConfig";
+    }
+
+    @Override
+    public void regulateConfig(IProcessStepInternalHandler processStepInternalHandler, JSONObject oldConfigObj, JSONObject newConfigObj) {
+        JSONObject automaticConfig = oldConfigObj.getJSONObject("automaticConfig");
+        if (automaticConfig == null) {
+            automaticConfig = new JSONObject();
+        }
+        JSONObject automaticObj = new JSONObject();
+        /** 外部调用 **/
+        JSONObject requestConfig = automaticConfig.getJSONObject("requestConfig");
+        AutomaticRequestConfigVo requestConfigVo = JSONObject.toJavaObject(requestConfig, AutomaticRequestConfigVo.class);
+        if (requestConfigVo == null) {
+            requestConfigVo = new AutomaticRequestConfigVo();
+        }
+        automaticObj.put("requestConfig", requestConfigVo);
+        /** 是否回调 **/
+        JSONObject callbackConfig = automaticConfig.getJSONObject("callbackConfig");
+        AutomaticCallbackConfigVo callbackConfigVo = JSONObject.toJavaObject(callbackConfig, AutomaticCallbackConfigVo.class);
+        if (callbackConfigVo == null) {
+            callbackConfigVo = new AutomaticCallbackConfigVo();
+        }
+        automaticObj.put("callbackConfig", callbackConfigVo);
+        /** 时间窗口 **/
+        JSONObject timeWindowConfig = automaticConfig.getJSONObject("timeWindowConfig");
+        AutomaticTimeWindowConfigVo timeWindowConfigVo = JSONObject.toJavaObject(timeWindowConfig, AutomaticTimeWindowConfigVo.class);
+        if (timeWindowConfigVo == null) {
+            timeWindowConfigVo = new AutomaticTimeWindowConfigVo();
+        }
+        automaticObj.put("timeWindowConfig", timeWindowConfigVo);
+        /** 表单标签 **/
+        String formTag = automaticConfig.getString("formTag");
+        automaticObj.put("formTag", formTag == null ? "" : formTag);
+        newConfigObj.put("automaticConfig", automaticObj);
+    }
+}
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java
index 9af847c9d..420cb8014 100644
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java
@@ -1,30 +1,20 @@
 package neatlogic.module.process.stephandler.utilhandler;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.common.constvalue.SystemUser;
-import neatlogic.framework.crossover.CrossoverServiceFactory;
-import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService;
-import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo;
 import neatlogic.framework.process.constvalue.ProcessStepHandlerType;
 import neatlogic.framework.process.constvalue.ProcessTaskOperationType;
 import neatlogic.framework.process.constvalue.ProcessTaskStatus;
 import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType;
 import neatlogic.framework.process.dto.ProcessTaskStepDataVo;
 import neatlogic.framework.process.dto.ProcessTaskStepVo;
-import neatlogic.framework.process.dto.processconfig.AutomaticCallbackConfigVo;
-import neatlogic.framework.process.dto.processconfig.AutomaticRequestConfigVo;
-import neatlogic.framework.process.dto.processconfig.AutomaticTimeWindowConfigVo;
 import neatlogic.framework.process.operationauth.core.IOperationType;
 import neatlogic.framework.process.operationauth.core.ProcessAuthManager;
 import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase;
-import neatlogic.framework.process.util.ProcessConfigUtil;
 import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper;
-import neatlogic.module.process.notify.handler.AutomaticNotifyPolicyHandler;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Objects;
 
 @Service
 public class AutomaticProcessUtilHandler extends ProcessStepInternalHandlerBase {
@@ -79,138 +69,26 @@ public class AutomaticProcessUtilHandler extends ProcessStepInternalHandlerBase
     public void updateProcessTaskStepUserAndWorker(Long processTaskId, Long processTaskStepId) {
     }
 
-    @SuppressWarnings("serial")
-    @Override
-    public JSONObject makeupConfig(JSONObject configObj) {
-        if (configObj == null) {
-            configObj = new JSONObject();
-        }
-        JSONObject resultObj = new JSONObject();
-
-        /** 授权 **/
-        IOperationType[] stepActions = {
+    public IOperationType[] getStepActions() {
+        return new IOperationType[]{
                 ProcessTaskStepOperationType.STEP_VIEW,
                 ProcessTaskStepOperationType.STEP_TRANSFER
         };
-        JSONArray authorityList = configObj.getJSONArray("authorityList");
-        JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions);
-        resultObj.put("authorityList", authorityArray);
-
-        /** 按钮映射 **/
-        IOperationType[] stepButtons = {
-                ProcessTaskStepOperationType.STEP_COMPLETE,
-                ProcessTaskStepOperationType.STEP_BACK,
-                ProcessTaskOperationType.PROCESSTASK_TRANSFER,
-                ProcessTaskStepOperationType.STEP_ACCEPT
-        };
-        JSONArray customButtonList = configObj.getJSONArray("customButtonList");
-        JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons);
-        resultObj.put("customButtonList", customButtonArray);
-        /** 状态映射列表 **/
-        JSONArray customStatusList = configObj.getJSONArray("customStatusList");
-        JSONArray customStatusArray = ProcessConfigUtil.regulateCustomStatusList(customStatusList);
-        resultObj.put("customStatusList", customStatusArray);
-
-        /** 可替换文本列表 **/
-        resultObj.put("replaceableTextList", ProcessConfigUtil.regulateReplaceableTextList(configObj.getJSONArray("replaceableTextList")));
-
-        return resultObj;
     }
 
     @Override
-    public JSONObject regulateProcessStepConfig(JSONObject configObj) {
-        if (configObj == null) {
-            configObj = new JSONObject();
-        }
-        JSONObject resultObj = new JSONObject();
-
-        /** 授权 **/
-        IOperationType[] stepActions = {
-                ProcessTaskStepOperationType.STEP_VIEW,
-                ProcessTaskStepOperationType.STEP_TRANSFER
-        };
-        JSONArray authorityList = null;
-        Integer enableAuthority = configObj.getInteger("enableAuthority");
-        if (Objects.equals(enableAuthority, 1)) {
-            authorityList = configObj.getJSONArray("authorityList");
-        } else {
-            enableAuthority = 0;
-        }
-        resultObj.put("enableAuthority", enableAuthority);
-        JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions);
-        resultObj.put("authorityList", authorityArray);
-
-        /** 通知 **/
-        JSONObject notifyPolicyConfig = configObj.getJSONObject("notifyPolicyConfig");
-        INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class);
-        InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = notifyServiceCrossoverService.regulateNotifyPolicyConfig(notifyPolicyConfig, AutomaticNotifyPolicyHandler.class);
-        resultObj.put("notifyPolicyConfig", invokeNotifyPolicyConfigVo);
-
-        /** 按钮映射列表 **/
-        IOperationType[] stepButtons = {
+    public IOperationType[] getStepButtons() {
+        return new IOperationType[]{
                 ProcessTaskStepOperationType.STEP_COMPLETE,
                 ProcessTaskStepOperationType.STEP_BACK,
                 ProcessTaskOperationType.PROCESSTASK_TRANSFER,
                 ProcessTaskStepOperationType.STEP_ACCEPT
         };
-        JSONArray customButtonList = configObj.getJSONArray("customButtonList");
-        JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons);
-        resultObj.put("customButtonList", customButtonArray);
-        /** 状态映射列表 **/
-        JSONArray customStatusList = configObj.getJSONArray("customStatusList");
-        JSONArray customStatusArray = ProcessConfigUtil.regulateCustomStatusList(customStatusList);
-        resultObj.put("customStatusList", customStatusArray);
-
-        /** 可替换文本列表 **/
-        resultObj.put("replaceableTextList", ProcessConfigUtil.regulateReplaceableTextList(configObj.getJSONArray("replaceableTextList")));
-
-        /** 自动化配置 **/
-        JSONObject automaticObj = new JSONObject();
-        JSONObject automaticConfig = configObj.getJSONObject("automaticConfig");
-        if (automaticConfig == null) {
-            automaticConfig = new JSONObject();
-        }
-        /** 外部调用 **/
-        JSONObject requestConfig = automaticConfig.getJSONObject("requestConfig");
-        AutomaticRequestConfigVo requestConfigVo = JSONObject.toJavaObject(requestConfig, AutomaticRequestConfigVo.class);
-        if (requestConfigVo == null) {
-            requestConfigVo = new AutomaticRequestConfigVo();
-        }
-        automaticObj.put("requestConfig", requestConfigVo);
-        /** 是否回调 **/
-        JSONObject callbackConfig = automaticConfig.getJSONObject("callbackConfig");
-        AutomaticCallbackConfigVo callbackConfigVo = JSONObject.toJavaObject(callbackConfig, AutomaticCallbackConfigVo.class);
-        if (callbackConfigVo == null) {
-            callbackConfigVo = new AutomaticCallbackConfigVo();
-        }
-        automaticObj.put("callbackConfig", callbackConfigVo);
-        /** 时间窗口 **/
-        JSONObject timeWindowConfig = automaticConfig.getJSONObject("timeWindowConfig");
-        AutomaticTimeWindowConfigVo timeWindowConfigVo = JSONObject.toJavaObject(timeWindowConfig, AutomaticTimeWindowConfigVo.class);
-        if (timeWindowConfigVo == null) {
-            timeWindowConfigVo = new AutomaticTimeWindowConfigVo();
-        }
-        automaticObj.put("timeWindowConfig", timeWindowConfigVo);
-        resultObj.put("automaticConfig", automaticObj);
-        /** 分配处理人 **/
-        JSONObject workerPolicyConfig = configObj.getJSONObject("workerPolicyConfig");
-        JSONObject workerPolicyObj = ProcessConfigUtil.regulateWorkerPolicyConfig(workerPolicyConfig);
-        resultObj.put("workerPolicyConfig", workerPolicyObj);
+    }
 
-        JSONArray tagList = configObj.getJSONArray("tagList");
-        if (tagList == null) {
-            tagList = new JSONArray();
-        }
-        resultObj.put("tagList", tagList);
-        /** 表单场景 **/
-        String formSceneUuid = configObj.getString("formSceneUuid");
-        String formSceneName = configObj.getString("formSceneName");
-        resultObj.put("formSceneUuid", formSceneUuid == null ? "" : formSceneUuid);
-        resultObj.put("formSceneName", formSceneName == null ? "" : formSceneName);
-        /** 表单标签 **/
-        String formTag = configObj.getString("formTag");
-        resultObj.put("formTag", formTag == null ? "" : formTag);
-        return resultObj;
+    @Override
+    public String[] getRegulateKeyList() {
+        return new String[]{"authorityList", "notifyPolicyConfig", "customButtonList", "customStatusList", "replaceableTextList", "workerPolicyConfig", "formSceneUuid", "formSceneName", "tagList", "automaticConfig", "formTag"};
     }
 
 }
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java
index 4c7b002de..045bdc477 100755
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java
@@ -1,8 +1,6 @@
 package neatlogic.module.process.stephandler.utilhandler;
 
-import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.process.constvalue.ProcessStepHandlerType;
-import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.dto.ProcessTaskStepVo;
 import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase;
 import org.springframework.stereotype.Service;
@@ -33,54 +31,9 @@ public class ConditionProcessUtilHandler extends ProcessStepInternalHandlerBase
 		
 	}
 
-	@Override
-	public JSONObject makeupConfig(JSONObject configObj) {
-		if (configObj == null) {
-			configObj = new JSONObject();
-		}
-		return configObj;
-	}
-
 	@Override
 	public String[] getRegulateKeyList() {
 		return new String[]{"moveonConfigList", "formTag"};
 	}
 
-//	@Override
-//	public JSONObject regulateProcessStepConfig(JSONObject configObj) {
-//		if (configObj == null) {
-//			configObj = new JSONObject();
-//		}
-//		JSONObject resultObj = new JSONObject();
-//		List<MoveonConfigVo> moveonConfigList = new ArrayList<>();
-//		JSONArray moveonConfigArray = configObj.getJSONArray("moveonConfigList");
-//		if(CollectionUtils.isNotEmpty(moveonConfigArray)){
-//			moveonConfigArray.removeIf(Objects::isNull);
-//			List<String> effectiveStepUuidList = ProcessMessageManager.getEffectiveStepUuidList();
-//			for(int i = 0; i < moveonConfigArray.size(); i++){
-//				MoveonConfigVo moveonConfigVo = moveonConfigArray.getObject(i, MoveonConfigVo.class);
-//				if(moveonConfigVo != null){
-//					List<String> targetStepList = moveonConfigVo.getTargetStepList();
-//					if (CollectionUtils.isNotEmpty(targetStepList)) {
-//						List<String> list = ListUtils.removeAll(targetStepList, effectiveStepUuidList);
-//						if (CollectionUtils.isNotEmpty(list)) {
-//							throw new RuntimeException("条件步骤流转规则设置中存在无效的步骤");
-//						}
-//					}
-////					targetStepList.removeIf(e -> !effectiveStepUuidList.contains(e));
-////					if (CollectionUtils.isEmpty(targetStepList)) {
-////						continue;
-////					}
-//					moveonConfigList.add(moveonConfigVo);
-//				}
-//			}
-//		}
-//		resultObj.put("moveonConfigList", moveonConfigList);
-//		String formTag = configObj.getString("formTag");
-//		if (StringUtils.isBlank(formTag)) {
-//			formTag = StringUtils.EMPTY;
-//		}
-//		resultObj.put("formTag", formTag);
-//		return resultObj;
-//	}
 }
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java
index dfa4b6ed1..5010176b6 100644
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java
@@ -1,14 +1,11 @@
 package neatlogic.module.process.stephandler.utilhandler;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.notify.core.INotifyPolicyHandler;
 import neatlogic.framework.process.constvalue.ProcessStepHandlerType;
 import neatlogic.framework.process.constvalue.ProcessTaskOperationType;
-import neatlogic.framework.process.dto.ProcessStepVo;
 import neatlogic.framework.process.dto.ProcessTaskStepVo;
+import neatlogic.framework.process.operationauth.core.IOperationType;
 import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase;
-import neatlogic.framework.process.util.ProcessConfigUtil;
 import neatlogic.module.process.notify.handler.TaskNotifyPolicyHandler;
 import org.springframework.stereotype.Service;
 
@@ -41,28 +38,18 @@ public class EndProcessUtilHandler extends ProcessStepInternalHandlerBase {
     }
 
     @Override
-    public String[] getRegulateKeyList() {
-        return new String[]{"processConfig", "formConfig", "scoreConfig", "slaList"};
-    }
-
-    @Override
-    public JSONObject makeupConfig(JSONObject configObj) {
-        if (configObj == null) {
-            configObj = new JSONObject();
-        }
-        JSONObject resultObj = new JSONObject();
-
-        /* 授权 **/
-        ProcessTaskOperationType[] stepActions = {
+    public IOperationType[] getStepActions() {
+        /* 授权 */
+        return new IOperationType[]{
                 ProcessTaskOperationType.PROCESSTASK_ABORT,
                 ProcessTaskOperationType.PROCESSTASK_UPDATE,
                 ProcessTaskOperationType.PROCESSTASK_URGE
         };
-        JSONArray authorityList = configObj.getJSONArray("authorityList");
-        JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions);
-        resultObj.put("authorityList", authorityArray);
+    }
 
-        return resultObj;
+    @Override
+    public String[] getRegulateKeyList() {
+        return new String[]{"processConfig", "formConfig", "scoreConfig", "slaList", "authorityList"};
     }
 
 //    @Override
diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java
index aff6d3a61..8d8bed0ab 100644
--- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java
@@ -1,28 +1,21 @@
 package neatlogic.module.process.stephandler.utilhandler;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import neatlogic.framework.crossover.CrossoverServiceFactory;
-import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService;
-import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo;
-import neatlogic.framework.process.constvalue.*;
-import neatlogic.framework.process.dto.*;
-import neatlogic.framework.process.dto.processconfig.ActionConfigActionVo;
-import neatlogic.framework.process.dto.processconfig.ActionConfigVo;
+import neatlogic.framework.process.constvalue.ProcessStepHandlerType;
+import neatlogic.framework.process.constvalue.ProcessTaskOperationType;
+import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType;
+import neatlogic.framework.process.constvalue.ProcessUserType;
+import neatlogic.framework.process.dto.ProcessTaskStepTaskUserVo;
+import neatlogic.framework.process.dto.ProcessTaskStepTaskVo;
+import neatlogic.framework.process.dto.ProcessTaskStepUserVo;
+import neatlogic.framework.process.dto.ProcessTaskStepVo;
 import neatlogic.framework.process.operationauth.core.IOperationType;
 import neatlogic.framework.process.stephandler.core.IProcessStepAssistantHandler;
 import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase;
-import neatlogic.framework.process.util.ProcessConfigUtil;
-import neatlogic.module.process.notify.handler.OmnipotentNotifyPolicyHandler;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 @Service
 public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase implements IProcessStepAssistantHandler {
@@ -49,54 +42,6 @@ public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase
         defaultUpdateProcessTaskStepUserAndWorker(processTaskId, processTaskStepId);
     }
 
-    @SuppressWarnings("serial")
-    @Override
-    public JSONObject makeupConfig(JSONObject configObj) {
-        if (configObj == null) {
-            configObj = new JSONObject();
-        }
-        JSONObject resultObj = new JSONObject();
-
-        /* 授权 */
-        IOperationType[] stepActions = {
-                ProcessTaskStepOperationType.STEP_VIEW,
-                ProcessTaskStepOperationType.STEP_TRANSFER,
-                ProcessTaskStepOperationType.STEP_PAUSE,
-                ProcessTaskStepOperationType.STEP_RETREAT
-        };
-        JSONArray authorityList = configObj.getJSONArray("authorityList");
-        JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions);
-        resultObj.put("authorityList", authorityArray);
-
-        /* 按钮映射列表 */
-        IOperationType[] stepButtons = {
-                ProcessTaskStepOperationType.STEP_COMPLETE,
-                ProcessTaskStepOperationType.STEP_BACK,
-                ProcessTaskStepOperationType.STEP_COMMENT,
-                ProcessTaskOperationType.PROCESSTASK_TRANSFER,
-                ProcessTaskStepOperationType.STEP_ACCEPT,
-                ProcessTaskOperationType.PROCESSTASK_ABORT,
-                ProcessTaskOperationType.PROCESSTASK_RECOVER
-        };
-
-        JSONArray customButtonList = configObj.getJSONArray("customButtonList");
-        JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons);
-        resultObj.put("customButtonList", customButtonArray);
-
-        /* 状态映射列表 */
-        JSONArray customStatusList = configObj.getJSONArray("customStatusList");
-        JSONArray customStatusArray = ProcessConfigUtil.regulateCustomStatusList(customStatusList);
-        resultObj.put("customStatusList", customStatusArray);
-
-        /* 可替换文本列表 */
-        resultObj.put("replaceableTextList", ProcessConfigUtil.regulateReplaceableTextList(configObj.getJSONArray("replaceableTextList")));
-
-        /* 任务 */
-        JSONObject taskConfig = configObj.getJSONObject("taskConfig");
-        resultObj.put("taskConfig", taskConfig);
-        return resultObj;
-    }
-
     public IOperationType[] getStepActions() {
         return new IOperationType[]{
                 ProcessTaskStepOperationType.STEP_VIEW,
@@ -107,48 +52,8 @@ public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase
     }
 
     @Override
-    public JSONObject regulateProcessStepConfig(JSONObject configObj) {
-        if (configObj == null) {
-            configObj = new JSONObject();
-        }
-        JSONObject resultObj = new JSONObject();
-
-        /** 授权 **/
-        IOperationType[] stepActions = {
-                ProcessTaskStepOperationType.STEP_VIEW,
-                ProcessTaskStepOperationType.STEP_TRANSFER,
-                ProcessTaskStepOperationType.STEP_PAUSE,
-                ProcessTaskStepOperationType.STEP_RETREAT
-        };
-        JSONArray authorityList = null;
-        Integer enableAuthority = configObj.getInteger("enableAuthority");
-        if (Objects.equals(enableAuthority, 1)) {
-            authorityList = configObj.getJSONArray("authorityList");
-        } else {
-            enableAuthority = 0;
-        }
-        resultObj.put("enableAuthority", enableAuthority);
-        JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions);
-        resultObj.put("authorityList", authorityArray);
-
-        /** 通知 **/
-        JSONObject notifyPolicyConfig = configObj.getJSONObject("notifyPolicyConfig");
-        INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class);
-        InvokeNotifyPolicyConfigVo invokeNotifyPolicyConfigVo = notifyServiceCrossoverService.regulateNotifyPolicyConfig(notifyPolicyConfig, OmnipotentNotifyPolicyHandler.class);
-        resultObj.put("notifyPolicyConfig", invokeNotifyPolicyConfigVo);
-
-        /** 动作 **/
-        JSONObject actionConfig = configObj.getJSONObject("actionConfig");
-        ActionConfigVo actionConfigVo = JSON.toJavaObject(actionConfig, ActionConfigVo.class);
-        if (actionConfigVo == null) {
-            actionConfigVo = new ActionConfigVo();
-        }
-        actionConfigVo.setHandler(OmnipotentNotifyPolicyHandler.class.getName());
-        resultObj.put("actionConfig", actionConfigVo);
-
-        JSONArray customButtonList = configObj.getJSONArray("customButtonList");
-        /** 按钮映射列表 **/
-        IOperationType[] stepButtons = {
+    public IOperationType[] getStepButtons() {
+        return new IOperationType[]{
                 ProcessTaskStepOperationType.STEP_COMPLETE,
                 ProcessTaskStepOperationType.STEP_BACK,
                 ProcessTaskStepOperationType.STEP_COMMENT,
@@ -158,48 +63,11 @@ public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase
                 ProcessTaskOperationType.PROCESSTASK_RECOVER,
                 ProcessTaskStepOperationType.STEP_REAPPROVAL
         };
-        JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons);
-        resultObj.put("customButtonList", customButtonArray);
-        /** 状态映射列表 **/
-        JSONArray customStatusList = configObj.getJSONArray("customStatusList");
-        JSONArray customStatusArray = ProcessConfigUtil.regulateCustomStatusList(customStatusList);
-        resultObj.put("customStatusList", customStatusArray);
-
-        /** 可替换文本列表 **/
-        resultObj.put("replaceableTextList", ProcessConfigUtil.regulateReplaceableTextList(configObj.getJSONArray("replaceableTextList")));
-
-        /** 分配处理人 **/
-        JSONObject workerPolicyConfig = configObj.getJSONObject("workerPolicyConfig");
-        JSONObject workerPolicyObj = ProcessConfigUtil.regulateWorkerPolicyConfig(workerPolicyConfig);
-        resultObj.put("workerPolicyConfig", workerPolicyObj);
-
-        /* 任务 */
-        JSONObject taskConfig = configObj.getJSONObject("taskConfig");
-        resultObj.put("taskConfig", taskConfig);
-
-        JSONObject simpleSettings = ProcessConfigUtil.regulateSimpleSettings(configObj);
-        resultObj.putAll(simpleSettings);
-
-        /** 重审 **/
-        Integer enableReapproval = configObj.getInteger("enableReapproval");
-        enableReapproval = enableReapproval == null ? 0 : enableReapproval;
-        resultObj.put("enableReapproval", enableReapproval);
-
-        /** 自动流转 **/
-        Integer autoComplete = configObj.getInteger("autoComplete");
-        autoComplete = autoComplete == null ? 0 : autoComplete;
-        resultObj.put("autoComplete", autoComplete);
+    }
 
-        /** 自动审批 **/
-        Integer autoApproval = configObj.getInteger("autoApproval");
-        autoApproval = autoApproval == null ? 0 : autoApproval;
-        resultObj.put("autoApproval", autoApproval);
-        /** 表单场景 **/
-        String formSceneUuid = configObj.getString("formSceneUuid");
-        String formSceneName = configObj.getString("formSceneName");
-        resultObj.put("formSceneUuid", formSceneUuid == null ? "" : formSceneUuid);
-        resultObj.put("formSceneName", formSceneName == null ? "" : formSceneName);
-        return resultObj;
+    @Override
+    public String[] getRegulateKeyList() {
+        return new String[]{"authorityList", "notifyPolicyConfig", "actionConfig", "customButtonList", "customStatusList", "replaceableTextList", "workerPolicyConfig", "taskConfig", "enableReapproval", "autoComplete", "autoApproval", "formSceneUuid", "formSceneName", "autoStart", "isNeedUploadFile", "isNeedContent", "isRequired", "commentTemplateId", "tagList"};
     }
 
     @Override
-- 
Gitee