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

publish 0.8.7

Browse Source
This commit is contained in:
2715557295@qq.com
2023-03-22 16:52:51 +08:00
parent 020d1d99e1
commit d63b6ab094
16 changed files with 64 additions and 25 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> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>springboot-parent</name> <name>springboot-parent</name>
<description>杭州铁晟科技有限公司基础依赖</description> <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-database</artifactId> <artifactId>springboot-database</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId> <artifactId>springboot-login</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId> <artifactId>springboot-web</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId> <artifactId>springboot-util</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId> <artifactId>springboot-platform</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId> <artifactId>springboot-message</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-encrypt</artifactId> <artifactId>springboot-encrypt</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId> <artifactId>springboot-annotation</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-poi</artifactId> <artifactId>springboot-poi</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</dependency> </dependency>
<dependency> <dependency>

2
springboot-ademo/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-ademo</artifactId> <artifactId>springboot-ademo</artifactId>

2
springboot-annotation/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-annotation</artifactId> <artifactId>springboot-annotation</artifactId>

2
springboot-database/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-database</artifactId> <artifactId>springboot-database</artifactId>

2
springboot-encrypt/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-encrypt</artifactId> <artifactId>springboot-encrypt</artifactId>

2
springboot-login/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-login</artifactId> <artifactId>springboot-login</artifactId>

2
springboot-message/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-message</artifactId> <artifactId>springboot-message</artifactId>

2
springboot-platform/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-platform</artifactId> <artifactId>springboot-platform</artifactId>

2
springboot-poi/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-poi</artifactId> <artifactId>springboot-poi</artifactId>

2
springboot-util/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.tiesheng.springboot-parent</groupId> <groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId> <artifactId>springboot-parent</artifactId>
<version>0.8.6</version> <version>0.8.7</version>
</parent> </parent>
<artifactId>springboot-util</artifactId> <artifactId>springboot-util</artifactId>

2
springboot-web/pom.xml
View File

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

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

@@ -8,8 +8,8 @@ import com.tiesheng.core.pojos.DaoBase;
import java.util.Date; import java.util.Date;
/** /**
* 日志-过程 * 日志-过程
*/ */
@TableName(value = "core_log_process") @TableName(value = "core_log_process")
public class CoreLogProcess extends DaoBase { public class CoreLogProcess extends DaoBase {
/** /**
@@ -42,6 +42,12 @@ public class CoreLogProcess extends DaoBase {
@TableField(value = "`type`") @TableField(value = "`type`")
private String type; private String type;
/**
* 状态(0-未完成，1-完成)
*/
@TableField(value = "`status`")
private Integer status;
/** /**
* 获取标题 * 获取标题
* *
@@ -131,4 +137,22 @@ public class CoreLogProcess extends DaoBase {
public void setType(String type) { public void setType(String type) {
this.type = type; this.type = type;
} }
/**
* 获取状态(0-未完成，1-完成)
*
* @return status - 状态(0-未完成，1-完成)
*/
public Integer getStatus() {
return status;
}
/**
* 设置状态(0-未完成，1-完成)
*
* @param status 状态(0-未完成，1-完成)
*/
public void setStatus(Integer status) {
this.status = status;
}
} }

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

@@ -15,6 +15,16 @@ public class ProcessDetailVo {
private String type; private String type;
private Integer status;
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getTitle() { public String getTitle() {
return title; return title;
} }

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

@@ -74,8 +74,9 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
* @param successNum 成功数 * @param successNum 成功数
* @param failNum 失败数 * @param failNum 失败数
* @param type 类型（import-导出，sync-同步） * @param type 类型（import-导出，sync-同步）
* @param status 状态（0-未完成，1-完成）
*/ */
public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type) { public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type, Integer status) {
CoreLogProcess coreLogProcess = new CoreLogProcess(); CoreLogProcess coreLogProcess = new CoreLogProcess();
coreLogProcess.setId(id); coreLogProcess.setId(id);
coreLogProcess.setTitle(title); coreLogProcess.setTitle(title);
@@ -83,6 +84,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
coreLogProcess.setSuccessNum(successNum); coreLogProcess.setSuccessNum(successNum);
coreLogProcess.setFailNum(failNum); coreLogProcess.setFailNum(failNum);
coreLogProcess.setType(type); coreLogProcess.setType(type);
coreLogProcess.setStatus(status);
coreLogProcessMapper.updateById(coreLogProcess); coreLogProcessMapper.updateById(coreLogProcess);
} }
@@ -97,7 +99,6 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
} }
/** /**
* 添加操作日志 * 添加操作日志
*/ */

2
springboot-web/src/main/resources/db/migration/core_log_process.sql
View File

@@ -33,6 +33,8 @@ CREATE TABLE `core_log_process` (
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '日志-过程' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '日志-过程' ROW_FORMAT = Dynamic;
alter table core_log_process add 'status' int(6) not null default 0 comment '状态（0-未完成,1-完成）';
-- ---------------------------- -- ----------------------------
-- Records of core_log_process -- Records of core_log_process
-- ---------------------------- -- ----------------------------

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

@@ -13,9 +13,11 @@
<result column="success_num" jdbcType="INTEGER" property="successNum" /> <result column="success_num" jdbcType="INTEGER" property="successNum" />
<result column="fail_num" jdbcType="INTEGER" property="failNum" /> <result column="fail_num" jdbcType="INTEGER" property="failNum" />
<result column="type" jdbcType="VARCHAR" property="type" /> <result column="type" jdbcType="VARCHAR" property="type" />
<result column="status" jdbcType="INTEGER" property="status" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type` id, create_time, update_time, is_deleted, title, total, success_num, fail_num, `type`,
`status`
</sql> </sql>
</mapper> </mapper>