From 87ca20ee9f33ea1409766306f0d1d5ce698e45be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com> Date: Tue, 3 Jan 2023 16:12:46 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/config/ConfigController.java | 24 ++++ .../core/mapper/CoreConfigEnumMapper.java | 7 ++ .../core/pojos/dao/CoreConfigEnum.java | 110 ++++++++++++++++++ .../core/pojos/dto/config/EnumTypeDTO.java | 14 +++ .../core/service/CoreConfigService.java | 7 ++ .../resources/db/migration/tiesheng_base.sql | 18 ++- .../resources/mapper/CoreConfigEnumMapper.xml | 20 ++++ 7 files changed, 197 insertions(+), 3 deletions(-) create mode 100644 tiesheng-web/src/main/java/com/tiesheng/core/mapper/CoreConfigEnumMapper.java create mode 100644 tiesheng-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigEnum.java create mode 100644 tiesheng-web/src/main/java/com/tiesheng/core/pojos/dto/config/EnumTypeDTO.java create mode 100644 tiesheng-web/src/main/resources/mapper/CoreConfigEnumMapper.xml diff --git a/tiesheng-web/src/main/java/com/tiesheng/core/controller/config/ConfigController.java b/tiesheng-web/src/main/java/com/tiesheng/core/controller/config/ConfigController.java index 3a4a10d..a663d9d 100644 --- a/tiesheng-web/src/main/java/com/tiesheng/core/controller/config/ConfigController.java +++ b/tiesheng-web/src/main/java/com/tiesheng/core/controller/config/ConfigController.java @@ -1,12 +1,15 @@ package com.tiesheng.core.controller.config; +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.CoreConfigSystem; import com.tiesheng.core.pojos.dto.PageDTO; import com.tiesheng.core.pojos.dto.config.ConfigSystemDTO; +import com.tiesheng.core.pojos.dto.config.EnumTypeDTO; import com.tiesheng.core.service.CoreConfigService; import com.tiesheng.util.exception.ApiException; import com.tiesheng.util.pojos.ApiResp; @@ -67,4 +70,25 @@ public class ConfigController { } + /** + * 获取枚举列表 + * + * @param dto + * @return + */ + @GetMapping("/enum/list") + @TokenIgnore + public ApiResp> enumList(EnumTypeDTO dto) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_deleted", 0); + if (!StrUtil.isEmpty(dto.getType())) { + queryWrapper.eq("type", dto.getType()); + } + List selectList = coreConfigService.getEnumMapper().selectList(queryWrapper); + + return ApiResp.respOK(selectList); + } + + } diff --git a/tiesheng-web/src/main/java/com/tiesheng/core/mapper/CoreConfigEnumMapper.java b/tiesheng-web/src/main/java/com/tiesheng/core/mapper/CoreConfigEnumMapper.java new file mode 100644 index 0000000..654ae7e --- /dev/null +++ b/tiesheng-web/src/main/java/com/tiesheng/core/mapper/CoreConfigEnumMapper.java @@ -0,0 +1,7 @@ +package com.tiesheng.core.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.tiesheng.core.pojos.dao.CoreConfigEnum; + +public interface CoreConfigEnumMapper extends BaseMapper { +} \ No newline at end of file diff --git a/tiesheng-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigEnum.java b/tiesheng-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigEnum.java new file mode 100644 index 0000000..5b6ca8a --- /dev/null +++ b/tiesheng-web/src/main/java/com/tiesheng/core/pojos/dao/CoreConfigEnum.java @@ -0,0 +1,110 @@ +package com.tiesheng.core.pojos.dao; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.tiesheng.core.pojos.DaoBase; +import java.util.Date; + +/** + * 配置-枚举 + */ +@TableName(value = "core_config_enum") +public class CoreConfigEnum extends DaoBase { + /** + * 类型 + */ + @TableField(value = "`type`") + private String type; + + /** + * 名称 + */ + @TableField(value = "`name`") + private String name; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 扩展字段 + */ + @TableField(value = "ext") + private String ext; + + /** + * 获取类型 + * + * @return type - 类型 + */ + public String getType() { + return type; + } + + /** + * 设置类型 + * + * @param type 类型 + */ + public void setType(String type) { + this.type = type; + } + + /** + * 获取名称 + * + * @return name - 名称 + */ + public String getName() { + return name; + } + + /** + * 设置名称 + * + * @param name 名称 + */ + public void setName(String name) { + this.name = name; + } + + /** + * 获取备注 + * + * @return remark - 备注 + */ + public String getRemark() { + return remark; + } + + /** + * 设置备注 + * + * @param remark 备注 + */ + public void setRemark(String remark) { + this.remark = remark; + } + + /** + * 获取扩展字段 + * + * @return ext - 扩展字段 + */ + public String getExt() { + return ext; + } + + /** + * 设置扩展字段 + * + * @param ext 扩展字段 + */ + public void setExt(String ext) { + this.ext = ext; + } +} \ No newline at end of file diff --git a/tiesheng-web/src/main/java/com/tiesheng/core/pojos/dto/config/EnumTypeDTO.java b/tiesheng-web/src/main/java/com/tiesheng/core/pojos/dto/config/EnumTypeDTO.java new file mode 100644 index 0000000..9b51d3d --- /dev/null +++ b/tiesheng-web/src/main/java/com/tiesheng/core/pojos/dto/config/EnumTypeDTO.java @@ -0,0 +1,14 @@ +package com.tiesheng.core.pojos.dto.config; + +public class EnumTypeDTO { + + private String type; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } +} diff --git a/tiesheng-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java b/tiesheng-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java index f47b715..9ff91d3 100644 --- a/tiesheng-web/src/main/java/com/tiesheng/core/service/CoreConfigService.java +++ b/tiesheng-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.CoreConfigSystemMapper; import com.tiesheng.core.pojos.dao.CoreConfigSystem; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -10,5 +12,10 @@ import org.springframework.stereotype.Service; @Service public class CoreConfigService extends TsServiceBase { + @Autowired + CoreConfigEnumMapper coreConfigEnumMapper; + public CoreConfigEnumMapper getEnumMapper() { + return coreConfigEnumMapper; + } } diff --git a/tiesheng-web/src/main/resources/db/migration/tiesheng_base.sql b/tiesheng-web/src/main/resources/db/migration/tiesheng_base.sql index a52306e..bf8a312 100644 --- a/tiesheng-web/src/main/resources/db/migration/tiesheng_base.sql +++ b/tiesheng-web/src/main/resources/db/migration/tiesheng_base.sql @@ -1,9 +1,21 @@ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; --- ---------------------------- --- Table structure for core_log_operation --- ---------------------------- + +CREATE TABLE `core_config_enum` +( + `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 '类型', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `remark` varchar(500) DEFAULT NULL COMMENT '备注', + `ext` varchar(255) DEFAULT NULL COMMENT '扩展字段', + PRIMARY KEY (`id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='配置-枚举'; + CREATE TABLE `core_log_operation` ( `id` varchar(50) NOT NULL, diff --git a/tiesheng-web/src/main/resources/mapper/CoreConfigEnumMapper.xml b/tiesheng-web/src/main/resources/mapper/CoreConfigEnumMapper.xml new file mode 100644 index 0000000..20a9292 --- /dev/null +++ b/tiesheng-web/src/main/resources/mapper/CoreConfigEnumMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + id, create_time, update_time, is_deleted, `type`, `name`, remark, ext + + \ No newline at end of file