From d63b6ab094f7cece13790c152db636e6cf04ddca Mon Sep 17 00:00:00 2001
From: "2715557295@qq.com" <xzy5201314>
Date: Wed, 22 Mar 2023 16:52:51 +0800
Subject: [PATCH] publish 0.8.7

---
 pom.xml                                       | 20 ++++++-------
 springboot-ademo/pom.xml                      |  2 +-
 springboot-annotation/pom.xml                 |  2 +-
 springboot-database/pom.xml                   |  2 +-
 springboot-encrypt/pom.xml                    |  2 +-
 springboot-login/pom.xml                      |  2 +-
 springboot-message/pom.xml                    |  2 +-
 springboot-platform/pom.xml                   |  2 +-
 springboot-poi/pom.xml                        |  2 +-
 springboot-util/pom.xml                       |  2 +-
 springboot-web/pom.xml                        |  2 +-
 .../core/pojos/dao/CoreLogProcess.java        | 28 +++++++++++++++++--
 .../core/pojos/vo/ProcessDetailVo.java        | 10 +++++++
 .../tiesheng/core/service/CoreLogService.java |  5 ++--
 .../db/migration/core_log_process.sql         |  2 ++
 .../resources/mapper/CoreLogProcessMapper.xml |  4 ++-
 16 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2662a1c..74c7b16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.8.6</version>
+    <version>0.8.7</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.8.6</version>
+                <version>0.8.7</version>
             </dependency>
 
             <dependency>
diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml
index 0636793..a135c0d 100644
--- a/springboot-ademo/pom.xml
+++ b/springboot-ademo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml
index e0824c6..bfc77b2 100644
--- a/springboot-annotation/pom.xml
+++ b/springboot-annotation/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>
diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml
index f5d3de2..0eceac7 100644
--- a/springboot-database/pom.xml
+++ b/springboot-database/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>
diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml
index fce2177..a85d4fd 100644
--- a/springboot-encrypt/pom.xml
+++ b/springboot-encrypt/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>
diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml
index 8f28ec6..2a3e5de 100644
--- a/springboot-login/pom.xml
+++ b/springboot-login/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>
diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml
index 9153d20..3e26800 100644
--- a/springboot-message/pom.xml
+++ b/springboot-message/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>
diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml
index 30a9d2c..8d69f05 100644
--- a/springboot-platform/pom.xml
+++ b/springboot-platform/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>
diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml
index 28ab0ef..89d5338 100644
--- a/springboot-poi/pom.xml
+++ b/springboot-poi/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>
diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml
index ead1ca3..d938aa1 100644
--- a/springboot-util/pom.xml
+++ b/springboot-util/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>
diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml
index c024fb3..261549e 100644
--- a/springboot-web/pom.xml
+++ b/springboot-web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.7</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>
diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogProcess.java b/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogProcess.java
index d39b764..2324a44 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogProcess.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogProcess.java
@@ -8,8 +8,8 @@ import com.tiesheng.core.pojos.DaoBase;
 import java.util.Date;
 
 /**
-    * 日志-过程
-    */
+ * 日志-过程
+ */
 @TableName(value = "core_log_process")
 public class CoreLogProcess extends DaoBase {
     /**
@@ -42,6 +42,12 @@ public class CoreLogProcess extends DaoBase {
     @TableField(value = "`type`")
     private String type;
 
+    /**
+     * 状态(0-未完成，1-完成)
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
     /**
      * 获取标题
      *
@@ -131,4 +137,22 @@ public class CoreLogProcess extends DaoBase {
     public void setType(String type) {
         this.type = type;
     }
+
+    /**
+     * 获取状态(0-未完成，1-完成)
+     *
+     * @return status - 状态(0-未完成，1-完成)
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态(0-未完成，1-完成)
+     *
+     * @param status 状态(0-未完成，1-完成)
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }
\ No newline at end of file
diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java b/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java
index 96a5970..0a7351f 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java
@@ -15,6 +15,16 @@ public class ProcessDetailVo {
 
     private String type;
 
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public String getTitle() {
         return title;
     }
diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java b/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
index 871d3f6..022e1d7 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
@@ -74,8 +74,9 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
      * @param successNum 成功数
      * @param failNum    失败数
      * @param type       类型（import-导出，sync-同步）
+     * @param status     状态（0-未完成，1-完成）
      */
-    public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type) {
+    public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type, Integer status) {
         CoreLogProcess coreLogProcess = new CoreLogProcess();
         coreLogProcess.setId(id);
         coreLogProcess.setTitle(title);
@@ -83,6 +84,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         coreLogProcess.setSuccessNum(successNum);
         coreLogProcess.setFailNum(failNum);
         coreLogProcess.setType(type);
+        coreLogProcess.setStatus(status);
         coreLogProcessMapper.updateById(coreLogProcess);
     }
 
@@ -97,7 +99,6 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
     }
 
 
-
     /**
      * 添加操作日志
      */
diff --git a/springboot-web/src/main/resources/db/migration/core_log_process.sql b/springboot-web/src/main/resources/db/migration/core_log_process.sql
index 108415e..945bf23 100644
--- a/springboot-web/src/main/resources/db/migration/core_log_process.sql
+++ b/springboot-web/src/main/resources/db/migration/core_log_process.sql
@@ -33,6 +33,8 @@ CREATE TABLE `core_log_process`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '日志-过程' ROW_FORMAT = Dynamic;
 
+alter table core_log_process add 'status' int(6) not null default 0 comment '状态（0-未完成,1-完成）';
+
 -- ----------------------------
 -- Records of core_log_process
 -- ----------------------------
diff --git a/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml b/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml
index 60140e9..fca6444 100644
--- a/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml
+++ b/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml
@@ -13,9 +13,11 @@
     <result column="success_num" jdbcType="INTEGER" property="successNum" />
     <result column="fail_num" jdbcType="INTEGER" property="failNum" />
     <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="status" jdbcType="INTEGER" property="status" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`
+    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`, 
+    `status`
   </sql>
 </mapper>
\ No newline at end of file