finished 字典管理

src/main/java/com/qkdata/biz/enums/SysConfigStatusEnum.java

-package com.qkdata.biz.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-
-public enum SysConfigStatusEnum {
-    HIDDEN(0, "隐藏"), SHOW(1, "显示");
-
-    @EnumValue
-    private Integer value;
-
-    private String text;
-
-    SysConfigStatusEnum(Integer value, String text) {
-        this.value = value;
-        this.text = text;
-    }
-}

src/main/java/com/qkdata/biz/management/controller/PriceConfigController.java

@@ -26,6 +26,7 @@ public class PriceConfigController {
     public Result<PriceConfigModel> get() {
         return Result.succeed(priceConfigService.findConfig());
     }
+
     @ApiOperation("修改系统价格配置")
     @SysLog("修改系统价格配置")
     @PostMapping("/update")

src/main/java/com/qkdata/biz/management/service/PriceConfigService.java

@@ -23,28 +23,29 @@ public class PriceConfigService {
             BizConstants.CONFIG_KEY_DISCOUNT_6MON,
             BizConstants.CONFIG_KEY_DISCOUNT_12MON,
             BizConstants.CONFIG_KEY_ENTERPRICE_VIP_PRICE);
+    private String configType = "PriceConfig";
 
     public PriceConfigModel findConfig() {
 
-        List<SysConfigPO> configList = sysConfigService.list(Wrappers.<SysConfigPO>lambdaQuery().in(SysConfigPO::getParamKey, paramKeys));
+        List<SysConfigPO> configList = sysConfigService.list(Wrappers.<SysConfigPO>lambdaQuery().in(SysConfigPO::getType, configType));
         PriceConfigModel model = new PriceConfigModel();
         if (CollUtil.isNotEmpty(configList)) {
             for (SysConfigPO config : configList) {
-                switch (config.getParamKey()) {
+                switch (config.getKey()) {
                     case BizConstants.CONFIG_KEY_VIP_PRICE:
-                        model.setVipPrice(new BigDecimal(config.getParamValue()));
+                        model.setVipPrice(new BigDecimal(config.getValue()));
                         break;
                     case BizConstants.CONFIG_KEY_DISCOUNT_3MON:
-                        model.setDiscountFor3Mon(new BigDecimal(config.getParamValue()));
+                        model.setDiscountFor3Mon(new BigDecimal(config.getValue()));
                         break;
                     case BizConstants.CONFIG_KEY_DISCOUNT_6MON:
-                        model.setDiscountFor6Mon(new BigDecimal(config.getParamValue()));
+                        model.setDiscountFor6Mon(new BigDecimal(config.getValue()));
                         break;
                     case BizConstants.CONFIG_KEY_DISCOUNT_12MON:
-                        model.setDiscountFor12Mon(new BigDecimal(config.getParamValue()));
+                        model.setDiscountFor12Mon(new BigDecimal(config.getValue()));
                         break;
                     case BizConstants.CONFIG_KEY_ENTERPRICE_VIP_PRICE:
-                        model.setEnterpriceVipPrice(new BigDecimal(config.getParamValue()));
+                        model.setEnterpriceVipPrice(new BigDecimal(config.getValue()));
                         break;
                 }
             }

src/main/java/com/qkdata/biz/sys/entity/SysConfigPO.java

 package com.qkdata.biz.sys.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qkdata.biz.enums.SysConfigStatusEnum;
 import com.qkdata.common.base.entity.BasePO;
 import lombok.Data;
 
 @Data
 @TableName("sys_config")
 public class SysConfigPO extends BasePO {
-    private String paramKey;
-    private String paramValue;
-    private SysConfigStatusEnum status;
+    @TableField("`key`")
+    private String key;
+    @TableField("`value`")
+    private String value;
+    private String type;
     private String remark;
 }

src/main/java/com/qkdata/biz/sys/service/SysConfigService.java

@@ -6,6 +6,7 @@ import com.qkdata.biz.sys.entity.SysConfigPO;
 import com.qkdata.biz.sys.mapper.SysConfigMapper;
 import com.qkdata.biz.sys.vo.QueryConfigModel;
 import com.qkdata.common.base.enums.CodeEnum;
+import com.qkdata.common.base.exception.BusinessException;
 import com.qkdata.common.base.model.PageResult;
 import com.qkdata.common.base.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
@@ -21,16 +22,13 @@ public class SysConfigService extends BaseServiceImpl<SysConfigMapper, SysConfig
         return PageResult.<SysConfigPO>builder().code(CodeEnum.SUCCESS.getCode()).count(page.getTotal()).data(pageList).build();
     }
 
-    public void updateValueByKey(String paramKey, String paramValue) {
-        SysConfigPO sysConfigPO = baseMapper.selectOne(Wrappers.<SysConfigPO>lambdaQuery().eq(SysConfigPO::getParamKey,paramKey));
-        if (sysConfigPO == null){
-            sysConfigPO = new SysConfigPO();
-            sysConfigPO.setParamKey(paramKey);
-            sysConfigPO.setParamValue(paramValue);
-            save(sysConfigPO);
-        }else {
-            sysConfigPO.setParamValue(paramValue);
+    public void updateValueByKey(String key, String value) {
+        SysConfigPO sysConfigPO = baseMapper.selectOne(Wrappers.<SysConfigPO>lambdaQuery().eq(SysConfigPO::getKey,key));
+        if (sysConfigPO != null){
+            sysConfigPO.setValue(value);
             updateById(sysConfigPO);
+        }else {
+            throw new BusinessException("不存的key");
         }
     }
 }

src/main/java/com/qkdata/biz/sys/vo/QueryConfigModel.java

@@ -7,5 +7,6 @@ import lombok.Data;
 public class QueryConfigModel {
     private Integer pageIndex = Constants.DEFAULT_PAGE;
     private Integer pageSize = Constants.DEFAULT_PAGE_SIZE;
-    private String paramKey;
+    private String key;
+    private String type;
 }

src/main/resources/db/migration/V1.0.0__init.sql

@@ -308,7 +308,12 @@ CREATE TABLE `sys_menu` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='菜单管理';
 
-
+INSERT INTO `sys_menu` VALUES (1, 0, '系统管理', '/upms', NULL, 0, 'appstore', 0, '2021-05-12 11:31:57', '2021-05-12 11:31:57');
+INSERT INTO `sys_menu` VALUES (2, 1, '用户管理', 'admin/user/index', NULL, 1, 'user', 0, '2021-05-12 11:35:30', '2021-05-12 11:35:30');
+INSERT INTO `sys_menu` VALUES (3, 1, '角色管理', 'admin/role/index', NULL, 1, 'audit', 1, '2021-05-12 11:35:30', '2021-05-12 11:35:30');
+INSERT INTO `sys_menu` VALUES (4, 1, '菜单管理', 'admin/menu/index', NULL, 1, 'menu-fold', 2, '2021-05-12 11:35:30', '2021-05-12 11:35:30');
+INSERT INTO `sys_menu` VALUES (5, 1, '日志管理', 'admin/log/index', NULL, 1, 'file-search', 3, '2021-05-12 11:35:30', '2021-05-12 11:35:30');
+INSERT INTO `sys_menu` VALUES (7, 1, '字典管理', 'admin/dict/index', '', 1, 'database', 4, '2021-05-13 15:33:18', '2021-05-13 17:29:25');
 -- ----------------------------
 -- Table structure for sys_role
 -- ----------------------------
@@ -342,21 +347,36 @@ CREATE TABLE `sys_role_menu` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='角色与菜单对应关系';
 
-
+INSERT INTO `sys_role_menu` VALUES (29, 1, 2);
+INSERT INTO `sys_role_menu` VALUES (30, 1, 3);
+INSERT INTO `sys_role_menu` VALUES (31, 1, 4);
+INSERT INTO `sys_role_menu` VALUES (32, 1, 5);
+INSERT INTO `sys_role_menu` VALUES (33, 1, 8);
+INSERT INTO `sys_role_menu` VALUES (34, 1, 9);
+INSERT INTO `sys_role_menu` VALUES (35, 1, 11);
+INSERT INTO `sys_role_menu` VALUES (36, 1, 10);
+INSERT INTO `sys_role_menu` VALUES (37, 1, 7);
+INSERT INTO `sys_role_menu` VALUES (38, 1, 1);
+INSERT INTO `sys_role_menu` VALUES (54, 2, 2);
+INSERT INTO `sys_role_menu` VALUES (55, 2, 3);
+INSERT INTO `sys_role_menu` VALUES (56, 2, 4);
+INSERT INTO `sys_role_menu` VALUES (57, 2, 5);
+INSERT INTO `sys_role_menu` VALUES (58, 2, 7);
+INSERT INTO `sys_role_menu` VALUES (59, 2, 1);
 -- ----------------------------
 -- Table structure for sys_config
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_config`;
 CREATE TABLE `sys_config` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `param_key` varchar(50) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'key',
-  `param_value` varchar(2000) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'value',
-  `status` int(4) DEFAULT '1' COMMENT '状态   0：隐藏   1：显示',
+  `key` varchar(50) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'key',
+  `value` varchar(2000) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'value',
+  `type` varchar(50) COLLATE utf8mb4_bin DEFAULT '1' COMMENT '类型',
   `remark` varchar(500) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '备注',
   `create_time` datetime DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE KEY `param_key` (`param_key`) USING BTREE
+  UNIQUE KEY `param_key` (`key`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='系统配置信息表';
 
 -- ----------------------------

src/main/resources/mappers/sys/SysConfigMapper.xml

@@ -3,8 +3,11 @@
 <mapper namespace="com.qkdata.biz.sys.mapper.SysConfigMapper">
     <select id="queryPageList" resultType="com.qkdata.biz.sys.entity.SysConfigPO">
         select * from sys_config where 1=1
-        <if test="p.paramKey != null and p.paramKey != ''">
-            and param_key like concat('%',#{p.paramKey},'%')
+        <if test="p.key != null and p.key != ''">
+            and `key` like concat('%',#{p.key},'%')
+        </if>
+        <if test="p.type != null and p.type != ''">
+            and type = #{p.type}
         </if>
     </select>
 </mapper>
\ No newline at end of file