From 31ea5044bb9f6ffa0b2fd26b57ad079daae0d42e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 24 Apr 2024 19:15:43 +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 --- .../autoexec/api/service/CreateAutoexecServiceJobApi.java | 6 ++---- .../stephandler/component/AutoexecProcessComponent.java | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/api/service/CreateAutoexecServiceJobApi.java b/src/main/java/neatlogic/module/autoexec/api/service/CreateAutoexecServiceJobApi.java index 1b8cc3b8..e36ded11 100644 --- a/src/main/java/neatlogic/module/autoexec/api/service/CreateAutoexecServiceJobApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/service/CreateAutoexecServiceJobApi.java @@ -35,7 +35,6 @@ import neatlogic.framework.autoexec.exception.AutoexecJobParamNotExistException; import neatlogic.framework.autoexec.exception.AutoexecServiceConfigExpiredException; import neatlogic.framework.autoexec.exception.AutoexecServiceNotFoundException; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.exception.type.ParamNotExistsException; import neatlogic.framework.exception.type.PermissionDeniedException; @@ -44,10 +43,10 @@ import neatlogic.framework.form.dao.mapper.FormMapper; import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVersionVo; import neatlogic.framework.form.exception.FormAttributeRequiredException; -import neatlogic.framework.form.service.IFormCrossoverService; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.framework.util.FormUtil; import neatlogic.module.autoexec.dao.mapper.AutoexecCombopVersionMapper; import neatlogic.module.autoexec.dao.mapper.AutoexecServiceMapper; import neatlogic.module.autoexec.service.AutoexecCombopService; @@ -286,8 +285,7 @@ public class CreateAutoexecServiceJobApi extends PrivateApiComponentBase { Object formAttrValue = formAttributeDataMap.get(value); if (formAttrValue != null) { if (formSelectAttributeList.contains(attributeUuid2HandlerMap.get(value))) { - IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class); - Object valueObject = formCrossoverService.getFormSelectAttributeValueByOriginalValue(formAttrValue); + Object valueObject = FormUtil.getFormSelectAttributeValueByOriginalValue(formAttrValue); param.put(key, valueObject); } else { param.put(key, formAttrValue); diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java index fa876333..02b813a9 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java @@ -40,7 +40,6 @@ import neatlogic.framework.dto.runner.RunnerGroupVo; import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVersionVo; -import neatlogic.framework.form.service.IFormCrossoverService; import neatlogic.framework.notify.core.INotifyParamHandler; import neatlogic.framework.notify.core.NotifyParamHandlerFactory; import neatlogic.framework.process.constvalue.*; @@ -56,6 +55,7 @@ import neatlogic.framework.process.stephandler.core.IProcessStepHandler; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerBase; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; import neatlogic.framework.process.stephandler.core.ProcessStepThread; +import neatlogic.framework.util.FormUtil; import neatlogic.framework.util.FreemarkerUtil; import neatlogic.module.autoexec.constvalue.FailPolicy; import neatlogic.module.autoexec.dao.mapper.AutoexecScenarioMapper; @@ -529,8 +529,7 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { if (formTextAttributeList.contains(attributeDataVo.getHandler())) { scenario = convertDateType(type, (String) attributeDataVo.getDataObj()); } else if (formSelectAttributeList.contains(attributeDataVo.getHandler())) { - IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class); - Object valueObject = formCrossoverService.getFormSelectAttributeValueByOriginalValue(attributeDataVo.getDataObj()); + Object valueObject = FormUtil.getFormSelectAttributeValueByOriginalValue(attributeDataVo.getDataObj()); scenario = valueObject; } else { scenario = attributeDataVo.getDataObj(); @@ -795,8 +794,7 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { if (formTextAttributeList.contains(attributeDataVo.getHandler())) { param.put(key, convertDateType(type, (String) attributeDataVo.getDataObj())); } else if (formSelectAttributeList.contains(attributeDataVo.getHandler())) { - IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class); - Object valueObject = formCrossoverService.getFormSelectAttributeValueByOriginalValue(attributeDataVo.getDataObj()); + Object valueObject = FormUtil.getFormSelectAttributeValueByOriginalValue(attributeDataVo.getDataObj()); param.put(key, valueObject); } else { param.put(key, attributeDataVo.getDataObj()); -- Gitee