Merge branch 'refs/heads/zt-test' into test

# Conflicts:
#	pom.xml

deployment.yaml

@@ -31,14 +31,14 @@ spec:
             httpGet:
               path: /actuator/health
               port: 48083
-            initialDelaySeconds: 10
+            initialDelaySeconds: 50
             periodSeconds: 5
             failureThreshold: 3
           livenessProbe:
             httpGet:
               path: /actuator/health
               port: 48083
-            initialDelaySeconds: 30
+            initialDelaySeconds: 50
             periodSeconds: 10
             failureThreshold: 5
           resources:
@@ -46,7 +46,7 @@ spec:
               cpu: "500m"
               memory: "1024Mi"
             limits:
-              cpu: "700m"
+              cpu: "1"
               memory: "2048Mi"
       terminationGracePeriodSeconds: 30
   strategy:

pom.xml

@@ -16,13 +16,15 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.41</revision>
-        <business.supply.version>3.0.41</business.supply.version>
-        <business.base.version>3.0.41</business.base.version>
-        <business.logistic.version>3.0.41</business.logistic.version>
-        <business.manage.version>3.0.41</business.manage.version>
-        <business.qms.version>3.0.42</business.qms.version>
-        <business.mes.version>3.0.41</business.mes.version>
+        <revision>3.0.45</revision>
+        <business.supply.version>3.0.44</business.supply.version>
+        <business.base.version>3.0.44</business.base.version>
+        <business.logistic.version>3.0.44</business.logistic.version>
+        <business.manage.version>3.0.44</business.manage.version>
+        <business.qms.version>3.0.44</business.qms.version>
+        <business.mes.version>3.0.44</business.mes.version>
+        <business.capital.version>3.0.44</business.capital.version>
+        <business.product.version>3.0.44</business.product.version>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -195,8 +197,13 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
             <releases>
-                <enabled>false</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
             </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
         </repository>
     </repositories>
 
@@ -222,8 +229,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>dev</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -235,8 +242,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>prod</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -244,12 +251,12 @@
             <id>env-local</id>
             <properties>
                 <env.name>local</env.name>
-<!--                <config.server-addr>localhost:8848</config.server-addr>-->
-                <config.server-addr>172.16.46.63:30848</config.server-addr>
-                <config.namespace>local</config.namespace>
+                <config.server-addr>localhost:8848</config.server-addr>
+                <!--                <config.server-addr>172.16.46.63:30848</config.server-addr>-->
+                <config.namespace>zgty-qms-local</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>qms</config.username>
+                <config.password>1234567890</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -259,6 +266,12 @@
                 <config.namespace>chenbowen</config.namespace>
             </properties>
         </profile>
+        <profile>
+            <id>qsj</id>
+            <properties>
+                <config.namespace>qsj</config.namespace>
+            </properties>
+        </profile>
     </profiles>
 
 </project>

zt-module-bpm/zt-module-bpm-server/Dockerfile

@@ -1,6 +1,7 @@
 ## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性
 
-FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
+ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
+FROM ${BASE_IMAGE}
 
 ## 创建目录，并使用它作为工作目录
 RUN mkdir -p /zt-module-bpm-server
@@ -10,10 +11,15 @@ COPY ./target/zt-module-bpm-server.jar app.jar
 
 ## 设置 TZ 时区
 ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m"
+ENV TZ=Asia/Shanghai
+ENV JAVA_OPTS="-Xms512m -Xmx512m"
+ENV SW_AGENT_HOME=/opt/skywalking/agent
+ENV SW_AGENT_NAME=zt-module-bpm-server
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.16.46.63:30201
+ENV AGENT_JAVA_OPTS="-javaagent:${SW_AGENT_HOME}/skywalking-agent.jar -Dskywalking.agent.service_name=${SW_AGENT_NAME} -Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES}"
 
 ## 暴露后端项目的 48080 端口
 EXPOSE 48083
 
 ## 启动后端项目
-CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar
+CMD java ${AGENT_JAVA_OPTS} ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar

zt-module-bpm/zt-module-bpm-server/pom.xml

@@ -36,7 +36,17 @@
         <dependency>
             <groupId>com.zt.plat</groupId>
             <artifactId>zt-module-capital-api</artifactId>
-            <version>${business.supply.version}</version>
+            <version>${business.capital.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-product-api</artifactId>
+            <version>${business.product.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-product-api</artifactId>
+            <version>${business.mes.version}</version>
         </dependency>
         <dependency>
             <groupId>com.zt.plat</groupId>
@@ -44,6 +54,12 @@
             <version>${business.qms.version}</version>
         </dependency>
 
+<!--        qms模块api-->
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-qms-api</artifactId>
+            <version>${business.qms.version}</version>
+        </dependency>
         <!-- 业务组件 -->
         <dependency>
             <groupId>com.zt.plat</groupId>

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java

@@ -1,6 +1,11 @@
 package com.zt.plat.module.bpm.framework.rpc.config;
 
-import com.zt.plat.module.capital.api.AmountCreditApplyApi;
+import com.zt.plat.module.capital.api.splyAmountRequest.AmountRequestApi;
+import com.zt.plat.module.capital.api.splyAmtCrdtAppl.AmountCreditApplyApi;
+import com.zt.plat.module.product.api.MesProcessRoutApi;
+import com.zt.plat.module.product.api.plan.MesCompanyPlanApi;
+import com.zt.plat.module.product.api.plan.MesFactoryPlanApi;
+import com.zt.plat.module.qms.api.task.QmsApi;
 import com.zt.plat.module.system.api.dept.DeptApi;
 import com.zt.plat.module.system.api.dept.PostApi;
 import com.zt.plat.module.system.api.dict.DictDataApi;
@@ -13,6 +18,6 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration(value = "bpmRpcConfiguration", proxyBeanMethods = false)
 @EnableFeignClients(clients = {RoleApi.class, DeptApi.class, PostApi.class, AdminUserApi.class, SmsSendApi.class, DictDataApi.class,
-        PermissionApi.class, AmountCreditApplyApi.class})
+        PermissionApi.class, AmountCreditApplyApi.class, MesProcessRoutApi.class, MesFactoryPlanApi.class, MesCompanyPlanApi.class, AmountRequestApi.class, QmsApi.class})
 public class RpcConfiguration {
 }

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/mes/plan/MesCompanyPlanStatusListener.java

@@ -0,0 +1,33 @@
+package com.zt.plat.module.bpm.service.mes.plan;
+
+import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import com.zt.plat.module.product.api.dto.MesApprovalCallbackVO;
+import com.zt.plat.module.product.api.plan.MesCompanyPlanApi;
+import com.zt.plat.module.product.enums.plan.CompanyPlanTypeEnums;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class MesCompanyPlanStatusListener extends BpmProcessInstanceStatusEventListener {
+
+    @Resource
+    private MesCompanyPlanApi mesCompanyPlanApi;
+
+    @Override
+    protected List<String> getProcessDefinitionKey() {
+        return Arrays.stream(CompanyPlanTypeEnums.values()).map(CompanyPlanTypeEnums::getProcessKey).toList();
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceStatusEvent event) {
+        mesCompanyPlanApi.updateApprovalStatus(new MesApprovalCallbackVO()
+                .setInstanceId(event.getId())
+                .setBusinessKey(event.getBusinessKey())
+                .setStatus(event.getStatus())
+        );
+    }
+}

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/mes/plan/MesFactoryPlanStatusListener.java

@@ -0,0 +1,33 @@
+package com.zt.plat.module.bpm.service.mes.plan;
+
+import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import com.zt.plat.module.product.api.dto.MesApprovalCallbackVO;
+import com.zt.plat.module.product.api.plan.MesFactoryPlanApi;
+import com.zt.plat.module.product.enums.plan.FactoryPlanTypeEnums;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class MesFactoryPlanStatusListener extends BpmProcessInstanceStatusEventListener {
+
+    @Resource
+    private MesFactoryPlanApi mesFactoryPlanApi;
+
+    @Override
+    protected List<String> getProcessDefinitionKey() {
+        return Arrays.stream(FactoryPlanTypeEnums.values()).map(FactoryPlanTypeEnums::getProcessKey).toList();
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceStatusEvent event) {
+        mesFactoryPlanApi.updateApprovalStatus(new MesApprovalCallbackVO()
+                .setInstanceId(event.getId())
+                .setBusinessKey(event.getBusinessKey())
+                .setStatus(event.getStatus())
+        );
+    }
+}

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/process/route/listener/ProcessRouteApprovalBpmListener.java

@@ -0,0 +1,42 @@
+package com.zt.plat.module.bpm.service.process.route.listener;
+
+import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import com.zt.plat.module.product.api.MesProcessRoutApi;
+import com.zt.plat.module.product.enums.process.ProcessConstant;
+import com.zt.plat.module.product.enums.process.ProcessRouteApprovalStatusEnums;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 工艺流程审批状态监听器
+ */
+@Component
+public class ProcessRouteApprovalBpmListener extends BpmProcessInstanceStatusEventListener {
+
+    @Resource
+    private MesProcessRoutApi mesProcessRoutApi;
+
+    @Override
+    protected List<String> getProcessDefinitionKey() {
+        return List.of(ProcessConstant.APPROVAL_PROCESS_KEY);
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceStatusEvent event) {
+        Integer bpmStatus = event.getStatus();
+        String status = null;
+        if (Objects.equals(BpmProcessInstanceStatusEnum.APPROVE.getStatus(), bpmStatus)) {
+            status = ProcessRouteApprovalStatusEnums.Approved.getCode();
+        } else if (Objects.equals(BpmProcessInstanceStatusEnum.REJECT.getStatus(), bpmStatus)) {
+            status = ProcessRouteApprovalStatusEnums.Failed.getCode();
+        } else if (Objects.equals(BpmProcessInstanceStatusEnum.CANCEL.getStatus(), bpmStatus)) {
+            status = ProcessRouteApprovalStatusEnums.Draft.getCode();
+        }
+        mesProcessRoutApi.updateProcessRouteApprovalStatus(Long.parseLong(event.getBusinessKey()), status);
+    }
+}

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java

@@ -0,0 +1,60 @@
+package com.zt.plat.module.bpm.service.qms.listener;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.qms.api.task.QmsApi;
+import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO;
+import com.zt.plat.module.qms.enums.ErrorCodeConstants;
+import com.zt.plat.module.qms.enums.QmsBpmConstant;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.bpmn.model.FieldExtension;
+import org.flowable.bpmn.model.FlowableListener;
+import org.flowable.engine.RuntimeService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception0;
+
+
+/**
+ * QMS模块执行监听
+ */
+@Component
+@Slf4j
+public class QmsExecutionListener implements JavaDelegate {
+
+    @Autowired
+    private QmsApi qmsApi;
+    @Resource private RuntimeService runtimeService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void execute(DelegateExecution execution) {
+        log.info("[QmsExecutionListener][execution({}) 被调用！变量有：{}]", execution.getId(), execution.getCurrentFlowableListener().getFieldExtensions());
+        Map<String, Object> variables = execution.getVariables();
+        JSONObject jsonObject = new JSONObject(variables);
+        String insId = execution.getProcessInstanceId();
+        String businessKey = execution.getProcessInstanceBusinessKey();
+        FlowableListener listener = execution.getCurrentFlowableListener();
+        List<FieldExtension> fieldExtensions = listener.getFieldExtensions();   //节点执行监听里配置的扩展字段
+        String currentActivityId = execution.getCurrentActivityId();
+        jsonObject.put(QmsBpmConstant.BPM_CALLBACK_ACTIVITY_ID, currentActivityId);
+        jsonObject.put(QmsBpmConstant.BPM_FIELD_EXTENSIONS, fieldExtensions);
+        QmsBpmDTO qmsBpmDTO = new QmsBpmDTO(insId, businessKey, jsonObject, "");
+        Map<String, Object> v = runtimeService.getVariables(execution.getProcessInstanceId());
+//        Object status = runtimeService.getVariable(execution.getProcessInstanceId(), WfProcessConstant.TASK_VARIABLE_PROCESS_TERMINATE);
+        CommonResult<JSONObject> result = qmsApi.bpmCallback(qmsBpmDTO);
+        if (!result.isSuccess()) {
+            log.error("[QmsExecutionListener][execution({}) 回调失败！错误码：{}，错误信息：{}]", execution.getId(), result.getCode(), result.getMsg());
+            throw exception0(ErrorCodeConstants.ERROR_CODE_MODULE_QMS_BPM, result.getMsg());
+        }
+    }
+
+}

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java

@@ -0,0 +1,43 @@
+package com.zt.plat.module.bpm.service.qms.listener;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.qms.api.task.QmsApi;
+import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO;
+import com.zt.plat.module.qms.enums.ErrorCodeConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.delegate.TaskListener;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception0;
+
+
+/**
+ * QMS模块任务监听
+ */
+@Component
+@Slf4j
+public class QmsTaskListener implements TaskListener {
+    @Autowired
+    private QmsApi qmsApi;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void notify(DelegateTask delegateTask) {
+        log.info("[QmsTaskListener][delegateTask({})]", delegateTask);
+        String state = delegateTask.getState();
+        Map<String, Object> variables = delegateTask.getVariables();
+        JSONObject jsonObject = new JSONObject(variables);
+        String insId = delegateTask.getProcessInstanceId();
+        QmsBpmDTO qmsBpmDTO = new QmsBpmDTO(insId, "", jsonObject, state);
+        CommonResult<JSONObject> result = qmsApi.bpmCallback(qmsBpmDTO);
+        if (!result.isSuccess()) {
+            log.error("[QmsExecutionListener][execution({}) 回调失败！错误码：{}，错误信息：{}]", delegateTask.getId(), result.getCode(), result.getMsg());
+            throw exception0(ErrorCodeConstants.ERROR_CODE_MODULE_QMS_BPM, result.getMsg());
+        }
+    }
+}

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/supply/capital/listener/BpmAmountRequestApprovalStatusListener.java

@@ -0,0 +1,42 @@
+package com.zt.plat.module.bpm.service.supply.capital.listener;
+
+import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import com.zt.plat.module.capital.api.splyAmountRequest.AmountRequestApi;
+import com.zt.plat.module.capital.enums.AmountRequestApiStatusEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * sply_amount_request_approval_process - 请款单的状态的监听器实现类
+ *
+ * @author qianshijiang
+ */
+@Component
+public class BpmAmountRequestApprovalStatusListener extends BpmProcessInstanceStatusEventListener {
+
+    @Resource
+    private AmountRequestApi amountRequestApi;
+
+    @Override
+    protected List<String> getProcessDefinitionKey() {
+        return List.of(amountRequestApi.PROCESS_KEY);
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceStatusEvent event) {
+        // 将流程中的状态转换为业务的状态
+        Integer status = event.getStatus();
+        String approvalStatus = null;
+        if (BpmProcessInstanceStatusEnum.APPROVE.getStatus() == status) {
+            approvalStatus = AmountRequestApiStatusEnum.ACAS_PASS.getCode();
+        } else if (BpmProcessInstanceStatusEnum.REJECT.getStatus() == status) {
+            approvalStatus = AmountRequestApiStatusEnum.ACAS_REJECT.getCode();
+        }
+        amountRequestApi.updateAmountRequestStatus(Long.parseLong(event.getBusinessKey()),approvalStatus);
+    }
+
+}

zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/supply/capital/listener/BpmCreditLetterApprovalStatusListener.java

@@ -3,7 +3,7 @@ package com.zt.plat.module.bpm.service.supply.capital.listener;
 import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEvent;
 import com.zt.plat.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
 import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
-import com.zt.plat.module.capital.api.AmountCreditApplyApi;
+import com.zt.plat.module.capital.api.splyAmtCrdtAppl.AmountCreditApplyApi;
 import com.zt.plat.module.capital.enums.AmountCreditApplyApiStatusEnum;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;

zt-module-bpm/zt-module-bpm-server/src/main/resources/application.yaml

@@ -141,8 +141,8 @@ zt:
     exclude-urls: # 如下 url，仅仅是为了演示，去掉配置也没关系
       - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
   swagger:
-    title: 管理后台
-    description: 提供管理员管理的所有功能
+    title: Bpm 模块
+    description: 提供 Bpm 管理的所有功能
     version: ${zt.info.version}
   tenant: # 多租户相关配置项
     enable: true