publish 0.9.13

2023-04-17 15:08:24 +08:00
parent 3ed9a47c66
commit d0935cbda0
4 changed files with 100 additions and 30 deletions
--- 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
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.tiesheng.core.pojos.DaoBase;
-
 import java.util.Date;

 /**
@@ -37,12 +36,6 @@ public class CoreLogProcess extends DaoBase {
    @TableField(value = "fail_num")
    private Integer failNum;

-    /**
-     * 失败的文件
-     */
-    @TableField(value = "fail_file")
-    private String failFile;
-
    /**
     * 类型（import-导入，sync-同步）
     */
@@ -50,11 +43,29 @@ public class CoreLogProcess extends DaoBase {
    private String type;

    /**
-     * 状态(0-未完成，1-完成)
+     * 状态（0-未完成，1-已完成）
     */
    @TableField(value = "`status`")
    private Integer status;

+    /**
+     * 失败的文件
+     */
+    @TableField(value = "fail_file")
+    private String failFile;
+
+    /**
+     * 异常说明
+     */
+    @TableField(value = "error")
+    private String error;
+
+    /**
+     * 进度
+     */
+    @TableField(value = "`process`")
+    private Integer process;
+
    /**
     * 获取标题
     *
@@ -127,14 +138,6 @@ public class CoreLogProcess extends DaoBase {
        this.failNum = failNum;
    }

-    public String getFailFile() {
-        return failFile;
-    }
-
-    public void setFailFile(String failFile) {
-        this.failFile = failFile;
-    }
-
    /**
     * 获取类型（import-导入，sync-同步）
     *
@@ -154,20 +157,74 @@ public class CoreLogProcess extends DaoBase {
    }

    /**
-     * 获取状态(0-未完成，1-完成)
+     * 获取状态（0-未完成，1-已完成）
     *
-     * @return status - 状态(0-未完成，1-完成)
+     * @return status - 状态（0-未完成，1-已完成）
     */
    public Integer getStatus() {
        return status;
    }

    /**
-     * 设置状态(0-未完成，1-完成)
+     * 设置状态（0-未完成，1-已完成）
     *
-     * @param status 状态(0-未完成，1-完成)
+     * @param status 状态（0-未完成，1-已完成）
     */
    public void setStatus(Integer status) {
        this.status = status;
    }
-}
+
+    /**
+     * 获取失败的文件
+     *
+     * @return fail_file - 失败的文件
+     */
+    public String getFailFile() {
+        return failFile;
+    }
+
+    /**
+     * 设置失败的文件
+     *
+     * @param failFile 失败的文件
+     */
+    public void setFailFile(String failFile) {
+        this.failFile = failFile;
+    }
+
+    /**
+     * 获取异常说明
+     *
+     * @return error - 异常说明
+     */
+    public String getError() {
+        return error;
+    }
+
+    /**
+     * 设置异常说明
+     *
+     * @param error 异常说明
+     */
+    public void setError(String error) {
+        this.error = error;
+    }
+
+    /**
+     * 获取进度
+     *
+     * @return process - 进度
+     */
+    public Integer getProcess() {
+        return process;
+    }
+
+    /**
+     * 设置进度
+     *
+     * @param process 进度
+     */
+    public void setProcess(Integer process) {
+        this.process = process;
+    }
+}
--- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
@@ -6,7 +6,6 @@ import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.json.JSONUtil;
-import cn.hutool.log.LogFactory;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tiesheng.core.mapper.CoreLogLoginMapper;
 import com.tiesheng.core.mapper.CoreLogMessageMapper;
@@ -80,18 +79,20 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
        coreLogProcess.setType("import");
        coreLogProcess.setSuccessNum(0);
        coreLogProcess.setFailNum(0);
+        coreLogProcess.setProcess(0);
        coreLogProcessMapper.insert(coreLogProcess);

        ThreadUtil.execute(() -> {
            CollUtil.split(list, 100).forEach((it) -> {
                try {
                    int accept = consumer.accept(it);
+                    coreLogProcess.setProcess(coreLogProcess.getProcess() + it.size());
                    coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
                    coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
-                    coreLogProcessMapper.updateById(coreLogProcess);
                } catch (Exception e) {
-                    LogFactory.get().error(e);
+                    coreLogProcess.setError(JSONUtil.toJsonStr(e));
                }
+                coreLogProcessMapper.updateById(coreLogProcess);
            });

            // 执行结束
@@ -115,10 +116,12 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
    public CoreLogProcess addProcess(String title, ProcessSyncConsumer consumer) {
        CoreLogProcess coreLogProcess = new CoreLogProcess();
        coreLogProcess.setTitle(title);
-        coreLogProcess.setTotal(0);
+
        coreLogProcess.setType("sync");
        coreLogProcess.setSuccessNum(0);
        coreLogProcess.setFailNum(0);
+        coreLogProcess.setTotal(0);
+        coreLogProcess.setProcess(0);
        coreLogProcessMapper.insert(coreLogProcess);

        ThreadUtil.execute(() -> {
@@ -127,11 +130,13 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
            while (lastCount == pageSize) {
                try {
                    lastCount = consumer.accept(pageNum, pageSize);
+                    coreLogProcess.setTotal(coreLogProcess.getTotal() + lastCount);
+                    coreLogProcess.setProcess(coreLogProcess.getTotal());
                    coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + lastCount);
-                    coreLogProcessMapper.updateById(coreLogProcess);
                } catch (Exception e) {
-                    LogFactory.get().error(e);
+                    coreLogProcess.setError(JSONUtil.toJsonStr(e));
                }
+                coreLogProcessMapper.updateById(coreLogProcess);
                pageNum++;
            }

--- a/springboot-web/src/main/resources/db/migration/tiesheng_init_log.sql
+++ b/springboot-web/src/main/resources/db/migration/tiesheng_init_log.sql
@@ -64,6 +64,12 @@ ALTER TABLE core_log_process
 ALTER TABLE core_log_process
    ADD fail_file varchar(500) null default null COMMENT '失败的文件';

+ALTER TABLE core_log_process
+    ADD error text null default null COMMENT '异常说明';
+
+ALTER TABLE core_log_process
+    ADD process int(6) not null default 0 COMMENT '进度';
+
 -- ----------------------------
 -- Table structure for core_log_operation
 -- ----------------------------
--- a/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml
+++ b/springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml
@@ -15,10 +15,12 @@
    <result column="type" jdbcType="VARCHAR" property="type" />
    <result column="status" jdbcType="INTEGER" property="status" />
    <result column="fail_file" jdbcType="VARCHAR" property="failFile" />
+    <result column="error" jdbcType="LONGVARCHAR" property="error" />
+    <result column="process" jdbcType="INTEGER" property="process" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
-    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`,
-    `status`, fail_file
+    id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`, 
+    `status`, fail_file, error, `process`
  </sql>
-</mapper>
+</mapper>