diff --git a/CHANGELOG.md b/CHANGELOG.md index 2257192..08073c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.9.3 + +> 1，增加版本对比器，防止某些情况下版本对比失效； +> + ## 0.8.3 ### 调整 diff --git a/pom.xml b/pom.xml index 49ab9e4..92becf8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -57,55 +57,55 @@ com.tiesheng.springboot-parent springboot-database - 0.9.2 + 0.9.3 com.tiesheng.springboot-parent springboot-login - 0.9.2 + 0.9.3 com.tiesheng.springboot-parent springboot-web - 0.9.2 + 0.9.3 com.tiesheng.springboot-parent springboot-util - 0.9.2 + 0.9.3 com.tiesheng.springboot-parent springboot-platform - 0.9.2 + 0.9.3 com.tiesheng.springboot-parent springboot-message - 0.9.2 + 0.9.3 com.tiesheng.springboot-parent springboot-encrypt - 0.9.2 + 0.9.3 com.tiesheng.springboot-parent springboot-annotation - 0.9.2 + 0.9.3 com.tiesheng.springboot-parent springboot-poi - 0.9.2 + 0.9.3 diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 719414e..d369ff9 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-ademo diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java b/springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java index f6b84f0..605a5ff 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/config/TestJobConfig.java @@ -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); } diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index 373f778..cab61b0 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-annotation diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index 73004e4..8aa71c6 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-database diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml index 398613e..65ee94a 100644 --- a/springboot-encrypt/pom.xml +++ b/springboot-encrypt/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-encrypt diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index 766c512..c7d745b 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-login diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index 5ae6ecc..69d4cb0 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index 70527e9..2b2407f 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-platform diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml index e6aae5b..46ed76b 100644 --- a/springboot-poi/pom.xml +++ b/springboot-poi/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-poi diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index b7ee4a3..4812354 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-util diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index 3c43cb3..712bb77 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 0.9.2 + 0.9.3 springboot-web diff --git a/springboot-web/src/main/java/com/tiesheng/core/controller/ConfigController.java b/springboot-web/src/main/java/com/tiesheng/core/controller/ConfigController.java index b09fbbf..5bc8fd0 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/controller/ConfigController.java +++ b/springboot-web/src/main/java/com/tiesheng/core/controller/ConfigController.java @@ -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> funcList(Integer isUsed, PageDTO dto) { + QueryWrapper queryWrapper = new QueryWrapper().eq("is_deleted", 0); + if (isUsed != null) { + queryWrapper.eq("is_used", isUsed); + } + dto.likeColumns(queryWrapper, "name"); + Page page = dto.pageObj(); + coreConfigService.getFuncMapper().selectPage(page, queryWrapper); + return ApiResp.respOK(page.getRecords(), page.getTotal()); + } + + /** + * 功能点更新 + * + * @param dto + * @return + */ + @PostMapping("/func/update") + public ApiResp funcUpdate(@Valid @RequestBody ConfigFuncDTO dto) { + CoreConfigFunc configFunc = BeanUtil.copyProperties(dto, CoreConfigFunc.class); + coreConfigService.getFuncMapper().updateById(configFunc); + return ApiResp.respOK(""); + } + } diff --git a/springboot-web/src/main/java/com/tiesheng/core/controller/JobController.java b/springboot-web/src/main/java/com/tiesheng/core/controller/JobController.java index ff7ee7f..017e96f 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/controller/JobController.java +++ b/springboot-web/src/main/java/com/tiesheng/core/controller/JobController.java @@ -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(PageDTO dto) { QueryWrapper queryWrapper = new QueryWrapper().eq("is_deleted", 0); dto.likeColumns(queryWrapper, "name"); - List jobList = jobService.list(queryWrapper); + List jobList = coreJobService.list(queryWrapper); return ApiResp.respOK(jobList); } @@ -55,39 +54,25 @@ public class JobController { public ApiResp 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> pointList() { - List pointList = jobService.getJobPointMapper().selectList(new QueryWrapper() - .eq("is_deleted", 0) - ); - return ApiResp.respOK(pointList); - } - - /** * 获取关系 * * @param dto * @return */ - @GetMapping("/point/rx") - public ApiResp> pointRx(@Valid IdDTO dto) { - List list = jobService.getJobPointMapper().getJobRx(dto.getId()); + @GetMapping("/func/rx") + public ApiResp> funcRx(@Valid IdDTO dto) { + List 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 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 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> userOwner() { - List coreJobUsers = jobService.getJobUserMapper().list(TsTokenConfig.get().getId()); + List coreJobUsers = coreJobService.getJobUserMapper().list(TsTokenConfig.get().getId()); coreJobUsers.forEach(it -> { - List list = jobService.getJobPointMapper().getJobRx(it.getJobId()); + List list = coreJobService.getBaseMapper().getJobFunc(it.getJobId()); it.setPoints(list); }); return ApiResp.respOK(coreJobUsers); diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigFuncMapper.java b/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigFuncMapper.java new file mode 100644 index 0000000..5a5ca75 --- /dev/null +++ b/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreConfigFuncMapper.java @@ -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 { +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobMapper.java b/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobMapper.java index 49cba78..71e7fcf 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobMapper.java @@ -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 { -} \ No newline at end of file + + /** + * 清除职位的关联关系 + * + * @param jobId + */ + void clearJobFunc(@Param("jobId") String jobId); + + + /** + * 更新关联关系 + * + * @param pointList + */ + void updateJobFunc(@Param("list") List pointList); + + + /** + * 获取关联的func + * + * @param jobId + * @return + */ + List getJobFunc(@Param("jobId") String jobId); + +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobPointMapper.java b/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobPointMapper.java deleted file mode 100644 index 4ec7dd1..0000000 --- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobPointMapper.java +++ /dev/null @@ -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 { - - - /** - * 清除职位的关联关系 - * - * @param jobId - */ - void clearJobRx(@Param("jobId") String jobId); - - - /** - * 更新关联关系 - * - * @param pointList - */ - void updateJobRx(@Param("list") List pointList); - - - /** - * 获取关联的point - * - * @param jobId - * @return - */ - List getJobRx(@Param("jobId") String jobId); - -} diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobPoint.java b/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigFunc.java similarity index 73% rename from springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobPoint.java rename to springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigFunc.java index ddf1fad..3aa5739 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobPoint.java +++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigFunc.java @@ -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; + } } \ No newline at end of file diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/ConfigFuncDTO.java b/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/ConfigFuncDTO.java new file mode 100644 index 0000000..6ac6bfb --- /dev/null +++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/dto/config/ConfigFuncDTO.java @@ -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; + } +} diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java b/springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java index 9ff91d3..be1945e 100644 --- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java +++ b/springboot-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java @@ -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 { +public class CoreJobService extends TsServiceBase { - @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 { * @param remark * @param isSystem */ - public void refresh(String id, String name, String remark, Integer isSystem, List 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 { if (StrUtil.isEmpty(jobId)) { return; } - coreJobPointMapper.clearJobRx(jobId); + getBaseMapper().clearJobFunc(jobId); if (CollUtil.isNotEmpty(nameList)) { - coreJobPointMapper.updateJobRx(nameList); + getBaseMapper().updateJobFunc(nameList); } } diff --git a/springboot-web/src/main/resources/db/migration/core_log_login.sql b/springboot-web/src/main/resources/db/migration/core_log_login.sql deleted file mode 100644 index ccf8bfe..0000000 --- a/springboot-web/src/main/resources/db/migration/core_log_login.sql +++ /dev/null @@ -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; diff --git a/springboot-web/src/main/resources/db/migration/core_log_message.sql b/springboot-web/src/main/resources/db/migration/core_log_message.sql deleted file mode 100644 index 4d81749..0000000 --- a/springboot-web/src/main/resources/db/migration/core_log_message.sql +++ /dev/null @@ -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; diff --git a/springboot-web/src/main/resources/db/migration/core_log_process.sql b/springboot-web/src/main/resources/db/migration/core_log_process.sql deleted file mode 100644 index e59400d..0000000 --- a/springboot-web/src/main/resources/db/migration/core_log_process.sql +++ /dev/null @@ -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; - - diff --git a/springboot-web/src/main/resources/db/migration/tiesheng_web_base.sql b/springboot-web/src/main/resources/db/migration/tiesheng_init_config.sql similarity index 82% rename from springboot-web/src/main/resources/db/migration/tiesheng_web_base.sql rename to springboot-web/src/main/resources/db/migration/tiesheng_init_config.sql index bf8a312..8277280 100644 --- a/springboot-web/src/main/resources/db/migration/tiesheng_web_base.sql +++ b/springboot-web/src/main/resources/db/migration/tiesheng_init_config.sql @@ -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', diff --git a/springboot-web/src/main/resources/db/migration/core_job.sql b/springboot-web/src/main/resources/db/migration/tiesheng_init_job.sql similarity index 75% rename from springboot-web/src/main/resources/db/migration/core_job.sql rename to springboot-web/src/main/resources/db/migration/tiesheng_init_job.sql index 632d64a..3132b2b 100644 --- a/springboot-web/src/main/resources/db/migration/core_job.sql +++ b/springboot-web/src/main/resources/db/migration/tiesheng_init_job.sql @@ -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; diff --git a/springboot-web/src/main/resources/db/migration/tiesheng_init_log.sql b/springboot-web/src/main/resources/db/migration/tiesheng_init_log.sql new file mode 100644 index 0000000..69e0b00 --- /dev/null +++ b/springboot-web/src/main/resources/db/migration/tiesheng_init_log.sql @@ -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; diff --git a/springboot-web/src/main/resources/mapper/CoreConfigFuncMapper.xml b/springboot-web/src/main/resources/mapper/CoreConfigFuncMapper.xml new file mode 100644 index 0000000..128811d --- /dev/null +++ b/springboot-web/src/main/resources/mapper/CoreConfigFuncMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + id, create_time, update_time, is_deleted, service, `name`, remark,is_used + + + diff --git a/springboot-web/src/main/resources/mapper/CoreJobMapper.xml b/springboot-web/src/main/resources/mapper/CoreJobMapper.xml index e3e0352..671e0d3 100644 --- a/springboot-web/src/main/resources/mapper/CoreJobMapper.xml +++ b/springboot-web/src/main/resources/mapper/CoreJobMapper.xml @@ -16,4 +16,31 @@ id, create_time, update_time, is_deleted, `name`, remark, is_system - \ No newline at end of file + + + delete from core_job_func where job_id=#{jobId} + + + + insert into core_job_func( + id, create_time, update_time, is_deleted, job_id, func_id + ) VALUES + + (#{as.id}, + now(), + now(), + 0, + #{as.name}, + #{as.extra} + ) + + + + + + + diff --git a/springboot-web/src/main/resources/mapper/CoreJobPointMapper.xml b/springboot-web/src/main/resources/mapper/CoreJobPointMapper.xml deleted file mode 100644 index 6c6d12d..0000000 --- a/springboot-web/src/main/resources/mapper/CoreJobPointMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - id, create_time, update_time, is_deleted, service, `name`, remark - - - - delete from core_job_rx where job_id=#{jobId} - - - - insert into core_job_rx( - id, create_time, update_time, is_deleted, job_id, point_id - ) VALUES - - (#{as.id}, - now(), - now(), - 0, - #{as.name}, - #{as.extra} - ) - - - - - - -