publish 0.9.14

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.9.13</version>
+    <version>0.9.14</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.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.9.13</version>
+                <version>0.9.14</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.9.13</version>
+        <version>0.9.14</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java

@@ -13,12 +13,16 @@ public class ProcessDetailVo {
 
     private Integer failNum;
 
+    private Integer process;
+
     private String type;
 
     private Integer status;
 
     private String failFile;
 
+    private String error;
+
     public Integer getStatus() {
         return status;
     }
@@ -74,4 +78,20 @@ public class ProcessDetailVo {
     public void setFailFile(String failFile) {
         this.failFile = failFile;
     }
+
+    public Integer getProcess() {
+        return process;
+    }
+
+    public void setProcess(Integer process) {
+        this.process = process;
+    }
+
+    public String getError() {
+        return error;
+    }
+
+    public void setError(String error) {
+        this.error = error;
+    }
 }

springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java

@@ -80,18 +80,20 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         coreLogProcess.setSuccessNum(0);
         coreLogProcess.setFailNum(0);
         coreLogProcess.setProcess(0);
+        coreLogProcess.setError("");
         coreLogProcessMapper.insert(coreLogProcess);
 
         ThreadUtil.execute(() -> {
             CollUtil.split(list, 100).forEach((it) -> {
+                int accept = 0;
                 try {
-                    int accept = consumer.accept(it);
+                    accept = consumer.accept(it);
-                    coreLogProcess.setProcess(coreLogProcess.getProcess() + it.size());
-                    coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
-                    coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
                 } catch (Exception e) {
-                    coreLogProcess.setError(JSONUtil.toJsonStr(e));
+                    coreLogProcess.setError(coreLogProcess.getError() + ";" + JSONUtil.toJsonStr(e));
                 }
+                coreLogProcess.setProcess(coreLogProcess.getProcess() + it.size());
+                coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
+                coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
                 coreLogProcessMapper.updateById(coreLogProcess);
             });
 
@@ -122,6 +124,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         coreLogProcess.setFailNum(0);
         coreLogProcess.setTotal(0);
         coreLogProcess.setProcess(0);
+        coreLogProcess.setError("");
         coreLogProcessMapper.insert(coreLogProcess);
 
         ThreadUtil.execute(() -> {
@@ -134,7 +137,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
                     coreLogProcess.setProcess(coreLogProcess.getTotal());
                     coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + lastCount);
                 } catch (Exception e) {
-                    coreLogProcess.setError(JSONUtil.toJsonStr(e));
+                    coreLogProcess.setError(coreLogProcess.getError() + ";" + JSONUtil.toJsonStr(e));
                 }
                 coreLogProcessMapper.updateById(coreLogProcess);
                 pageNum++;