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

1. 提出私服 skywalking 的依赖，使用 ZStack 自带链路追踪
2025-12-11 10:17:55 +08:00 · 2025-12-03 20:32:06 +08:00 · 2025-11-28 15:14:07 +08:00 · 2025-11-25 18:54:39 +08:00 · 2025-11-25 10:01:43 +08:00 · 2025-11-25 09:54:36 +08:00
6 changed files with 42 additions and 24 deletions
--- a/deployment.yaml
+++ b/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:
--- a/pom.xml
+++ b/pom.xml
@@ -16,13 +16,15 @@
    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>

    <properties>
-        <revision>3.0.42</revision>
-        <business.supply.version>3.0.42</business.supply.version>
-        <business.base.version>3.0.42</business.base.version>
-        <business.logistic.version>3.0.42</business.logistic.version>
-        <business.manage.version>3.0.42</business.manage.version>
-        <business.qms.version>3.0.42</business.qms.version>
-        <business.mes.version>3.0.42</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>true</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>
--- a/zt-module-bpm/zt-module-bpm-server/pom.xml
+++ b/zt-module-bpm/zt-module-bpm-server/pom.xml
@@ -36,12 +36,12 @@
        <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.mes.version}</version>
+            <version>${business.product.version}</version>
        </dependency>
        <dependency>
            <groupId>com.zt.plat</groupId>
@@ -54,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>
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java
+++ b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsExecutionListener.java
@@ -5,8 +5,11 @@ 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;
@@ -14,6 +17,7 @@ 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;
@@ -36,11 +40,13 @@ public class QmsExecutionListener implements JavaDelegate {
        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);
--- a/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java
+++ b/zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java
@@ -1,11 +1,10 @@
 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.alibaba.fastjson.JSONObject;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.delegate.TaskListener;
 import org.flowable.task.service.delegate.DelegateTask;
--- a/zt-module-bpm/zt-module-bpm-server/src/main/resources/application.yaml
+++ b/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
Author	SHA1	Message	Date
FCL	39ff226c9b	Merge branch 'refs/heads/zt-test' into test	2025-12-11 10:17:55 +08:00
chenbowen	b4805414c5	1. 提出私服 skywalking 的依赖，使用 ZStack 自带链路追踪	2025-12-03 20:32:06 +08:00
FCL	4d0738487b	Merge branch 'refs/heads/zt-test' into test # Conflicts: # pom.xml	2025-11-28 15:14:07 +08:00
chenbowen	05967b855b	1. 同步 nacos 配置到业务系统	2025-11-25 18:54:39 +08:00
FCL	be44c5b4f3	Merge branch 'refs/heads/zt-test' into test # Conflicts: # zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java	2025-11-25 10:01:43 +08:00
chenbowen	aa688680d3	1. 修复升级私有包版本错误	2025-11-25 09:54:36 +08:00
chenbowen	4029beca5b	1. 升级私有包版本	2025-11-25 09:37:44 +08:00
chenbowen	ae48f77d9d	Merge branch 'dev' into test	2025-11-19 15:44:39 +08:00
chenbowen	13d3016a53	1. 升级私有包版本	2025-11-19 14:48:09 +08:00
FCL	f2dffc6ef0	Merge branch 'dev' into test	2025-11-18 15:00:09 +08:00
FCL	e257273b13	feat:qms模块监听	2025-11-18 14:59:28 +08:00
FCL	265d317e3e	Merge branch 'refs/heads/zt-test' into test # Conflicts: # pom.xml	2025-11-18 10:11:53 +08:00
chenbowen	63490962bb	1. 调整业务 pod 资源检查的延时	2025-11-06 14:04:31 +08:00
chenbowen	5613cc4209	1. 调整 bpm 资源	2025-11-06 13:58:19 +08:00
chenbowen	aae4f1cbda	1. 修复 base 编译错误 2. build 追加 skywalking 集成	2025-11-06 09:23:43 +08:00
FCL	abb2d31d11	fix:报告流程回调优化	2025-11-03 11:54:58 +08:00
chenbowen	d6d7858c1b	Merge branch 'dev' into test # Conflicts: # zt-module-bpm/zt-module-bpm-server/pom.xml	2025-10-29 18:30:14 +08:00
chenbowen	da0214b2a4	ZT 远程仓库依赖强制更新	2025-10-29 18:23:28 +08:00
FCL	22ad11a246	feat:报告流程回调、手写签名	2025-10-29 15:27:02 +08:00
chenbowen	460baf050f	修复未同步的 bpm 版本错误	2025-10-28 16:54:26 +08:00
chenbowen	d36dd2aee2	Merge branch 'dev' into test # Conflicts: # pom.xml	2025-10-28 14:47:55 +08:00
chenbowen	1d056119eb	更新版本	2025-10-28 14:47:29 +08:00
chenbowen	3ec1be28e2	Merge branch 'dev' into test # Conflicts: # pom.xml	2025-10-28 14:46:04 +08:00
chenbowen	6b3acc955c	更新版本	2025-10-28 14:45:35 +08:00
chenbowen	5d1a685c9e	模块独立命名	2025-10-22 16:06:26 +08:00