From 42c51cce329600c27e4cb2e4369fac48dd3e1391 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Tue, 8 Jul 2025 16:07:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?build(export):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=84=9A=E6=9C=AC=E5=B9=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=88=9B=E5=BB=BA=E9=A1=BA=E5=BA=8F-=20?= =?UTF-8?q?=E5=9C=A8=E5=A4=8D=E5=88=B6=20jar=20=E6=96=87=E4=BB=B6=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=88=9B=E5=BB=BA=E5=BF=85=E8=A6=81=E7=9A=84=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=20-=20=E8=B0=83=E6=95=B4=E4=BA=86=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9A=84=E9=A1=BA=E5=BA=8F=EF=BC=8C=E7=A1=AE?= =?UTF-8?q?=E4=BF=9D=E5=9C=A8=E9=9C=80=E8=A6=81=E6=97=B6=E5=B7=B2=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=20-=20=E4=BF=9D=E7=95=99=E4=BA=86=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA=E9=80=BB=E8=BE=91=E5=92=8C=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=8D=E5=88=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- export.bat | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/export.bat b/export.bat index b4f1a47..454827a 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 -- Gitee From 593e0580a6298df1f9c116806d5670d90220b5af Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Wed, 16 Jul 2025 15:25:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(vmmanager):=20=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E5=88=9B=E5=BB=BA=20ViewModelService=20bean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 VMManagerConfig 类中，为 getViewModelService 方法添加了 ConditionalOnBean 注解 - 仅在 SecurityEntryService bean 存在时创建 ViewModelService bean - 优化了代码结构，提高了模块间的解耦和可测试性 --- .../vmmanager/config/VMManagerConfig.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 f4951fa..9108c88 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") -- Gitee From 6bf1c10cb443958b0d6a4dc09048dca0b55f5b23 Mon Sep 17 00:00:00 2001 From: sunhongfei01 Date: Thu, 31 Jul 2025 11:51:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(vmmanager):=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E5=92=8C=E5=8F=82=E6=95=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E8=AE=BE=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在处理 approvalLabelIdPar 和 getPayLoadPar 时，应赋值ParamName逻辑问题 --- .../formserver/vmmanager/accessory/AccessoryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8318bdf..436290c 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"); -- Gitee