From 9768302244a8958e38ee48c05b65dfce42c7685c Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 24 Apr 2024 19:16:45 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1141293256769536]后端-自定义表单标准规范定义 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1141293256769536
---
 .../cmdb/process/stephandler/CmdbSyncProcessComponent.java | 7 +++----
 .../cmdb/workerdispatcher/handler/CmdbDispatcher.java      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
index 15001d16..ae2373bc 100644
--- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
+++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
@@ -42,7 +42,6 @@ import neatlogic.framework.common.constvalue.Expression;
 import neatlogic.framework.common.constvalue.InputFrom;
 import neatlogic.framework.crossover.CrossoverServiceFactory;
 import neatlogic.framework.form.constvalue.FormHandler;
-import neatlogic.framework.form.service.IFormCrossoverService;
 import neatlogic.framework.process.constvalue.ProcessFlowDirection;
 import neatlogic.framework.process.constvalue.ProcessStepMode;
 import neatlogic.framework.process.constvalue.ProcessTaskAuditType;
@@ -58,6 +57,7 @@ import neatlogic.framework.process.stephandler.core.ProcessStepHandlerBase;
 import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory;
 import neatlogic.framework.process.stephandler.core.ProcessStepThread;
 import neatlogic.framework.transaction.core.EscapeTransactionJob;
+import neatlogic.framework.util.FormUtil;
 import neatlogic.framework.util.UuidUtil;
 import neatlogic.module.cmdb.dao.mapper.ci.AttrMapper;
 import neatlogic.module.cmdb.dao.mapper.ci.CiMapper;
@@ -1647,8 +1647,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
         if (originalValue == null) {
             return null;
         }
-        IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class);
-        String handler = formCrossoverService.getFormAttributeHandler(attributeUuid, formConfig);
+        String handler = FormUtil.getFormAttributeHandler(attributeUuid, formConfig);
         if (handler == null) {
             return null;
         }
@@ -1668,7 +1667,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
         } else if (Objects.equals(handler, FormHandler.FORMRADIO.getHandler())
                 || Objects.equals(handler, FormHandler.FORMCHECKBOX.getHandler())
                 || Objects.equals(handler, FormHandler.FORMSELECT.getHandler())) {
-            return formCrossoverService.getFormSelectAttributeValueByOriginalValue(originalValue);
+            return FormUtil.getFormSelectAttributeValueByOriginalValue(originalValue);
         }
         return originalValue;
     }
diff --git a/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java b/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java
index 2381946e..e7d9d8ac 100644
--- a/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java
+++ b/src/main/java/neatlogic/module/cmdb/workerdispatcher/handler/CmdbDispatcher.java
@@ -21,7 +21,6 @@ import neatlogic.framework.dto.RoleVo;
 import neatlogic.framework.dto.TeamVo;
 import neatlogic.framework.dto.UserVo;
 import neatlogic.framework.form.constvalue.FormHandler;
-import neatlogic.framework.form.service.IFormCrossoverService;
 import neatlogic.framework.process.constvalue.ProcessUserType;
 import neatlogic.framework.process.crossover.IProcessTaskCrossoverService;
 import neatlogic.framework.process.dao.mapper.ProcessTaskMapper;
@@ -32,6 +31,7 @@ import neatlogic.framework.process.dto.ProcessTaskStepVo;
 import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo;
 import neatlogic.framework.process.exception.processtask.ProcessTaskException;
 import neatlogic.framework.process.workerdispatcher.core.WorkerDispatcherBase;
+import neatlogic.framework.util.FormUtil;
 import neatlogic.module.cmdb.dao.mapper.ci.AttrMapper;
 import neatlogic.module.cmdb.dao.mapper.ci.CiMapper;
 import neatlogic.module.cmdb.dao.mapper.customview.CustomViewMapper;
@@ -428,8 +428,7 @@ public class CmdbDispatcher extends WorkerDispatcherBase {
         if (originalValue == null) {
             return null;
         }
-        IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class);
-        String handler = formCrossoverService.getFormAttributeHandler(attributeUuid, formConfig);
+        String handler = FormUtil.getFormAttributeHandler(attributeUuid, formConfig);
         if (Objects.equals(handler, FormHandler.FORMUPLOAD.getHandler())) {
             JSONArray resultList = new JSONArray();
             if (originalValue instanceof JSONArray) {
@@ -446,7 +445,7 @@ public class CmdbDispatcher extends WorkerDispatcherBase {
         } else if (Objects.equals(handler, FormHandler.FORMRADIO.getHandler())
                 || Objects.equals(handler, FormHandler.FORMCHECKBOX.getHandler())
                 || Objects.equals(handler, FormHandler.FORMSELECT.getHandler())) {
-            return formCrossoverService.getFormSelectAttributeValueByOriginalValue(originalValue);
+            return FormUtil.getFormSelectAttributeValueByOriginalValue(originalValue);
         }
         return originalValue;
     }
-- 
Gitee