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

publish 2.0.0.rc46

Browse Source
This commit is contained in:
曾文豪
2024-08-26 13:31:03 +08:00
parent 90029faa53
commit d0289d38b3
21 changed files with 63 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
## 2.0.0.rc44
#### 优化导入导出过程
- 过程日志不再和操作日志同时存在
- 过程日志新增params参数
## 2.0.0.rc4
- perf：TsTokenConfig不在提供静态方法

22
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
<packaging>pom</packaging>
<name>springboot-parent</name>
<description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,61 +58,61 @@
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-database</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-encrypt</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-role</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-poi</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</dependency>
<dependency>

4
springboot-ademo/pom.xml
View File

@@ -6,11 +6,11 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</parent>
<artifactId>springboot-ademo</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>

2
springboot-ademo/src/main/java/com/tiesheng/demo/service/UserImportHandler.java
View File

@@ -33,7 +33,7 @@ public class UserImportHandler implements TsImportHandler<String> {
}
@Override
public String getFailFile() {
public String getResultFile() {
return "";
}
}

2
springboot-annotation/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</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>2.0.0.rc44</version>
<version>2.0.0.rc46</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>2.0.0.rc44</version>
<version>2.0.0.rc46</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>2.0.0.rc44</version>
<version>2.0.0.rc46</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>2.0.0.rc44</version>
<version>2.0.0.rc46</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>2.0.0.rc44</version>
<version>2.0.0.rc46</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>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</parent>
<artifactId>springboot-poi</artifactId>

2
springboot-role/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</parent>
<artifactId>springboot-role</artifactId>

2
springboot-util/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.0.rc44</version>
<version>2.0.0.rc46</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>2.0.0.rc44</version>
<version>2.0.0.rc46</version>
</parent>
<artifactId>springboot-web</artifactId>

16
springboot-web/src/main/java/com/tiesheng/web/pojos/dao/CoreLogProcess.java
View File

@@ -48,8 +48,8 @@ public class CoreLogProcess extends DaoBase {
/**
* 失败的文件
*/
@TableField(value = "fail_file")
private String failFile;
@TableField(value = "result_file")
private String resultFile;
/**
* 进度
@@ -174,19 +174,19 @@ public class CoreLogProcess extends DaoBase {
/**
* 获取失败的文件
*
* @return fail_file - 失败的文件
* @return result_file - 失败的文件
*/
public String getFailFile() {
return failFile;
public String getResultFile() {
return resultFile;
}
/**
* 设置失败的文件
*
* @param failFile 失败的文件
* @param resultFile 失败的文件
*/
public void setFailFile(String failFile) {
this.failFile = failFile;
public void setResultFile(String resultFile) {
this.resultFile = resultFile;
}
/**

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

@@ -5,7 +5,7 @@ package com.tiesheng.web.pojos.vo;
*/
public class ProcessDetailVo {
private String title;
private String id;
private Integer total;
@@ -15,13 +15,17 @@ public class ProcessDetailVo {
private Integer process;
private String type;
private Integer status;
private String failFile;
private String resultFile;
private String error;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Integer getStatus() {
return status;
@@ -31,14 +35,6 @@ public class ProcessDetailVo {
this.status = status;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Integer getTotal() {
return total;
}
@@ -63,20 +59,12 @@ public class ProcessDetailVo {
this.failNum = failNum;
}
public String getType() {
return type;
public String getResultFile() {
return resultFile;
}
public void setType(String type) {
this.type = type;
}
public String getFailFile() {
return failFile;
}
public void setFailFile(String failFile) {
this.failFile = failFile;
public void setResultFile(String resultFile) {
this.resultFile = resultFile;
}
public Integer getProcess() {
@@ -87,11 +75,4 @@ public class ProcessDetailVo {
this.process = process;
}
public String getError() {
return error;
}
public void setError(String error) {
this.error = error;
}
}

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

@@ -92,7 +92,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
});
// 执行结束
coreLogProcess.setFailFile(consumer.getFailFile());
coreLogProcess.setResultFile(consumer.getResultFile());
coreLogProcess.setStatus(1);
coreLogProcessMapper.updateById(coreLogProcess);
});

2
springboot-web/src/main/java/com/tiesheng/web/service/imex/DefaultImexHandler.java
View File

@@ -38,7 +38,7 @@ public class DefaultImexHandler implements TsImportHandler<String>, TsExportHand
}
@Override
public String getFailFile() {
public String getResultFile() {
return "";
}
}

4
springboot-web/src/main/java/com/tiesheng/web/util/ProcessImportConsumer.java
View File

@@ -15,10 +15,10 @@ public interface ProcessImportConsumer<T> {
/**
* 获取失败的文件路径
* 获取导入结果文件
*
* @return
*/
String getFailFile();
String getResultFile();
}

5
springboot-web/src/main/resources/db/migration/tiesheng_init_log.sql
View File

@@ -73,6 +73,9 @@ CREATE TABLE `core_log_operation`
alter table core_log_process
modify params longtext null comment '异常说明';
change error params longtext null comment '异常说明';
alter table core_log_process
change fail_file result_file varchar(500) null comment '失败的文件';
SET FOREIGN_KEY_CHECKS = 1;

4
springboot-web/src/main/resources/mapper/CoreLogProcessMapper.xml
View File

@@ -14,13 +14,13 @@
<result column="fail_num" jdbcType="INTEGER" property="failNum" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="fail_file" jdbcType="VARCHAR" property="failFile" />
<result column="result_file" jdbcType="VARCHAR" property="resultFile" />
<result column="process" jdbcType="INTEGER" property="process" />
<result column="params" jdbcType="LONGVARCHAR" property="params" />
</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, error, `process`
`status`, result_file, `process`, params
</sql>
</mapper>