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

This reverts commit 667ee852da.

deployment.yaml

@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
   name: zt-module-bpm
   labels:
     app: zt-module-bpm
@@ -27,6 +27,13 @@ spec:
           env:
             - name: TZ
               value: Asia/Shanghai
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - "/bin/sh"
+                  - "-c"
+                  - "sleep 35"
           readinessProbe:
             httpGet:
               path: /actuator/health
@@ -48,7 +55,7 @@ spec:
             limits:
               cpu: "1"
               memory: "2048Mi"
-      terminationGracePeriodSeconds: 30
+      terminationGracePeriodSeconds: 40
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -58,7 +65,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  namespace: ns-f16a3067ca7b434aad127d15eac82503
   name: zt-module-bpm
 spec:
   type: NodePort

pom.xml

@@ -12,19 +12,18 @@
     </modules>
 
     <name>${project.artifactId}</name>
-    <description>芋道项目基础脚手架</description>
+    <description>项目基础脚手架</description>
-    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.45</revision>
+        <revision>3.0.47-SNAPSHOT</revision>
-        <business.supply.version>3.0.44</business.supply.version>
+        <business.supply.version>3.0.47-SNAPSHOT</business.supply.version>
-        <business.base.version>3.0.44</business.base.version>
+        <business.base.version>3.0.47-SNAPSHOT</business.base.version>
-        <business.logistic.version>3.0.44</business.logistic.version>
+        <business.logistic.version>3.0.47-SNAPSHOT</business.logistic.version>
-        <business.manage.version>3.0.44</business.manage.version>
+        <business.manage.version>3.0.47-SNAPSHOT</business.manage.version>
-        <business.qms.version>3.0.44</business.qms.version>
+        <business.qms.version>3.0.47-SNAPSHOT</business.qms.version>
-        <business.mes.version>3.0.44</business.mes.version>
+        <business.mes.version>3.0.47-SNAPSHOT</business.mes.version>
-        <business.capital.version>3.0.44</business.capital.version>
+        <business.capital.version>3.0.47-SNAPSHOT</business.capital.version>
-        <business.product.version>3.0.44</business.product.version>
+        <business.product.version>3.0.47-SNAPSHOT</business.product.version>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -195,7 +194,7 @@
         <repository>
             <id>ZT</id>
             <name>中铜 ZStack 私服</name>
-            <url>http://172.16.46.63:30708/repository/test/</url>
+            <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
             <releases>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>warn</checksumPolicy>
@@ -213,11 +212,11 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
         </repository>
-<!--    <snapshotRepository>-->
+        <snapshotRepository>
-<!--        <id>ZT</id>-->
+            <id>ZT-snap</id>
-<!--        <name>中铜 ZStack 私服</name>-->
+            <name>中铜 ZStack 私服</name>
-<!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
-<!--    </snapshotRepository>-->
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>
@@ -269,7 +268,27 @@
         <profile>
             <id>qsj</id>
             <properties>
+                <env.name>dev</env.name>
+                <!--Nacos 配置-->
+                <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>qsj</config.namespace>
+                <config.group>DEFAULT_GROUP</config.group>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
+                <config.version>1.0.0</config.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>klw-dev</id>
+            <properties>
+                <env.name>dev</env.name>
+                <!--Nacos 配置-->
+                <config.server-addr>172.16.46.63:30848</config.server-addr>
+                <config.namespace>klw</config.namespace>
+                <config.group>DEFAULT_GROUP</config.group>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
+                <config.version>1.0.0</config.version>
             </properties>
         </profile>
     </profiles>

zt-module-bpm/pom.xml

@@ -12,7 +12,7 @@
         <module>zt-module-bpm-api</module>
         <module>zt-module-bpm-server</module>
     </modules>
-    <artifactId>zt-module-bpm</artifactId>
+    <artifactId>zt-module-bpm-dsc</artifactId>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>

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

@@ -4,11 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.zt.plat</groupId>
-        <artifactId>zt-module-bpm</artifactId>
+        <artifactId>zt-module-bpm-dsc</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>zt-module-bpm-api</artifactId>
+    <artifactId>zt-module-bpm-api-dsc</artifactId>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/BpmCategoryApi.java

@@ -1,55 +0,0 @@
-package com.zt.plat.module.bpm.api.definition;
-
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.module.bpm.api.definition.dto.BpmCategoryPageReqDTO;
-import com.zt.plat.module.bpm.api.definition.dto.BpmCategoryRespDTO;
-import com.zt.plat.module.bpm.api.definition.dto.BpmCategorySaveReqDTO;
-import com.zt.plat.module.bpm.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@FeignClient(name = ApiConstants.NAME)
-@Tag(name = "RPC 服务 - BPM 流程分类")
-public interface BpmCategoryApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/category";
-
-    @PostMapping(PREFIX + "/create")
-    @Operation(summary = "创建流程分类")
-    CommonResult<Long> createCategory(@Valid @RequestBody BpmCategorySaveReqDTO createReqDTO);
-
-    @PutMapping(PREFIX + "/update")
-    @Operation(summary = "更新流程分类")
-    CommonResult<Boolean> updateCategory(@Valid @RequestBody BpmCategorySaveReqDTO updateReqDTO);
-
-    @PutMapping(PREFIX + "/update-sort-batch")
-    @Operation(summary = "批量更新流程分类的排序")
-    @Parameter(name = "ids", description = "分类编号列表", required = true, example = "1,2,3")
-    CommonResult<Boolean> updateCategorySortBatch(@RequestParam("ids") List<Long> ids);
-
-    @DeleteMapping(PREFIX + "/delete")
-    @Operation(summary = "删除流程分类")
-    @Parameter(name = "id", description = "编号", required = true)
-    CommonResult<Boolean> deleteCategory(@RequestParam("id") Long id);
-
-    @GetMapping(PREFIX + "/get")
-    @Operation(summary = "获得流程分类")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    CommonResult<BpmCategoryRespDTO> getCategory(@RequestParam("id") Long id);
-
-    @PostMapping(PREFIX + "/page")
-    @Operation(summary = "获得流程分类分页")
-    CommonResult<PageResult<BpmCategoryRespDTO>> getCategoryPage(@Valid @RequestBody BpmCategoryPageReqDTO pageReqDTO);
-
-    @GetMapping(PREFIX + "/simple-list")
-    @Operation(summary = "获取流程分类的精简信息列表", description = "只包含被开启的分类，主要用于前端的下拉选项")
-    CommonResult<List<BpmCategoryRespDTO>> getCategorySimpleList();
-
-}

zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/BpmFormApi.java

@@ -1,50 +0,0 @@
-package com.zt.plat.module.bpm.api.definition;
-
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.module.bpm.api.definition.dto.BpmFormPageReqDTO;
-import com.zt.plat.module.bpm.api.definition.dto.BpmFormRespDTO;
-import com.zt.plat.module.bpm.api.definition.dto.BpmFormSaveReqDTO;
-import com.zt.plat.module.bpm.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@FeignClient(name = ApiConstants.NAME)
-@Tag(name = "RPC 服务 - 动态表单")
-public interface BpmFormApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/form";
-
-    @PostMapping(PREFIX + "/create")
-    @Operation(summary = "创建动态表单")
-    CommonResult<Long> createForm(@Valid @RequestBody BpmFormSaveReqDTO createReqDTO);
-
-    @PutMapping(PREFIX + "/update")
-    @Operation(summary = "更新动态表单")
-    CommonResult<Boolean> updateForm(@Valid @RequestBody BpmFormSaveReqDTO updateReqDTO);
-
-    @DeleteMapping(PREFIX + "/delete")
-    @Operation(summary = "删除动态表单")
-    @Parameter(name = "id", description = "编号", required = true)
-    CommonResult<Boolean> deleteForm(@RequestParam("id") Long id);
-
-    @GetMapping(PREFIX + "/get")
-    @Operation(summary = "获得动态表单")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    CommonResult<BpmFormRespDTO> getForm(@RequestParam("id") Long id);
-
-    @PostMapping(PREFIX + "/page")
-    @Operation(summary = "获得动态表单分页")
-    CommonResult<PageResult<BpmFormRespDTO>> getFormPage(@Valid @RequestBody BpmFormPageReqDTO pageReqDTO);
-
-    @GetMapping(PREFIX + "/simple-list")
-    @Operation(summary = "获得动态表单的精简列表", description = "用于表单下拉框")
-    CommonResult<List<BpmFormRespDTO>> getFormSimpleList();
-
-}

zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/BpmUserGroupApi.java

@@ -1,29 +0,0 @@
-package com.zt.plat.module.bpm.api.definition;
-
-import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.module.bpm.api.definition.dto.BpmUserGroupRespDTO;
-import com.zt.plat.module.bpm.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@FeignClient(name = ApiConstants.NAME)
-@Tag(name = "RPC 服务 - 用户组")
-public interface BpmUserGroupApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/user-group";
-
-    @GetMapping(PREFIX + "/get")
-    @Operation(summary = "获得用户组")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    CommonResult<BpmUserGroupRespDTO> getUserGroup(@RequestParam("id") Long id);
-
-    @GetMapping(PREFIX + "/simple-list")
-    @Operation(summary = "获取用户组精简信息列表", description = "只包含被开启的用户组，主要用于前端的下拉选项")
-    CommonResult<List<BpmUserGroupRespDTO>> getUserGroupSimpleList();
-
-}

zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmCategoryPageReqDTO.java

@@ -1,32 +0,0 @@
-package com.zt.plat.module.bpm.api.definition.dto;
-
-import com.zt.plat.framework.common.enums.CommonStatusEnum;
-import com.zt.plat.framework.common.pojo.PageParam;
-import com.zt.plat.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "RPC 服务 - BPM 流程分类分页 Request DTO")
-@Data
-public class BpmCategoryPageReqDTO extends PageParam {
-
-    @Schema(description = "分类名", example = "王五")
-    private String name;
-
-    @Schema(description = "分类标志", example = "OA")
-    private String code;
-
-    @Schema(description = "分类状态", example = "1")
-    @InEnum(CommonStatusEnum.class)
-    private Integer status;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmCategoryRespDTO.java

@@ -1,33 +0,0 @@
-package com.zt.plat.module.bpm.api.definition.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "RPC 服务 - BPM 流程分类 Response DTO")
-@Data
-public class BpmCategoryRespDTO {
-
-    @Schema(description = "分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3167")
-    private Long id;
-
-    @Schema(description = "分类名", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-    private String name;
-
-    @Schema(description = "分类标志", requiredMode = Schema.RequiredMode.REQUIRED, example = "OA")
-    private String code;
-
-    @Schema(description = "分类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
-    private String description;
-
-    @Schema(description = "分类状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer status;
-
-    @Schema(description = "分类排序", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Integer sort;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}