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

publish 0.9.3

Browse Source
This commit is contained in:
曾文豪
2023-03-31 11:54:21 +08:00
parent c5f8508a9e
commit c04d45431c
31 changed files with 393 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -1,3 +1,8 @@
## 0.9.3
> 1，增加版本对比器，防止某些情况下版本对比失效；
>
## 0.8.3
### 调整

20
pom.xml
View File

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

12
springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java
View File

@@ -1,8 +1,8 @@
package com.tiesheng.demo.config;
import cn.hutool.core.collection.CollUtil;
import com.tiesheng.core.service.JobService;
import com.tiesheng.core.service.CoreConfigService;
import com.tiesheng.core.service.CoreJobService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -15,15 +15,17 @@ import javax.annotation.PostConstruct;
public class TestJobConfig {
@Autowired
JobService jobService;
CoreJobService coreJobService;
@Autowired
CoreConfigService coreConfigService;
@PostConstruct
public void init() {
jobService.refreshPoint("230328001", "demo", "辅导员统计", "辅导员责任班级，学生展示");
coreConfigService.refreshFunc("230328001", "demo", "辅导员统计", "辅导员责任班级，学生展示");
// 辅导员职位
jobService.refresh("class_fdy", "辅导员", "辅导员", 1, CollUtil.newArrayList("230328001"));
coreJobService.refresh("class_fdy", "辅导员", "辅导员", 1);
}

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.2</version>
<version>0.9.3</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.2</version>
<version>0.9.3</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.2</version>
<version>0.9.3</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.2</version>
<version>0.9.3</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.2</version>
<version>0.9.3</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.2</version>
<version>0.9.3</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.2</version>
<version>0.9.3</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.2</version>
<version>0.9.3</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.2</version>
<version>0.9.3</version>
</parent>
<artifactId>springboot-web</artifactId>

34
springboot-web/src/main/java/com/tiesheng/core/controller/ConfigController.java
View File

@@ -1,13 +1,16 @@
package com.tiesheng.core.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.tiesheng.annotation.token.TokenIgnore;
import com.tiesheng.core.pojos.dao.CoreConfigEnum;
import com.tiesheng.core.pojos.dao.CoreConfigFunc;
import com.tiesheng.core.pojos.dao.CoreConfigSystem;
import com.tiesheng.core.pojos.dto.PageDTO;
import com.tiesheng.core.pojos.dto.config.ConfigFuncDTO;
import com.tiesheng.core.pojos.dto.config.ConfigSystemDTO;
import com.tiesheng.core.pojos.dto.config.EnumTypeDTO;
import com.tiesheng.core.service.CoreConfigService;
@@ -16,6 +19,7 @@ import com.tiesheng.util.pojos.ApiResp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
@@ -95,4 +99,34 @@ public class ConfigController {
}
/**
* 功能点列表
*
* @return
*/
@GetMapping("/func/list")
public ApiResp<List<CoreConfigFunc>> funcList(Integer isUsed, PageDTO dto) {
QueryWrapper<CoreConfigFunc> queryWrapper = new QueryWrapper<CoreConfigFunc>().eq("is_deleted", 0);
if (isUsed != null) {
queryWrapper.eq("is_used", isUsed);
}
dto.likeColumns(queryWrapper, "name");
Page<CoreConfigFunc> page = dto.pageObj();
coreConfigService.getFuncMapper().selectPage(page, queryWrapper);
return ApiResp.respOK(page.getRecords(), page.getTotal());
}
/**
* 功能点更新
*
* @param dto
* @return
*/
@PostMapping("/func/update")
public ApiResp<String> funcUpdate(@Valid @RequestBody ConfigFuncDTO dto) {
CoreConfigFunc configFunc = BeanUtil.copyProperties(dto, CoreConfigFunc.class);
coreConfigService.getFuncMapper().updateById(configFunc);
return ApiResp.respOK("");
}
}

41
springboot-web/src/main/java/com/tiesheng/core/controller/JobController.java
View File

@@ -4,14 +4,13 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.tiesheng.core.pojos.dao.CoreJob;
import com.tiesheng.core.pojos.dao.CoreJobPoint;
import com.tiesheng.core.pojos.dto.IdDTO;
import com.tiesheng.core.pojos.dto.PageDTO;
import com.tiesheng.core.pojos.dto.job.JobUpdateDTO;
import com.tiesheng.core.pojos.dto.job.JobUpdateRxDTO;
import com.tiesheng.core.pojos.dto.job.JobUserAssignDTO;
import com.tiesheng.core.pojos.dto.job.JobUserOwner;
import com.tiesheng.core.service.JobService;
import com.tiesheng.core.service.CoreJobService;
import com.tiesheng.login.config.token.TsTokenConfig;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.pojos.ApiResp;
@@ -29,7 +28,7 @@ import java.util.List;
public class JobController {
@Autowired
JobService jobService;
CoreJobService coreJobService;
/**
@@ -41,7 +40,7 @@ public class JobController {
public ApiResp<List<CoreJob>> list(PageDTO dto) {
QueryWrapper<CoreJob> queryWrapper = new QueryWrapper<CoreJob>().eq("is_deleted", 0);
dto.likeColumns(queryWrapper, "name");
List<CoreJob> jobList = jobService.list(queryWrapper);
List<CoreJob> jobList = coreJobService.list(queryWrapper);
return ApiResp.respOK(jobList);
}
@@ -55,39 +54,25 @@ public class JobController {
public ApiResp<String> update(@Valid @RequestBody JobUpdateDTO dto) {
CoreJob job = BeanUtil.copyProperties(dto, CoreJob.class);
if (!StrUtil.isEmpty(job.getId())) {
CoreJob byId = jobService.getById(job.getId());
CoreJob byId = coreJobService.getById(job.getId());
if (byId != null && byId.getIsSystem() == 1) {
throw new ApiException("系统配置，无法编辑");
}
}
jobService.saveOrUpdate(job);
coreJobService.saveOrUpdate(job);
return ApiResp.respOK("");
}
/**
* 获取职位功能点
*
* @return
*/
@GetMapping("/point/list")
public ApiResp<List<CoreJobPoint>> pointList() {
List<CoreJobPoint> pointList = jobService.getJobPointMapper().selectList(new QueryWrapper<CoreJobPoint>()
.eq("is_deleted", 0)
);
return ApiResp.respOK(pointList);
}
/**
* 获取关系
*
* @param dto
* @return
*/
@GetMapping("/point/rx")
public ApiResp<List<String>> pointRx(@Valid IdDTO dto) {
List<String> list = jobService.getJobPointMapper().getJobRx(dto.getId());
@GetMapping("/func/rx")
public ApiResp<List<String>> funcRx(@Valid IdDTO dto) {
List<String> list = coreJobService.getBaseMapper().getJobFunc(dto.getId());
return ApiResp.respOK(list);
}
@@ -97,9 +82,9 @@ public class JobController {
*
* @return
*/
@PostMapping("/point/rx")
@PostMapping("/func/rx")
public ApiResp<String> updateJobRx(@Valid @RequestBody JobUpdateRxDTO dto) {
jobService.updateJobRx(dto.getJobId(), StrUtil.split(dto.getPoints(), ","));
coreJobService.updateJobRx(dto.getJobId(), StrUtil.split(dto.getPoints(), ","));
return ApiResp.respOK("");
}
@@ -111,7 +96,7 @@ public class JobController {
*/
@PostMapping("/user/assign")
public ApiResp<String> userAssign(@Valid @RequestBody JobUserAssignDTO dto) {
jobService.userAssign(dto.getUserId(), dto.getJobId());
coreJobService.userAssign(dto.getUserId(), dto.getJobId());
return ApiResp.respOK("");
}
@@ -123,9 +108,9 @@ public class JobController {
*/
@GetMapping("/user/owner")
public ApiResp<List<JobUserOwner>> userOwner() {
List<JobUserOwner> coreJobUsers = jobService.getJobUserMapper().list(TsTokenConfig.get().getId());
List<JobUserOwner> coreJobUsers = coreJobService.getJobUserMapper().list(TsTokenConfig.get().getId());
coreJobUsers.forEach(it -> {
List<String> list = jobService.getJobPointMapper().getJobRx(it.getJobId());
List<String> list = coreJobService.getBaseMapper().getJobFunc(it.getJobId());
it.setPoints(list);
});
return ApiResp.respOK(coreJobUsers);

11
springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigFuncMapper.java Normal file
View File

@@ -0,0 +1,11 @@
package com.tiesheng.core.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CoreConfigFunc;
import com.tiesheng.util.pojos.IdName;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface CoreConfigFuncMapper extends BaseMapper<CoreConfigFunc> {
}

31
springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobMapper.java
View File

@@ -2,6 +2,35 @@ package com.tiesheng.core.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CoreJob;
import com.tiesheng.util.pojos.IdName;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface CoreJobMapper extends BaseMapper<CoreJob> {
}
/**
* 清除职位的关联关系
*
* @param jobId
*/
void clearJobFunc(@Param("jobId") String jobId);
/**
* 更新关联关系
*
* @param pointList
*/
void updateJobFunc(@Param("list") List<IdName> pointList);
/**
* 获取关联的func
*
* @param jobId
* @return
*/
List<String> getJobFunc(@Param("jobId") String jobId);
}

37
springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobPointMapper.java
View File

@@ -1,37 +0,0 @@
package com.tiesheng.core.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.core.pojos.dao.CoreJobPoint;
import com.tiesheng.util.pojos.IdName;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface CoreJobPointMapper extends BaseMapper<CoreJobPoint> {
/**
* 清除职位的关联关系
*
* @param jobId
*/
void clearJobRx(@Param("jobId") String jobId);
/**
* 更新关联关系
*
* @param pointList
*/
void updateJobRx(@Param("list") List<IdName> pointList);
/**
* 获取关联的point
*
* @param jobId
* @return
*/
List<String> getJobRx(@Param("jobId") String jobId);
}

32
springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobPoint.java → springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigFunc.java
View File

@@ -8,10 +8,10 @@ import com.tiesheng.core.pojos.DaoBase;
import java.util.Date;
/**
* 职位-功能点
*/
@TableName(value = "core_job_point")
public class CoreJobPoint extends DaoBase {
* 职位-功能点
*/
@TableName(value = "core_config_func")
public class CoreConfigFunc extends DaoBase {
/**
* 业务
*/
@@ -30,6 +30,12 @@ public class CoreJobPoint extends DaoBase {
@TableField(value = "remark")
private String remark;
/**
* 是否启用
*/
@TableField(value = "is_used")
private Integer isUsed;
/**
* 获取业务
*
@@ -83,4 +89,22 @@ public class CoreJobPoint extends DaoBase {
public void setRemark(String remark) {
this.remark = remark;
}
/**
* 获取是否启用
*
* @return is_used - 是否启用
*/
public Integer getIsUsed() {
return isUsed;
}
/**
* 设置是否启用
*
* @param isUsed 是否启用
*/
public void setIsUsed(Integer isUsed) {
this.isUsed = isUsed;
}
}

54
springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/ConfigFuncDTO.java Normal file
View File

@@ -0,0 +1,54 @@
package com.tiesheng.core.pojos.dto.config;
public class ConfigFuncDTO {
private String id;
private String service;
private String name;
private String remark;
private Integer isUsed;
///////////////////////////////////////////////////////////////////////////
// setter\getter
///////////////////////////////////////////////////////////////////////////
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getService() {
return service;
}
public void setService(String service) {
this.service = service;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getIsUsed() {
return isUsed;
}
public void setIsUsed(Integer isUsed) {
this.isUsed = isUsed;
}
}

31
springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java
View File

@@ -1,7 +1,9 @@
package com.tiesheng.core.service;
import com.tiesheng.core.mapper.CoreConfigEnumMapper;
import com.tiesheng.core.mapper.CoreConfigFuncMapper;
import com.tiesheng.core.mapper.CoreConfigSystemMapper;
import com.tiesheng.core.pojos.dao.CoreConfigFunc;
import com.tiesheng.core.pojos.dao.CoreConfigSystem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -14,8 +16,37 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
@Autowired
CoreConfigEnumMapper coreConfigEnumMapper;
@Autowired
CoreConfigFuncMapper coreConfigFuncMapper;
public CoreConfigEnumMapper getEnumMapper() {
return coreConfigEnumMapper;
}
public CoreConfigFuncMapper getFuncMapper() {
return coreConfigFuncMapper;
}
/**
* 刷新功能点
*
* @param id
* @param service
* @param name
* @param remark
*/
public void refreshFunc(String id, String service, String name, String remark) {
CoreConfigFunc jobPoint = new CoreConfigFunc();
jobPoint.setId(id);
jobPoint.setService(service);
jobPoint.setName(name);
jobPoint.setRemark(remark);
try {
coreConfigFuncMapper.insert(jobPoint);
} catch (Exception e) {
coreConfigFuncMapper.updateById(jobPoint);
}
}
}

42
springboot-web/src/main/java/com/tiesheng/core/service/JobService.java → springboot-web/src/main/java/com/tiesheng/core/service/CoreJobService.java
View File

@@ -5,10 +5,8 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.tiesheng.core.mapper.CoreJobMapper;
import com.tiesheng.core.mapper.CoreJobPointMapper;
import com.tiesheng.core.mapper.CoreJobUserMapper;
import com.tiesheng.core.pojos.dao.CoreJob;
import com.tiesheng.core.pojos.dao.CoreJobPoint;
import com.tiesheng.core.pojos.dao.CoreJobUser;
import com.tiesheng.util.pojos.IdName;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,17 +19,11 @@ import java.util.List;
* @author hao
*/
@Service
public class JobService extends TsServiceBase<CoreJobMapper, CoreJob> {
public class CoreJobService extends TsServiceBase<CoreJobMapper, CoreJob> {
@Autowired
CoreJobPointMapper coreJobPointMapper;
@Autowired
CoreJobUserMapper coreJobUserMapper;
public CoreJobPointMapper getJobPointMapper() {
return coreJobPointMapper;
}
public CoreJobUserMapper getJobUserMapper() {
return coreJobUserMapper;
}
@@ -43,41 +35,15 @@ public class JobService extends TsServiceBase<CoreJobMapper, CoreJob> {
* @param remark
* @param isSystem
*/
public void refresh(String id, String name, String remark, Integer isSystem, List<String> points) {
public void refresh(String id, String name, String remark, Integer isSystem) {
CoreJob coreJob = new CoreJob();
coreJob.setId(id);
coreJob.setName(name);
coreJob.setRemark(remark);
coreJob.setIsSystem(isSystem);
saveOrUpdate(coreJob);
// 增加关联关系
updateJobRx(coreJob.getId(), points);
}
/**
* 刷新功能点
*
* @param id
* @param service
* @param name
* @param remark
*/
public void refreshPoint(String id, String service, String name, String remark) {
CoreJobPoint jobPoint = new CoreJobPoint();
jobPoint.setId(id);
jobPoint.setService(service);
jobPoint.setName(name);
jobPoint.setRemark(remark);
try {
coreJobPointMapper.insert(jobPoint);
} catch (Exception e) {
coreJobPointMapper.updateById(jobPoint);
}
}
/**
* 更新关联关系
*
@@ -96,9 +62,9 @@ public class JobService extends TsServiceBase<CoreJobMapper, CoreJob> {
if (StrUtil.isEmpty(jobId)) {
return;
}
coreJobPointMapper.clearJobRx(jobId);
getBaseMapper().clearJobFunc(jobId);
if (CollUtil.isNotEmpty(nameList)) {
coreJobPointMapper.updateJobRx(nameList);
getBaseMapper().updateJobFunc(nameList);
}
}

22
springboot-web/src/main/resources/db/migration/core_log_login.sql
View File

@@ -1,22 +0,0 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for core_log_login
-- ----------------------------
CREATE TABLE `core_log_login`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT '0',
`user_id` varchar(50) DEFAULT NULL COMMENT '用户id',
`user_name` varchar(255) DEFAULT NULL COMMENT '用户姓名',
`platform` varchar(50) DEFAULT NULL COMMENT '登录方式',
`ip` varchar(100) DEFAULT NULL COMMENT 'ip',
`address` varchar(255) DEFAULT NULL COMMENT 'ip地址',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='日志-登录';
SET FOREIGN_KEY_CHECKS = 1;

23
springboot-web/src/main/resources/db/migration/core_log_message.sql
View File

@@ -1,23 +0,0 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for core_log_message
-- ----------------------------
CREATE TABLE `core_log_message`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT '0',
`type` varchar(50) DEFAULT NULL COMMENT '类型',
`target` varchar(255) DEFAULT NULL COMMENT '发送对象',
`content` text COMMENT '发送内容',
`resp_body` text COMMENT '返回结果',
`result` int(6) NOT NULL DEFAULT '0' COMMENT '结果',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
ROW_FORMAT = DYNAMIC COMMENT ='日志-消息';
SET FOREIGN_KEY_CHECKS = 1;

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

@@ -1,43 +0,0 @@
/*
Navicat Premium Data Transfer
Source Server : 47.96.30.85
Source Server Type : MySQL
Source Server Version : 50730
Source Host : localhost:3306
Source Schema : com_tiesheng_web
Target Server Type : MySQL
Target Server Version : 50730
File Encoding : 65001
Date: 22/03/2023 10:39:06
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for core_log_process
-- ----------------------------
CREATE TABLE `core_log_process` (
`id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT 0,
`title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
`total` int(11) NOT NULL DEFAULT 0 COMMENT '总数',
`success_num` int(11) NOT NULL DEFAULT 0 COMMENT '成功数',
`fail_num` int(11) NOT NULL DEFAULT 0 COMMENT '失败数',
`type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'import' COMMENT '类型（import-导入，sync-同步）',
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;

36
springboot-web/src/main/resources/db/migration/tiesheng_web_base.sql → springboot-web/src/main/resources/db/migration/tiesheng_init_config.sql
View File

@@ -1,7 +1,6 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
CREATE TABLE `core_config_enum`
(
`id` varchar(50) NOT NULL,
@@ -16,20 +15,6 @@ CREATE TABLE `core_config_enum`
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='配置-枚举';
CREATE TABLE `core_log_operation`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT '0',
`user_id` varchar(50) DEFAULT NULL COMMENT '用户id',
`user_name` varchar(255) DEFAULT NULL COMMENT '用户名称',
`title` varchar(255) DEFAULT NULL COMMENT '标题',
`subject` varchar(500) DEFAULT NULL COMMENT '小标题',
`params` text COMMENT '其他参数',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='日志-操作';
CREATE TABLE `core_config_system`
(
@@ -48,6 +33,27 @@ CREATE TABLE `core_config_system`
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='配置-系统';
-- ----------------------------
-- Table structure for core_config_func
-- ----------------------------
CREATE TABLE `core_config_func`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT '0',
`service` varchar(20) DEFAULT NULL COMMENT '业务',
`name` varchar(255) DEFAULT NULL COMMENT '名称',
`remark` varchar(500) DEFAULT NULL COMMENT '其他说明',
`is_used` int(6) NOT NULL DEFAULT '0' COMMENT '是否启用',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='职位-功能点';
-- ----------------------------
-- Table for data
-- ----------------------------
INSERT INTO `core_config_system`(`id`, `create_time`, `update_time`, `is_deleted`, `config_key`, `config_val`,
`config_type`, `remark`, `extra`, `read_only`)
VALUES ('manager_web_copyright', '2022-02-23 16:52:48', '2022-02-23 16:52:49', 0, 'manager_web_copyright',

23
springboot-web/src/main/resources/db/migration/core_job.sql → springboot-web/src/main/resources/db/migration/tiesheng_init_job.sql
View File

@@ -18,25 +18,9 @@ CREATE TABLE `core_job`
DEFAULT CHARSET = utf8mb4 COMMENT ='职位';
-- ----------------------------
-- Table structure for core_job_point
-- Table structure for core_job_func
-- ----------------------------
CREATE TABLE `core_job_point`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT '0',
`service` varchar(20) DEFAULT NULL COMMENT '业务',
`name` varchar(255) DEFAULT NULL COMMENT '名称',
`remark` varchar(500) DEFAULT NULL COMMENT '其他说明',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='职位-功能点';
-- ----------------------------
-- Table structure for core_job_rx
-- ----------------------------
CREATE TABLE `core_job_rx`
CREATE TABLE `core_job_func`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
@@ -79,4 +63,7 @@ alter table core_job_user
alter table core_job_user
add ext_text text null comment '扩展文本';
alter table core_job_func
change point_id func_id varchar(50) DEFAULT NULL COMMENT ' 功能点id';
SET FOREIGN_KEY_CHECKS = 1;

81
springboot-web/src/main/resources/db/migration/tiesheng_init_log.sql Normal file
View File

@@ -0,0 +1,81 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for core_log_login
-- ----------------------------
CREATE TABLE `core_log_login`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT '0',
`user_id` varchar(50) DEFAULT NULL COMMENT '用户id',
`user_name` varchar(255) DEFAULT NULL COMMENT '用户姓名',
`platform` varchar(50) DEFAULT NULL COMMENT '登录方式',
`ip` varchar(100) DEFAULT NULL COMMENT 'ip',
`address` varchar(255) DEFAULT NULL COMMENT 'ip地址',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='日志-登录';
-- ----------------------------
-- Table structure for core_log_message
-- ----------------------------
CREATE TABLE `core_log_message`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT '0',
`type` varchar(50) DEFAULT NULL COMMENT '类型',
`target` varchar(255) DEFAULT NULL COMMENT '发送对象',
`content` text COMMENT '发送内容',
`resp_body` text COMMENT '返回结果',
`result` int(6) NOT NULL DEFAULT '0' COMMENT '结果',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
ROW_FORMAT = DYNAMIC COMMENT ='日志-消息';
-- ----------------------------
-- Table structure for core_log_process
-- ----------------------------
CREATE TABLE `core_log_process`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT 0,
`title` varchar(255) NULL DEFAULT NULL COMMENT '标题',
`total` int(11) NOT NULL DEFAULT 0 COMMENT '总数',
`success_num` int(11) NOT NULL DEFAULT 0 COMMENT '成功数',
`fail_num` int(11) NOT NULL DEFAULT 0 COMMENT '失败数',
`type` varchar(50) NOT NULL DEFAULT 'import' COMMENT '类型（import-导入，sync-同步）',
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-已完成）';
CREATE TABLE `core_log_operation`
(
`id` varchar(50) NOT NULL,
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`is_deleted` int(6) NOT NULL DEFAULT '0',
`user_id` varchar(50) DEFAULT NULL COMMENT '用户id',
`user_name` varchar(255) DEFAULT NULL COMMENT '用户名称',
`title` varchar(255) DEFAULT NULL COMMENT '标题',
`subject` varchar(500) DEFAULT NULL COMMENT '小标题',
`params` text COMMENT '其他参数',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='日志-操作';
SET FOREIGN_KEY_CHECKS = 1;

21
springboot-web/src/main/resources/mapper/CoreConfigFuncMapper.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.tiesheng.core.mapper.CoreConfigFuncMapper">
<resultMap id="BaseResultMap" type="com.tiesheng.core.pojos.dao.CoreConfigFunc">
<!--@mbg.generated-->
<!--@Table core_config_func-->
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="is_deleted" jdbcType="INTEGER" property="isDeleted"/>
<result column="service" jdbcType="VARCHAR" property="service"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="is_used" jdbcType="INTEGER" property="isUsed"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, create_time, update_time, is_deleted, service, `name`, remark,is_used
</sql>
</mapper>

29
springboot-web/src/main/resources/mapper/CoreJobMapper.xml
View File

@@ -16,4 +16,31 @@
<!--@mbg.generated-->
id, create_time, update_time, is_deleted, `name`, remark, is_system
</sql>
</mapper>
<delete id="clearJobFunc">
delete from core_job_func where job_id=#{jobId}
</delete>
<update id="updateJobFunc">
insert into core_job_func(
id, create_time, update_time, is_deleted, job_id, func_id
) VALUES
<foreach collection="list" index="index" item="as" separator=",">
(#{as.id},
now(),
now(),
0,
#{as.name},
#{as.extra}
)
</foreach>
</update>
<select id="getJobFunc" resultType="java.lang.String">
select cjf.func_id from core_job_func cjf
left join core_config_func ccf on ccf.id=cjf.func_id
where cjf.job_id=#{jobId} and ccf.is_used=1
</select>
</mapper>

44
springboot-web/src/main/resources/mapper/CoreJobPointMapper.xml
View File

@@ -1,44 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.tiesheng.core.mapper.CoreJobPointMapper">
<resultMap id="BaseResultMap" type="com.tiesheng.core.pojos.dao.CoreJobPoint">
<!--@mbg.generated-->
<!--@Table core_job_point-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="is_deleted" jdbcType="INTEGER" property="isDeleted" />
<result column="service" jdbcType="VARCHAR" property="service" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, create_time, update_time, is_deleted, service, `name`, remark
</sql>
<delete id="clearJobRx">
delete from core_job_rx where job_id=#{jobId}
</delete>
<update id="updateJobRx">
insert into core_job_rx(
id, create_time, update_time, is_deleted, job_id, point_id
) VALUES
<foreach collection="list" index="index" item="as" separator=",">
(#{as.id},
now(),
now(),
0,
#{as.name},
#{as.extra}
)
</foreach>
</update>
<select id="getJobRx" resultType="java.lang.String">
select point_id from core_job_rx where job_id=#{jobId}
</select>
</mapper>