Compare commits

...

1 Commits
0.8.7 ... 0.8.8

Author SHA1 Message Date
2715557295@qq.com
c446ee8f75 publish 0.8.8 2023-03-24 09:39:04 +08:00
13 changed files with 38 additions and 42 deletions

20
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>0.8.7</version>
<version>0.8.8</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.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-encrypt</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-poi</artifactId>
<version>0.8.7</version>
<version>0.8.8</version>
</dependency>
<dependency>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -18,6 +18,7 @@ import com.tiesheng.message.pojos.MessageReqResp;
import com.tiesheng.message.service.TieshengMessageConfigurer;
import com.tiesheng.util.ServletKit;
import com.tiesheng.util.config.Ip2regionConfig;
import com.tiesheng.util.exception.ApiException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -51,40 +52,36 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
public CoreLogProcessMapper getCoreLogProcessMapper() {
return coreLogProcessMapper;
}
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// 操作日志
///////////////////////////////////////////////////////////////////////////
/**
* 添加空的过程 返回id 用于更新
*
* @param title 标题
* @param type 类型 import-导入sync-同步
* @param total 总数
*/
public String addProcess() {
public CoreLogProcess addProcess(String title, String type, Integer total) {
CoreLogProcess coreLogProcess = new CoreLogProcess();
coreLogProcess.setTitle(title);
coreLogProcess.setTotal(total);
coreLogProcess.setType(type);
coreLogProcessMapper.insert(coreLogProcess);
return coreLogProcess.getId();
return coreLogProcess;
}
/**
* 更新过程
*
* @param id 过程id
* @param title 过程标题/说明
* @param total 总数
* @param successNum 成功数
* @param failNum 失败数
* @param type 类型import-导出sync-同步)
* @param status 状态0-未完成1-完成)
* @param coreLogProcess 过程对象
*/
public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type, Integer status) {
CoreLogProcess coreLogProcess = new CoreLogProcess();
coreLogProcess.setId(id);
coreLogProcess.setTitle(title);
coreLogProcess.setTotal(total);
coreLogProcess.setSuccessNum(successNum);
coreLogProcess.setFailNum(failNum);
coreLogProcess.setType(type);
coreLogProcess.setStatus(status);
public void upProcess(CoreLogProcess coreLogProcess) {
if (coreLogProcess == null || coreLogProcess.getId().isEmpty()) {
throw new ApiException("更新过程id不能为空");
}
coreLogProcessMapper.updateById(coreLogProcess);
}

View File

@@ -33,12 +33,11 @@ CREATE TABLE `core_log_process` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '日志-过程' ROW_FORMAT = Dynamic;
ALTER TABLE core_log_process ADD status int(6) default 0 COMMENT '状态0-未完成1-已完成)';
-- ----------------------------
-- Records of core_log_process
-- ----------------------------
SET FOREIGN_KEY_CHECKS = 1;
ALTER TABLE core_log_process ADD status int(6) default 0 COMMENT '状态0-未完成1-已完成)';
commit;