tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

publish 0.9.13

Browse Source
This commit is contained in:
曾文豪
2023-04-17 14:47:24 +08:00
parent 3f6989d039
commit 3ed9a47c66
12 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
springboot-web/pom.xml
View File

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

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

@@ -6,6 +6,7 @@ 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;
@@ -83,17 +84,20 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
ThreadUtil.execute(() -> {
CollUtil.split(list, 100).forEach((it) -> {
int accept = consumer.accept(it);
coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
if (coreLogProcess.getFailNum() + coreLogProcess.getSuccessNum() >= list.size()) {
coreLogProcess.setFailFile(consumer.getFailFile());
coreLogProcess.setStatus(1);
try {
int accept = consumer.accept(it);
coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
coreLogProcessMapper.updateById(coreLogProcess);
} catch (Exception e) {
LogFactory.get().error(e);
}
coreLogProcessMapper.updateById(coreLogProcess);
});
// 执行结束
coreLogProcess.setFailFile(consumer.getFailFile());
coreLogProcess.setStatus(1);
coreLogProcessMapper.updateById(coreLogProcess);
});
@@ -121,14 +125,19 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
int pageSize = 1000;
int pageNum = 1, lastCount = pageSize;
while (lastCount == pageSize) {
lastCount = consumer.accept(pageNum, pageSize);
coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + lastCount);
if (lastCount != pageSize) {
coreLogProcess.setStatus(1);
try {
lastCount = consumer.accept(pageNum, pageSize);
coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + lastCount);
coreLogProcessMapper.updateById(coreLogProcess);
} catch (Exception e) {
LogFactory.get().error(e);
}
coreLogProcessMapper.updateById(coreLogProcess);
pageNum++;
}
// 执行结束
coreLogProcess.setStatus(1);
coreLogProcessMapper.updateById(coreLogProcess);
});
return coreLogProcess;