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 15001d16a349972be490f34b8ad740dc52f00ca1..ae2373bc97edc7641347996e84b7936c623c3149 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 2381946e83950e3d0b7c25c096b9d2d201c521cc..e7d9d8aceea60ce2345243079b620bb97be1fba3 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; }