Merge branch 'zt-test' into test

deployment.yaml

@@ -11,7 +11,7 @@ metadata:
     description: DESC_PLACEHOLDER
     rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app: qms-server
@@ -74,3 +74,13 @@ spec:
       port: 9999
       targetPort: 9999
       nodePort: 30194
+    - name: websocket-8320
+      protocol: TCP
+      port: 8320
+      targetPort: 8320
+      nodePort: 30320
+    - name: tcp-8330
+      protocol: TCP
+      port: 8330
+      targetPort: 8330
+      nodePort: 30330

pom.xml

@@ -17,7 +17,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.43</revision>
+        <revision>3.0.44</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>

qms-server/Dockerfile

@@ -1,5 +1,6 @@
-ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
-FROM ${BASE_IMAGE}
+FROM 172.16.46.66:10043/base-service/report-base:x86_64-ubuntu_22-jre21-2.0.0
+#ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
+#FROM ${BASE_IMAGE}
 RUN mkdir -p /appdata/server
 WORKDIR /appdata/server
 ## 将后端项目的 Jar 文件，复制到镜像中
@@ -8,10 +9,10 @@ COPY ./target/qms-server.jar app.jar
 ## 设置 TZ 时区
 ENV TZ=Asia/Shanghai
 ENV JAVA_OPTS="-Xms512m -Xmx512m"
-ENV SW_AGENT_HOME=/opt/skywalking/agent
-ENV SW_AGENT_NAME=qms-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}"
+#ENV SW_AGENT_HOME=/opt/skywalking/agent
+#ENV SW_AGENT_NAME=qms-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}"
 
 # 暴露端口
 EXPOSE 48205

qms-server/src/main/resources/application-dev.yml

@@ -105,3 +105,87 @@ justauth:
     prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
+
+--- #################### liteflow相关配置 ####################
+liteflow:
+  #规则文件路径
+  rule-source: el_xml:com.zt.plat.module.qms.core.liteflow.parser.QmsXmlFlowELParser
+  #-----------------以下非必须-----------------
+  #liteflow是否开启，默认为true
+  enable: true
+  #liteflow的banner打印是否开启，默认为true
+  print-banner: true
+  #上下文的初始数量槽，默认值为1024，这个值不用刻意配置，这个值会自动扩容
+  slot-size: 1024
+  #FlowExecutor的execute2Future的线程数，默认为64
+  main-executor-works: 64
+  #FlowExecutor的execute2Future的自定义线程池Builder，LiteFlow提供了默认的Builder
+  main-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultMainExecutorBuilder
+  #自定义请求ID的生成类，LiteFlow提供了默认的生成类
+  request-id-generator-class: com.yomahub.liteflow.flow.id.DefaultRequestIdGenerator
+  #全局异步节点线程池大小，默认为64
+  global-thread-pool-size: 64
+  #全局异步节点线程池队列大小，默认为512
+  global-thread-pool-queue-size: 512
+  #全局异步节点线程池自定义Builder，LiteFlow提供了默认的线程池Builder
+  global-thread-pool-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultGlobalExecutorBuilder
+  #异步线程最长的等待时间(只用于when)，默认值为15000
+  when-max-wait-time: 15000
+  #异步线程最长的等待时间(只用于when)，默认值为MILLISECONDS，毫秒
+  when-max-wait-time-unit: MILLISECONDS
+  #每个WHEN是否用单独的线程池
+  when-thread-pool-isolate: false
+  #设置解析模式，一共有三种模式，PARSE_ALL_ON_START | PARSE_ALL_ON_FIRST_EXEC | PARSE_ONE_ON_FIRST_EXEC
+  parse-mode: PARSE_ONE_ON_FIRST_EXEC
+  #全局重试次数，默认为0
+  retry-count: 0
+  #是否支持不同类型的加载方式混用，默认为false
+  support-multiple-type: false
+  #全局默认节点执行器
+  node-executor-class: com.yomahub.liteflow.flow.executor.DefaultNodeExecutor
+  #是否打印执行中过程中的日志，默认为true
+  print-execution-log: true
+  #是否开启本地文件监听，默认为false
+  enable-monitor-file: false
+  #是否开启快速解析模式，默认为false
+  fast-load: false
+  #是否开启Node节点实例ID持久化，默认为false
+  enable-node-instance-id: false
+  #是否开启虚拟线程(只在JDK21+环境有效)，默认为true
+  enable-virtual-thread: true
+  #简易监控配置选项
+  monitor:
+    #监控是否开启，默认不开启
+    enable-log: false
+    #监控队列存储大小，默认值为200
+    queue-limit: 200
+    #监控一开始延迟多少执行，默认值为300000毫秒，也就是5分钟
+    delay: 300000
+    #监控日志打印每过多少时间执行一次，默认值为300000毫秒，也就是5分钟
+    period: 300000
+
+zzjc:
+  druid:
+    sql-log: true
+  snowflake:
+    data-center-id: 30
+  tio:
+    server:
+      # port
+      port: 8320
+      # 心跳时间
+      heartbeat-timeout: 20000
+    websocket:
+      # enable websocket default false
+      enable: true
+      # websocket port
+      port: 8330
+    # 集群配置 默认关闭，集群开启需要redis
+    cluster:
+      enabled: true
+      group: true
+      redis:
+        mode: single
+        ip: 172.16.46.63 # 地址
+        port: 30379 # 端口
+        database: 0 # 数据库索引

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentExtendRespVO.java

@@ -0,0 +1,23 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSubParentSampleAssessmentExtendRespVO extends BusinessSubParentSampleAssessmentRespVO {
+
+    @Schema(description = "检测项目key")
+    private String dictionaryProjectKey;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+    
+    @Schema(description = "检测项目缩写")
+    private String simpleName;
+    
+    @Schema(description = "显示名称")
+    private String showName;
+    
+    @Schema(description = "分析方法")
+    private String configAssayMethodName;
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentExtendRespVO.java

@@ -0,0 +1,24 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSubSampleAssessmentExtendRespVO extends BusinessSubSampleAssessmentRespVO {
+
+	/** 分析方法名称 **/
+    @Schema(description = "分析方法名称")
+    private String configAssayMethodName;
+
+    @Schema(description = "检测项目key")
+    private String dictionaryProjectKey;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+    
+    @Schema(description = "检测项目缩写")
+    private String simpleName;
+    
+    @Schema(description = "显示名称")
+    private String showName;
+}