对接系统配置

db/sys_common.sql

@@ -20,10 +20,10 @@ CREATE TABLE `sys_common` (
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='系统配置表';
 
 INSERT INTO sys_common(name, description, tag, value, value_type, value_option, category, sort) VALUES
-    ('上传目标', '使用本地或云存储桶来存放文件', 'UPLOAD_TARGET',  3, 'Radio', '[{\"label\":\"本地\",\"value\":-1,\"disabled\":true},{\"label\":\"腾讯云\",\"value\":1,\"disabled\":false},{\"label\":\"阿里云\",\"value\":2,\"disabled\":true},{\"label\":\"抖音云\",\"value\":3,\"disabled\":false}]', 'UPLOAD', 3),
+    ('上传存储介质', '使用本地或云存储桶来存放文件', 'UPLOAD_TARGET',  3, 'Radio', '[{\"label\":\"本地\",\"value\":\"-1\",\"disabled\":true},{\"label\":\"腾讯云\",\"value\":\"1\",\"disabled\":false},{\"label\":\"阿里云\",\"value\":\"2\",\"disabled\":true},{\"label\":\"抖音云\",\"value\":\"3\",\"disabled\":false}]', 'UPLOAD', 3),
     ('单文件上传大小限制(MB)', null, 'UPLOAD_MAX_SIZE_MB', 100, 'Number', null, 'UPLOAD', 2),
-    ('是否启用文件MD5查重', '已存在的文件不再重复上传，仅返回链接', 'UPLOAD_MD5_DUPLICATE', 1, 'Radio', null, 'UPLOAD', 1),
+    ('是否启用文件MD5查重', '已存在的文件不再重复上传，仅返回链接', 'UPLOAD_MD5_DUPLICATE', 1, 'Switch', null, 'UPLOAD', 1),
 
-    ('系统用户默认登录过期时间(小时)', null, 'SYSTEM_USER_LOGIN_DURATION_DEFAULT', 24, 'Number', null, 'SYSTEM_USER', 1),
-    ('是否允许系统用户注册', null, 'SYSTEM_USER_ALLOW_REGISTER', 1, 'Radio', null, 'SYSTEM_USER', 1)
+    ('系统用户登录过期时间(小时)', null, 'SYSTEM_USER_LOGIN_DURATION_DEFAULT', 24, 'Number', null, 'SYSTEM_USER', 1),
+    ('是否允许系统用户注册', null, 'SYSTEM_USER_ALLOW_REGISTER', 1, 'Switch', null, 'SYSTEM_USER', 1)
 ;

db/sys_user_role_menu.sql

@@ -76,9 +76,12 @@ INSERT INTO sys_user_role_menu(id, parent_id, menu_name, menu_name_en, type, pat
     (13, 12, '用户管理', 'Users', 1, '/system/sysUserList', '/src/views/system/sysUser/sysUserList.vue', '{}', null, '3.2', 12),
     (14, 12, '用户详情', 'Users Detail', 2, '/system/sysUserDetail', '/src/views/system/sysUser/sysUserDetail.vue', '{"isBack":true,"isHide":true}', null, '3.2.1', 12),
     (15, 12, '角色管理', 'Users Roles', 1, '/system/sysUserRole', '/src/views/system/sysUserRole/sysUserRoleList.vue', '{}', null, '4.1', 12),
-    (16, 12, '角色详情', 'Users Role Detail', 2, '/system/sysUserRoleDetail', '/src/views/system/sysUserRole/sysUserRoleDetail.vue', '{"isBack":true,"isHide":true}', null, '4.1.1', 12),
-    (17, 12, '菜单管理', 'Menus', 1, '/system/sysUserRoleMenu', '/src/views/system/sysUserRoleMenu/sysUserRoleMenuDetail.vue', '{}', null, '4.3', 12),
-    (18, 12, '日志管理', 'Logs', 1, '/system/sysLogList', '/src/views/system/sysLog/sysLogList.vue', '{}', null, '5.1', 12)
+
+    (16, 12, '配置管理', 'Common', 1, '/system/sysCommonList', '/src/views/system/sysCommon/sysCommonList.vue', '{}', null, '6.1', 12),
+
+    (17, 12, '角色详情', 'Users Role Detail', 2, '/system/sysUserRoleDetail', '/src/views/system/sysUserRole/sysUserRoleDetail.vue', '{"isBack":true,"isHide":true}', null, '4.1.1', 12),
+    (18, 12, '菜单管理', 'Menus', 1, '/system/sysUserRoleMenu', '/src/views/system/sysUserRoleMenu/sysUserRoleMenuDetail.vue', '{}', null, '4.3', 12),
+    (19, 12, '日志管理', 'Logs', 1, '/system/sysLogList', '/src/views/system/sysLog/sysLogList.vue', '{}', null, '5.1', 12)
 ;
 
 

src/main/java/com/backendsys/modules/system/dao/SysCommonDao.java

@@ -4,11 +4,14 @@ import com.backendsys.modules.system.entity.SysCommon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface SysCommonDao extends BaseMapper<SysCommon> {
 
+    //List<SysCommon> selectSysCommonList(SysCommon sysCommon);
+
     int updateCommon(SysCommon sysCommon);
 
 }

src/main/java/com/backendsys/modules/system/entity/SysCommon.java

@@ -21,17 +21,15 @@ public class SysCommon {
     @NotNull(message = "id 不能为空", groups = { Detail.class, Update.class })
     private Long id;
 
-    @NotEmpty(message = "配置名称不能为空", groups = { Update.class })
     @Size(max = 20, message = "配置名称长度不超过 {max} 个字符", groups = { Update.class })
     private String name;
     @Size(max = 500, message = "配置描述长度不超过 {max} 个字符", groups = { Update.class })
     private String description;
     private String tag;
     private String value;
-    @RangeStringArray(message="配置值类型取值有误，范围应是(Text, Textarea, Number, Radio, Checkbox, Select)", value = { "Text", "Textarea", "Number", "Radio", "Checkbox", "Select" }, groups = { Update.class })
+    @RangeStringArray(message="配置值类型取值有误，范围应是(Text, Textarea, Number, Radio, Checkbox, Select, Switch)", value = { "Text", "Textarea", "Number", "Radio", "Checkbox", "Select", "Switch" }, groups = { Update.class })
     private String value_type;
     private String value_option;
-    @NotEmpty(message = "分类不能为空", groups = { Update.class })
     @Size(max = 20, message = "分类长度不超过 {max} 个字符", groups = { Update.class })
     private String category;
     private Integer sort;

src/main/resources/mapper/system/SysCommonDao.xml

@@ -2,27 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.backendsys.modules.system.dao.SysCommonDao">
 
-<!--    <sql id="includeCommon">-->
-<!--        id,-->
-<!--        name,-->
-<!--        COALESCE(value, '') value,-->
-<!--        value_type,-->
-<!--        COALESCE(value_option, '') value_option,-->
-<!--        category,-->
-<!--        COALESCE(sort, '') sort,-->
-<!--        create_time-->
-<!--    </sql>-->
+    <!--<sql id="includeCommon">-->
+    <!--    id,-->
+    <!--    name,-->
+    <!--    COALESCE(description, '') description,-->
+    <!--    COALESCE(tag, '') tag,-->
+    <!--    COALESCE(value, '') value,-->
+    <!--    value_type,-->
+    <!--    COALESCE(value_option, '') value_option,-->
+    <!--    category,-->
+    <!--    COALESCE(sort, '') sort,-->
+    <!--    create_time-->
+    <!--</sql>-->
 
-<!--    <resultMap id="resultMapCommonList" type="java.util.LinkedHashMap">-->
-<!--        <id property="id" column="id" jdbcType="BIGINT" />-->
-<!--        <result property="name" column="name" />-->
-<!--        <result property="value" column="value" />-->
-<!--        <result property="value_type" column="value_type" />-->
-<!--        <result property="value_option" column="value_option" />-->
-<!--        <result property="category" column="category" />-->
-<!--        <result property="sort" column="sort" javaType="java.lang.Integer" />-->
-<!--        <result property="create_time" column="create_time" />-->
-<!--    </resultMap>-->
+    <!--<resultMap id="resultMapCommonList" type="com.backendsys.modules.system.entity.SysCommon">-->
+    <!--    <id property="id" column="id" jdbcType="BIGINT" />-->
+    <!--    <result property="name" column="name" />-->
+    <!--    <result property="description" column="description" />-->
+    <!--    <result property="value" column="value" />-->
+    <!--    <result property="value_type" column="value_type" />-->
+    <!--    <result property="value_option" column="value_option" />-->
+    <!--    <result property="category" column="category" />-->
+    <!--    <result property="sort" column="sort" javaType="java.lang.Integer" />-->
+    <!--    <result property="create_time" column="create_time" />-->
+    <!--</resultMap>-->
+
+    <!--<select id="selectSysCommonList" resultMap="resultMapCommonList">-->
+    <!--    SELECT <include refid="includeCommon" />-->
+    <!--    FROM sys_common-->
+    <!--</select>-->
 
     <update id="updateCommon" parameterType="com.backendsys.modules.system.entity.SysCommon"
             useGeneratedKeys="true" keyProperty="id">