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 CoreLogProcess addProcess(String title, String type, List list, ProcessListConsumer consumer) { + public CoreLogProcess addProcess(String title, List 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