diff --git a/export.bat b/export.bat index b4f1a47f0d6cc2c89cb1eca333bd4b2a5d8a4ced..454827a5a1e74e7f3f9af83f3f02553c48abc552 100644 --- a/export.bat +++ b/export.bat @@ -17,35 +17,42 @@ call mvn clean verify rmdir /q /s %EXPORT_PATH% -md %EXPORT_PATH%%LCM_SU_PATH% -md %EXPORT_PATH%%PFCOMMON_SU_PATH% -md %EXPORT_PATH%%METADATA_TOOL_PATH% -md %EXPORT_PATH%%DEV_SU_PATH% :view-object-api +md %EXPORT_PATH%%DEV_SU_PATH% copy .\view-object-api\target\view-object-api-%version%.jar %EXPORT_PATH%%DEV_SU_PATH%view-object-api.jar :view-object-manager +md %EXPORT_PATH%%PFCOMMON_SU_PATH% +md %EXPORT_PATH%%METADATA_TOOL_PATH% copy .\view-object-manager\target\view-object-manager-%version%.jar %EXPORT_PATH%%PFCOMMON_SU_PATH%com.inspur.edp.formserver.vmmanager.jar copy .\view-object-manager\target\view-object-manager-%version%.jar %EXPORT_PATH%%METADATA_TOOL_PATH%com.inspur.edp.formserver.vmmanager.jar :view-object-model +md %EXPORT_PATH%%PFCOMMON_SU_PATH% +md %EXPORT_PATH%%METADATA_TOOL_PATH% copy .\view-object-model\target\view-object-model-%version%.jar %EXPORT_PATH%%PFCOMMON_SU_PATH%com.inspur.edp.formserver.viewmodel.jar copy .\view-object-model\target\view-object-model-%version%.jar %EXPORT_PATH%%METADATA_TOOL_PATH%com.inspur.edp.formserver.viewmodel.jar :view-object-rtwebapi +md %EXPORT_PATH%%LCM_SU_PATH% copy .\view-object-rtwebapi\target\view-object-rtwebapi-%version%.jar %EXPORT_PATH%%LCM_SU_PATH%formserver-viewmodel-rtwebapi.jar :view-object-voextendinfo-server-api +md %EXPORT_PATH%%LCM_SU_PATH% +md %EXPORT_PATH%%METADATA_TOOL_PATH% copy .\view-object-voextendinfo-server-api\target\view-object-voextendinfo-server-api-%version%.jar %EXPORT_PATH%%LCM_SU_PATH%formserver-voextendinfo-server-api.jar copy .\view-object-voextendinfo-server-api\target\view-object-voextendinfo-server-api-%version%.jar %EXPORT_PATH%%METADATA_TOOL_PATH%formserver-voextendinfo-server-api.jar :view-object-voextendinfo-server-core +md %EXPORT_PATH%%LCM_SU_PATH% +md %EXPORT_PATH%%METADATA_TOOL_PATH% copy .\view-object-voextendinfo-server-core\target\view-object-voextendinfo-server-core-%version%.jar %EXPORT_PATH%%LCM_SU_PATH%formserver-voextendinfo-server-core.jar copy .\view-object-voextendinfo-server-core\target\view-object-voextendinfo-server-core-%version%.jar %EXPORT_PATH%%METADATA_TOOL_PATH%formserver-voextendinfo-server-core.jar :view-object-webapi +md %EXPORT_PATH%%DEV_SU_PATH% copy .\view-object-webapi\target\view-object-webapi-%version%.jar %EXPORT_PATH%%DEV_SU_PATH%com.inspur.edp.formserver.viewmodel.webapi.jar :resource_file diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/accessory/AccessoryServiceImpl.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/accessory/AccessoryServiceImpl.java index 8318bdf37c6ec8ac8f3865bb192853bb018b4bc8..436290c14f98d7f1fa278e461424fcd73c9b36fc 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/accessory/AccessoryServiceImpl.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/accessory/AccessoryServiceImpl.java @@ -484,7 +484,7 @@ public class AccessoryServiceImpl implements AccessoryService { if (approvalLabelIdPar != null) { MappedCdpActionParameter parProcessInstLabelId = new MappedCdpActionParameter(); parProcessInstLabelId.setID(approvalLabelIdPar.getID()); - parProcessInstLabelId.setParamCode(approvalLabelIdPar.getParamName()); + parProcessInstLabelId.setParamName(approvalLabelIdPar.getParamName()); parProcessInstLabelId.setParamCode(approvalLabelIdPar.getParamCode()); parProcessInstLabelId.setParameterType(VMParameterType.String); parProcessInstLabelId.getActualValue().setHasValue(true); @@ -496,7 +496,7 @@ public class AccessoryServiceImpl implements AccessoryService { if (getPayLoadPar != null) { MappedCdpActionParameter parPropertyMapping = new MappedCdpActionParameter(); parPropertyMapping.setID(getPayLoadPar.getID()); - parPropertyMapping.setParamCode(getPayLoadPar.getParamName()); + parPropertyMapping.setParamName(getPayLoadPar.getParamName()); parPropertyMapping.setParamCode(getPayLoadPar.getParamCode()); parPropertyMapping.setParameterType(VMParameterType.Custom); parPropertyMapping.setAssembly("com.inspur.edp.task.payload"); diff --git a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/config/VMManagerConfig.java b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/config/VMManagerConfig.java index f4951fa67191382b0ce4163618d2e4bb5253f70b..9108c8873cf38d3a2350016138686c774c49c487 100644 --- a/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/config/VMManagerConfig.java +++ b/view-object-manager/src/main/java/com/inspur/edp/formserver/vmmanager/config/VMManagerConfig.java @@ -24,6 +24,7 @@ import com.inspur.edp.formserver.vmmanager.service.ViewModelRtServiceImpl; import com.inspur.edp.formserver.vmmanager.service.ViewModelServiceImpl; import com.inspur.edp.metadata.rtcustomization.api.CustomizationService; import io.iec.edp.caf.securityentry.api.manager.SecurityEntryService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,8 +35,23 @@ public class VMManagerConfig { return new VMComStructureSchemaExtension(); } + /** + * 创建并注册ViewModelService的Spring Bean实例 + * + *

该Bean的创建依赖于可选的安全入口服务{@link SecurityEntryService}： + *

+ * + * @param securityEntryService 可选依赖的安全入口服务，用于视图模型权限管理。 + * 使用{@code @Autowired(required=false)}注解， + * 允许该参数为null + * @return 已配置的{@link ViewModelService}实现实例 + * @see ViewModelServiceImpl 具体实现类 + */ @Bean("com.inspur.edp.formserver.vmmanager.service.ViewModelServiceImpl") - public ViewModelService getViewModelService(SecurityEntryService securityEntryService) { + public ViewModelService getViewModelService(@Autowired(required = false) SecurityEntryService securityEntryService) { return new ViewModelServiceImpl(securityEntryService); } @Bean("com.inspur.edp.formserver.vmmanager.service.ViewModelRtServiceImpl")