From 24629f06b46f0297e516bd58f8616f05ddd3535c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Thu, 6 Apr 2023 00:05:49 +0800
Subject: [PATCH] publish 0.9.7

---
 .../tiesheng/core/service/CoreLogService.java | 23 ++++++++++++-------
 ...nsumer.java => ProcessImportConsumer.java} |  4 +---
 ...Consumer.java => ProcessSyncConsumer.java} |  6 +----
 3 files changed, 17 insertions(+), 16 deletions(-)
 rename springboot-web/src/main/java/com/tiesheng/core/util/{ProcessListConsumer.java => ProcessImportConsumer.java} (77%)
 rename springboot-web/src/main/java/com/tiesheng/core/util/{ProcessPageConsumer.java => ProcessSyncConsumer.java} (65%)

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 e89ff90..1869830 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
@@ -17,8 +17,8 @@ import com.tiesheng.core.pojos.dao.CoreLogOperation;
 import com.tiesheng.core.pojos.dao.CoreLogProcess;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.core.pojos.vo.ProcessDetailVo;
-import com.tiesheng.core.util.ProcessListConsumer;
-import com.tiesheng.core.util.ProcessPageConsumer;
+import com.tiesheng.core.util.ProcessImportConsumer;
+import com.tiesheng.core.util.ProcessSyncConsumer;
 import com.tiesheng.login.config.token.TsTokenConfig;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.util.ServletKit;
@@ -64,20 +64,19 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
     ///////////////////////////////////////////////////////////////////////////
 
     /**
-     * 添加空的过程 返回id 用于更新
+     * 添加导入过程
      *
      * @param title 标题
-     * @param type  类型 import-导入，sync-同步
      * @param list  要导入的数据
      */
-    public <T> CoreLogProcess addProcess(String title, String type, List<T> list, ProcessListConsumer consumer) {
+    public <T> CoreLogProcess addProcess(String title, List<T> list, ProcessImportConsumer consumer) {
         if (CollUtil.isEmpty(list)) {
             throw new ApiException("文件中不存在数据");
         }
         CoreLogProcess coreLogProcess = new CoreLogProcess();
         coreLogProcess.setTitle(title);
         coreLogProcess.setTotal(list.size());
-        coreLogProcess.setType(type);
+        coreLogProcess.setType("import");
         coreLogProcess.setSuccessNum(0);
         coreLogProcess.setFailNum(0);
         coreLogProcessMapper.insert(coreLogProcess);
@@ -101,11 +100,19 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         return coreLogProcess;
     }
 
-    public CoreLogProcess addProcess(String title, String type, ProcessPageConsumer consumer) {
+
+    /**
+     * 添加同步过程
+     *
+     * @param title
+     * @param consumer
+     * @return
+     */
+    public CoreLogProcess addProcess(String title, ProcessSyncConsumer consumer) {
         CoreLogProcess coreLogProcess = new CoreLogProcess();
         coreLogProcess.setTitle(title);
         coreLogProcess.setTotal(0);
-        coreLogProcess.setType(type);
+        coreLogProcess.setType("sync");
         coreLogProcess.setSuccessNum(0);
         coreLogProcess.setFailNum(0);
         coreLogProcessMapper.insert(coreLogProcess);
diff --git a/springboot-web/src/main/java/com/tiesheng/core/util/ProcessListConsumer.java b/springboot-web/src/main/java/com/tiesheng/core/util/ProcessImportConsumer.java
similarity index 77%
rename from springboot-web/src/main/java/com/tiesheng/core/util/ProcessListConsumer.java
rename to springboot-web/src/main/java/com/tiesheng/core/util/ProcessImportConsumer.java
index dadb76c..f40164c 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/util/ProcessListConsumer.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/util/ProcessImportConsumer.java
@@ -1,10 +1,8 @@
 package com.tiesheng.core.util;
 
-import com.tiesheng.core.pojos.dao.CoreLogProcess;
-
 import java.util.List;
 
-public interface ProcessListConsumer {
+public interface ProcessImportConsumer {
 
 
     /**
diff --git a/springboot-web/src/main/java/com/tiesheng/core/util/ProcessPageConsumer.java b/springboot-web/src/main/java/com/tiesheng/core/util/ProcessSyncConsumer.java
similarity index 65%
rename from springboot-web/src/main/java/com/tiesheng/core/util/ProcessPageConsumer.java
rename to springboot-web/src/main/java/com/tiesheng/core/util/ProcessSyncConsumer.java
index 8e120ce..787c9d7 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/util/ProcessPageConsumer.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/util/ProcessSyncConsumer.java
@@ -1,10 +1,6 @@
 package com.tiesheng.core.util;
 
-import com.tiesheng.core.pojos.dao.CoreLogProcess;
-
-import java.util.List;
-
-public interface ProcessPageConsumer {
+public interface ProcessSyncConsumer {
 
 
     /**