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

publish 0.9.14

Browse Source
This commit is contained in:
曾文豪
2023-04-17 15:23:45 +08:00
parent d0935cbda0
commit 33d20c518e
13 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pom.xml
View File

@@ -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>

2
springboot-ademo/pom.xml
View File

@@ -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>

2
springboot-annotation/pom.xml
View File

@@ -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>

2
springboot-database/pom.xml
View File

@@ -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>

2
springboot-encrypt/pom.xml
View File

@@ -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>

2
springboot-login/pom.xml
View File

@@ -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>

2
springboot-message/pom.xml
View File

@@ -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>

2
springboot-platform/pom.xml
View File

@@ -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>

2
springboot-poi/pom.xml
View File

@@ -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>

2
springboot-util/pom.xml
View File

@@ -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>

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.13</version>
<version>0.9.14</version>
</parent>
<artifactId>springboot-web</artifactId>

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

@@ -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;
}
}

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

@@ -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);
coreLogProcess.setProcess(coreLogProcess.getProcess() + it.size());
coreLogProcess.setSuccessNum(coreLogProcess.getSuccessNum() + accept);
coreLogProcess.setFailNum(coreLogProcess.getFailNum() + it.size() - accept);
accept = consumer.accept(it);
} 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++;