Skip to content

G
guns-vip
Commit 9dc66a7e by fengshuonan
Options

完善常量的新增和修改

parent 0ded1702
Showing with 251 additions and 208 deletions
_sqls/guns_mysql.sql
...@@ -16,7 +16,7 @@ USE guns; ...@@ -16,7 +16,7 @@ USE guns;
Target Server Version : 50724 Target Server Version : 50724
File Encoding : 65001 File Encoding : 65001
Date: 20/06/2019 17:25:41 Date: 24/06/2019 11:08:03
*/ */
SET NAMES utf8mb4; SET NAMES utf8mb4;
...@@ -43,7 +43,7 @@ CREATE TABLE `database_info` ( ...@@ -43,7 +43,7 @@ CREATE TABLE `database_info` (
-- Records of database_info -- Records of database_info
-- ---------------------------- -- ----------------------------
BEGIN; BEGIN;
INSERT INTO `database_info` VALUES (1139830492418289666, 'master', 'com.mysql.cj.jdbc.Driver', 'root', 'root', 'jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT', '主数据源，项目启动数据源！不要修改此条目！修改后也会被重置！', '2019-06-15 17:42:21'); INSERT INTO `database_info` VALUES (1142988647625146369, 'master', 'com.mysql.cj.jdbc.Driver', 'root', 'root', 'jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT', '主数据源，项目启动数据源！', '2019-06-24 10:51:43');
COMMIT; COMMIT;
-- ---------------------------- -- ----------------------------
...@@ -80,7 +80,7 @@ CREATE TABLE `sys_config` ( ...@@ -80,7 +80,7 @@ CREATE TABLE `sys_config` (
`name` varchar(200) NOT NULL COMMENT '名称', `name` varchar(200) NOT NULL COMMENT '名称',
`code` varchar(200) NOT NULL COMMENT '属性编码标识', `code` varchar(200) NOT NULL COMMENT '属性编码标识',
`dict_flag` char(1) NOT NULL COMMENT '是否是字典中的值', `dict_flag` char(1) NOT NULL COMMENT '是否是字典中的值',
`dict_type_code` varchar(200) DEFAULT NULL COMMENT '字典类型的编码', `dict_type_id` bigint(20) DEFAULT NULL COMMENT '字典类型的编码',
`value` varchar(200) NOT NULL COMMENT '属性值，如果是字典中的类型，则为dict的code', `value` varchar(200) NOT NULL COMMENT '属性值，如果是字典中的类型，则为dict的code',
`remark` varchar(200) DEFAULT NULL COMMENT '备注', `remark` varchar(200) DEFAULT NULL COMMENT '备注',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
...@@ -88,7 +88,7 @@ CREATE TABLE `sys_config` ( ...@@ -88,7 +88,7 @@ CREATE TABLE `sys_config` (
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
`update_user` bigint(20) DEFAULT NULL COMMENT '更新人', `update_user` bigint(20) DEFAULT NULL COMMENT '更新人',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='参数配置'; ) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='参数配置';
-- ---------------------------- -- ----------------------------
-- Table structure for sys_dept -- Table structure for sys_dept
...@@ -154,8 +154,6 @@ INSERT INTO `sys_dict` VALUES (1106120825993543682, 1106120322450571266, 'FREEZE ...@@ -154,8 +154,6 @@ INSERT INTO `sys_dict` VALUES (1106120825993543682, 1106120322450571266, 'FREEZE
INSERT INTO `sys_dict` VALUES (1106120875872206849, 1106120322450571266, 'DELETED', '已删除', 0, '[0]', 'ENABLE', -1221, '', '2019-03-14 17:12:22', '2019-03-16 10:56:53', 1, 1); INSERT INTO `sys_dict` VALUES (1106120875872206849, 1106120322450571266, 'DELETED', '已删除', 0, '[0]', 'ENABLE', -1221, '', '2019-03-14 17:12:22', '2019-03-16 10:56:53', 1, 1);
INSERT INTO `sys_dict` VALUES (1106120935070613505, 1106120388036902914, 'Y', '删除', 0, '[0]', 'ENABLE', 23333, '', '2019-03-14 17:12:36', '2019-03-16 10:58:53', 1, 1); INSERT INTO `sys_dict` VALUES (1106120935070613505, 1106120388036902914, 'Y', '删除', 0, '[0]', 'ENABLE', 23333, '', '2019-03-14 17:12:36', '2019-03-16 10:58:53', 1, 1);
INSERT INTO `sys_dict` VALUES (1106120968910258177, 1106120388036902914, 'N', '未删除', 0, '[0]', 'ENABLE', 1212211221, '', '2019-03-14 17:12:44', '2019-03-16 10:59:03', 1, 1); INSERT INTO `sys_dict` VALUES (1106120968910258177, 1106120388036902914, 'N', '未删除', 0, '[0]', 'ENABLE', 1212211221, '', '2019-03-14 17:12:44', '2019-03-16 10:59:03', 1, 1);
INSERT INTO `sys_dict` VALUES (1106751061042974722, 1106120322450571266, '11212', '122', 0, '[0]', 'ENABLE', 1212, '122112', '2019-03-16 10:56:30', NULL, 1, NULL);
INSERT INTO `sys_dict` VALUES (1106751747772166145, 1106120388036902914, '12312', '3123123', 1106120968910258177, '[0],[1106120968910258177]', 'ENABLE', 123, '', '2019-03-16 10:59:14', NULL, 1, NULL);
COMMIT; COMMIT;
-- ---------------------------- -- ----------------------------
...@@ -317,6 +315,10 @@ INSERT INTO `sys_menu` VALUES (1111546189892870145, 'console2', 'dashboard', '[0 ...@@ -317,6 +315,10 @@ INSERT INTO `sys_menu` VALUES (1111546189892870145, 'console2', 'dashboard', '[0
INSERT INTO `sys_menu` VALUES (1127085735660421122, 'code_generate', 'dev_tools', '[0],[dev_tools],', '代码生成', '', '/gen', 20, 2, 'Y', NULL, 'ENABLE', NULL, NULL, '2019-05-11 13:39:14', '2019-06-15 18:12:45', 1, 1); INSERT INTO `sys_menu` VALUES (1127085735660421122, 'code_generate', 'dev_tools', '[0],[dev_tools],', '代码生成', '', '/gen', 20, 2, 'Y', NULL, 'ENABLE', NULL, NULL, '2019-05-11 13:39:14', '2019-06-15 18:12:45', 1, 1);
INSERT INTO `sys_menu` VALUES (1139826657964593154, 'meta_data', 'dev_tools', '[0],[dev_tools],', '系统配置', '', '#', 10, 2, 'Y', NULL, 'ENABLE', NULL, NULL, '2019-06-15 17:27:07', '2019-06-15 18:12:35', 1, 1); INSERT INTO `sys_menu` VALUES (1139826657964593154, 'meta_data', 'dev_tools', '[0],[dev_tools],', '系统配置', '', '#', 10, 2, 'Y', NULL, 'ENABLE', NULL, NULL, '2019-06-15 17:27:07', '2019-06-15 18:12:35', 1, 1);
INSERT INTO `sys_menu` VALUES (1139827152854716418, 'data_source', 'meta_data', '[0],[dev_tools],[meta_data],', '数据源管理', '', '/databaseInfo', 10, 3, 'Y', NULL, 'ENABLE', NULL, NULL, '2019-06-15 17:29:05', '2019-06-15 18:12:35', 1, 1); INSERT INTO `sys_menu` VALUES (1139827152854716418, 'data_source', 'meta_data', '[0],[dev_tools],[meta_data],', '数据源管理', '', '/databaseInfo', 10, 3, 'Y', NULL, 'ENABLE', NULL, NULL, '2019-06-15 17:29:05', '2019-06-15 18:12:35', 1, 1);
INSERT INTO `sys_menu` VALUES (1142957882422112257, 'SYS_CONFIG', 'meta_data', '[0],[dev_tools],[meta_data],', '参数配置', 'fa-star', '/sysConfig', 5, 3, 'Y', '', 'ENABLE', '', '', '2019-06-24 08:49:28', '2019-06-24 08:57:34', 1, 1);
INSERT INTO `sys_menu` VALUES (1142957882422112258, 'SYS_CONFIG_ADD', 'SYS_CONFIG', '[0],[dev_tools],[meta_data],[SYS_CONFIG],', '参数配置添加', 'fa-star', '', 999, 4, 'N', '', 'ENABLE', '', '', '2019-06-24 08:49:28', '2019-06-24 08:57:34', 1, 1);
INSERT INTO `sys_menu` VALUES (1142957882422112259, 'SYS_CONFIG_EDIT', 'SYS_CONFIG', '[0],[dev_tools],[meta_data],[SYS_CONFIG],', '参数配置修改', 'fa-star', '', 999, 4, 'N', '', 'ENABLE', '', '', '2019-06-24 08:49:28', '2019-06-24 08:57:34', 1, 1);
INSERT INTO `sys_menu` VALUES (1142957882426306562, 'SYS_CONFIG_DELETE', 'SYS_CONFIG', '[0],[dev_tools],[meta_data],[SYS_CONFIG],', '参数配置删除', 'fa-star', '', 999, 4, 'N', '', 'ENABLE', '', '', '2019-06-24 08:49:28', '2019-06-24 08:57:34', 1, 1);
COMMIT; COMMIT;
-- ---------------------------- -- ----------------------------
...@@ -393,72 +395,76 @@ INSERT INTO `sys_relation` VALUES (1138325281216442370, 172, 5); ...@@ -393,72 +395,76 @@ INSERT INTO `sys_relation` VALUES (1138325281216442370, 172, 5);
INSERT INTO `sys_relation` VALUES (1138325281229025281, 145, 5); INSERT INTO `sys_relation` VALUES (1138325281229025281, 145, 5);
INSERT INTO `sys_relation` VALUES (1138325281245802498, 1111545968697860098, 5); INSERT INTO `sys_relation` VALUES (1138325281245802498, 1111545968697860098, 5);
INSERT INTO `sys_relation` VALUES (1138325281258385410, 1111546189892870145, 5); INSERT INTO `sys_relation` VALUES (1138325281258385410, 1111546189892870145, 5);
INSERT INTO `sys_relation` VALUES (1139827178351890433, 105, 1); INSERT INTO `sys_relation` VALUES (1142958067646771201, 105, 1);
INSERT INTO `sys_relation` VALUES (1139827178364473345, 106, 1); INSERT INTO `sys_relation` VALUES (1142958067659354113, 106, 1);
INSERT INTO `sys_relation` VALUES (1139827178381250562, 107, 1); INSERT INTO `sys_relation` VALUES (1142958067676131330, 107, 1);
INSERT INTO `sys_relation` VALUES (1139827178393833473, 108, 1); INSERT INTO `sys_relation` VALUES (1142958067688714241, 108, 1);
INSERT INTO `sys_relation` VALUES (1139827178402222081, 109, 1); INSERT INTO `sys_relation` VALUES (1142958067705491457, 109, 1);
INSERT INTO `sys_relation` VALUES (1139827178414804994, 110, 1); INSERT INTO `sys_relation` VALUES (1142958067718074369, 110, 1);
INSERT INTO `sys_relation` VALUES (1139827178423193602, 111, 1); INSERT INTO `sys_relation` VALUES (1142958067734851585, 111, 1);
INSERT INTO `sys_relation` VALUES (1139827178435776514, 112, 1); INSERT INTO `sys_relation` VALUES (1142958067747434497, 112, 1);
INSERT INTO `sys_relation` VALUES (1139827178448359425, 113, 1); INSERT INTO `sys_relation` VALUES (1142958067764211713, 113, 1);
INSERT INTO `sys_relation` VALUES (1139827178460942338, 165, 1); INSERT INTO `sys_relation` VALUES (1142958067776794626, 165, 1);
INSERT INTO `sys_relation` VALUES (1139827178473525250, 166, 1); INSERT INTO `sys_relation` VALUES (1142958067789377538, 166, 1);
INSERT INTO `sys_relation` VALUES (1139827178498691073, 167, 1); INSERT INTO `sys_relation` VALUES (1142958067806154754, 167, 1);
INSERT INTO `sys_relation` VALUES (1139827178519662594, 114, 1); INSERT INTO `sys_relation` VALUES (1142958067818737665, 114, 1);
INSERT INTO `sys_relation` VALUES (1139827178540634114, 115, 1); INSERT INTO `sys_relation` VALUES (1142958067831320578, 115, 1);
INSERT INTO `sys_relation` VALUES (1139827178557411329, 116, 1); INSERT INTO `sys_relation` VALUES (1142958067848097794, 116, 1);
INSERT INTO `sys_relation` VALUES (1139827178574188545, 117, 1); INSERT INTO `sys_relation` VALUES (1142958067856486402, 117, 1);
INSERT INTO `sys_relation` VALUES (1139827178590965762, 118, 1); INSERT INTO `sys_relation` VALUES (1142958067873263618, 118, 1);
INSERT INTO `sys_relation` VALUES (1139827178603548673, 162, 1); INSERT INTO `sys_relation` VALUES (1142958067885846529, 162, 1);
INSERT INTO `sys_relation` VALUES (1139827178616131586, 163, 1); INSERT INTO `sys_relation` VALUES (1142958067898429441, 163, 1);
INSERT INTO `sys_relation` VALUES (1139827178628714497, 164, 1); INSERT INTO `sys_relation` VALUES (1142958067911012354, 164, 1);
INSERT INTO `sys_relation` VALUES (1139827178641297409, 119, 1); INSERT INTO `sys_relation` VALUES (1142958067923595266, 119, 1);
INSERT INTO `sys_relation` VALUES (1139827178653880321, 120, 1); INSERT INTO `sys_relation` VALUES (1142958067936178177, 120, 1);
INSERT INTO `sys_relation` VALUES (1139827178666463234, 121, 1); INSERT INTO `sys_relation` VALUES (1142958067948761090, 121, 1);
INSERT INTO `sys_relation` VALUES (1139827178679046145, 122, 1); INSERT INTO `sys_relation` VALUES (1142958067957149698, 122, 1);
INSERT INTO `sys_relation` VALUES (1139827178687434753, 150, 1); INSERT INTO `sys_relation` VALUES (1142958067969732610, 150, 1);
INSERT INTO `sys_relation` VALUES (1139827178700017665, 151, 1); INSERT INTO `sys_relation` VALUES (1142958067982315521, 151, 1);
INSERT INTO `sys_relation` VALUES (1139827178712600577, 128, 1); INSERT INTO `sys_relation` VALUES (1142958067994898433, 128, 1);
INSERT INTO `sys_relation` VALUES (1139827178720989186, 134, 1); INSERT INTO `sys_relation` VALUES (1142958068007481345, 134, 1);
INSERT INTO `sys_relation` VALUES (1139827178733572098, 158, 1); INSERT INTO `sys_relation` VALUES (1142958068020064257, 158, 1);
INSERT INTO `sys_relation` VALUES (1139827178746155009, 159, 1); INSERT INTO `sys_relation` VALUES (1142958068036841473, 159, 1);
INSERT INTO `sys_relation` VALUES (1139827178758737921, 130, 1); INSERT INTO `sys_relation` VALUES (1142958068049424385, 130, 1);
INSERT INTO `sys_relation` VALUES (1139827178767126529, 131, 1); INSERT INTO `sys_relation` VALUES (1142958068062007297, 131, 1);
INSERT INTO `sys_relation` VALUES (1139827178779709442, 135, 1); INSERT INTO `sys_relation` VALUES (1142958068074590210, 135, 1);
INSERT INTO `sys_relation` VALUES (1139827178788098050, 136, 1); INSERT INTO `sys_relation` VALUES (1142958068087173122, 136, 1);
INSERT INTO `sys_relation` VALUES (1139827178800680961, 137, 1); INSERT INTO `sys_relation` VALUES (1142958068099756033, 137, 1);
INSERT INTO `sys_relation` VALUES (1139827178809069570, 152, 1); INSERT INTO `sys_relation` VALUES (1142958068116533250, 152, 1);
INSERT INTO `sys_relation` VALUES (1139827178821652481, 153, 1); INSERT INTO `sys_relation` VALUES (1142958068129116162, 153, 1);
INSERT INTO `sys_relation` VALUES (1139827178830041089, 154, 1); INSERT INTO `sys_relation` VALUES (1142958068141699074, 154, 1);
INSERT INTO `sys_relation` VALUES (1139827178842624001, 132, 1); INSERT INTO `sys_relation` VALUES (1142958068154281985, 132, 1);
INSERT INTO `sys_relation` VALUES (1139827178855206914, 138, 1); INSERT INTO `sys_relation` VALUES (1142958068166864897, 138, 1);
INSERT INTO `sys_relation` VALUES (1139827178863595521, 139, 1); INSERT INTO `sys_relation` VALUES (1142958068183642113, 139, 1);
INSERT INTO `sys_relation` VALUES (1139827178876178434, 140, 1); INSERT INTO `sys_relation` VALUES (1142958068196225025, 140, 1);
INSERT INTO `sys_relation` VALUES (1139827178888761346, 155, 1); INSERT INTO `sys_relation` VALUES (1142958068208807937, 155, 1);
INSERT INTO `sys_relation` VALUES (1139827178897149954, 156, 1); INSERT INTO `sys_relation` VALUES (1142958068221390850, 156, 1);
INSERT INTO `sys_relation` VALUES (1139827178905538562, 157, 1); INSERT INTO `sys_relation` VALUES (1142958068233973761, 157, 1);
INSERT INTO `sys_relation` VALUES (1139827178918121474, 133, 1); INSERT INTO `sys_relation` VALUES (1142958068246556673, 133, 1);
INSERT INTO `sys_relation` VALUES (1139827178926510081, 160, 1); INSERT INTO `sys_relation` VALUES (1142958068259139585, 160, 1);
INSERT INTO `sys_relation` VALUES (1139827178939092994, 161, 1); INSERT INTO `sys_relation` VALUES (1142958068275916802, 161, 1);
INSERT INTO `sys_relation` VALUES (1139827178951675906, 141, 1); INSERT INTO `sys_relation` VALUES (1142958068288499714, 141, 1);
INSERT INTO `sys_relation` VALUES (1139827178964258818, 142, 1); INSERT INTO `sys_relation` VALUES (1142958068301082626, 142, 1);
INSERT INTO `sys_relation` VALUES (1139827178976841730, 143, 1); INSERT INTO `sys_relation` VALUES (1142958068313665537, 143, 1);
INSERT INTO `sys_relation` VALUES (1139827178989424641, 144, 1); INSERT INTO `sys_relation` VALUES (1142958068326248449, 144, 1);
INSERT INTO `sys_relation` VALUES (1139827179006201858, 1139826657964593154, 1); INSERT INTO `sys_relation` VALUES (1142958068343025665, 171, 1);
INSERT INTO `sys_relation` VALUES (1139827179022979073, 1139827152854716418, 1); INSERT INTO `sys_relation` VALUES (1142958068355608578, 149, 1);
INSERT INTO `sys_relation` VALUES (1139827179043950594, 171, 1); INSERT INTO `sys_relation` VALUES (1142958068368191490, 1110777136265838594, 1);
INSERT INTO `sys_relation` VALUES (1139827179064922113, 149, 1); INSERT INTO `sys_relation` VALUES (1142958068376580097, 1110777366856089602, 1);
INSERT INTO `sys_relation` VALUES (1139827179085893634, 1127085735660421122, 1); INSERT INTO `sys_relation` VALUES (1142958068389163009, 1110777491464667137, 1);
INSERT INTO `sys_relation` VALUES (1139827179102670850, 172, 1); INSERT INTO `sys_relation` VALUES (1142958068405940225, 1110787391943098370, 1);
INSERT INTO `sys_relation` VALUES (1139827179123642369, 145, 1); INSERT INTO `sys_relation` VALUES (1142958068418523138, 1110839216310329346, 1);
INSERT INTO `sys_relation` VALUES (1139827179144613889, 1111545968697860098, 1); INSERT INTO `sys_relation` VALUES (1142958068426911745, 1127085735660421122, 1);
INSERT INTO `sys_relation` VALUES (1139827179165585409, 1111546189892870145, 1); INSERT INTO `sys_relation` VALUES (1142958068443688962, 1139826657964593154, 1);
INSERT INTO `sys_relation` VALUES (1139827179186556930, 1110777136265838594, 1); INSERT INTO `sys_relation` VALUES (1142958068456271873, 1139827152854716418, 1);
INSERT INTO `sys_relation` VALUES (1139827179207528450, 1110777366856089602, 1); INSERT INTO `sys_relation` VALUES (1142958068468854786, 1142957882422112257, 1);
INSERT INTO `sys_relation` VALUES (1139827179232694273, 1110777491464667137, 1); INSERT INTO `sys_relation` VALUES (1142958068481437698, 1142957882422112258, 1);
INSERT INTO `sys_relation` VALUES (1139827179253665793, 1110787391943098370, 1); INSERT INTO `sys_relation` VALUES (1142958068494020609, 1142957882422112259, 1);
INSERT INTO `sys_relation` VALUES (1139827179278831618, 1110839216310329346, 1); INSERT INTO `sys_relation` VALUES (1142958068506603521, 1142957882426306562, 1);
INSERT INTO `sys_relation` VALUES (1142958068519186433, 172, 1);
INSERT INTO `sys_relation` VALUES (1142958068531769346, 145, 1);
INSERT INTO `sys_relation` VALUES (1142958068548546562, 1111545968697860098, 1);
INSERT INTO `sys_relation` VALUES (1142958068561129473, 1111546189892870145, 1);
COMMIT; COMMIT;
-- ---------------------------- -- ----------------------------
......
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/entity/SysConfig.java
package cn.stylefeng.guns.sys.modular.consts.entity; package cn.stylefeng.guns.sys.modular.consts.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -14,6 +15,7 @@ import java.util.Date; ...@@ -14,6 +15,7 @@ import java.util.Date;
* @since 2019-06-20 * @since 2019-06-20
*/ */
@TableName("sys_config") @TableName("sys_config")
@Data
public class SysConfig implements Serializable { public class SysConfig implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -45,8 +47,8 @@ public class SysConfig implements Serializable { ...@@ -45,8 +47,8 @@ public class SysConfig implements Serializable {
/** /**
* 字典类型的编码 * 字典类型的编码
*/ */
@TableField("dict_type_code") @TableField("dict_type_id")
private String dictTypeCode; private Long dictTypeId;
/** /**
* 属性值，如果是字典中的类型，则为dict的code * 属性值，如果是字典中的类型，则为dict的code
...@@ -84,109 +86,4 @@ public class SysConfig implements Serializable { ...@@ -84,109 +86,4 @@ public class SysConfig implements Serializable {
@TableField(value = "update_user", fill = FieldFill.UPDATE) @TableField(value = "update_user", fill = FieldFill.UPDATE)
private Long updateUser; private Long updateUser;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getDictFlag() {
return dictFlag;
}
public void setDictFlag(String dictFlag) {
this.dictFlag = dictFlag;
}
public String getDictTypeCode() {
return dictTypeCode;
}
public void setDictTypeCode(String dictTypeCode) {
this.dictTypeCode = dictTypeCode;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Long getCreateUser() {
return createUser;
}
public void setCreateUser(Long createUser) {
this.createUser = createUser;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Long getUpdateUser() {
return updateUser;
}
public void setUpdateUser(Long updateUser) {
this.updateUser = updateUser;
}
@Override
public String toString() {
return "SysConfig{" +
"id=" + id +
", name=" + name +
", code=" + code +
", dictFlag=" + dictFlag +
", dictTypeCode=" + dictTypeCode +
", value=" + value +
", remark=" + remark +
", createTime=" + createTime +
", createUser=" + createUser +
", updateTime=" + updateTime +
", updateUser=" + updateUser +
"}";
}
} }
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/mapper/mapping/SysConfigMapper.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<result column="name" property="name" /> <result column="name" property="name" />
<result column="code" property="code" /> <result column="code" property="code" />
<result column="dict_flag" property="dictFlag" /> <result column="dict_flag" property="dictFlag" />
<result column="dict_type_code" property="dictTypeCode" /> <result column="dict_type_id" property="dictTypeId" />
<result column="value" property="value" /> <result column="value" property="value" />
<result column="remark" property="remark" /> <result column="remark" property="remark" />
<result column="create_time" property="createTime" /> <result column="create_time" property="createTime" />
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id AS "id", name AS "name", code AS "code", dict_flag AS "dictFlag", dict_type_code AS "dictTypeCode", value AS "value", remark AS "remark", create_time AS "createTime", create_user AS "createUser", update_time AS "updateTime", update_user AS "updateUser" id AS "id", name AS "name", code AS "code", dict_flag AS "dictFlag", dict_type_id AS "dictTypeId", value AS "value", remark AS "remark", create_time AS "createTime", create_user AS "createUser", update_time AS "updateTime", update_user AS "updateUser"
</sql> </sql>
......
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/model/params/SysConfigParam.java
...@@ -43,7 +43,7 @@ public class SysConfigParam implements Serializable, BaseValidatingParam { ...@@ -43,7 +43,7 @@ public class SysConfigParam implements Serializable, BaseValidatingParam {
/** /**
* 字典类型的编码 * 字典类型的编码
*/ */
private String dictTypeCode; private Long dictTypeId;
/** /**
* 字典的值 * 字典的值
......
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/model/result/SysConfigResult.java
package cn.stylefeng.guns.sys.modular.consts.model.result; package cn.stylefeng.guns.sys.modular.consts.model.result;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.util.Date;
/** /**
* <p> * <p>
...@@ -42,7 +42,7 @@ public class SysConfigResult implements Serializable { ...@@ -42,7 +42,7 @@ public class SysConfigResult implements Serializable {
/** /**
* 字典类型的编码 * 字典类型的编码
*/ */
private String dictTypeCode; private Long dictTypeId;
/** /**
* 属性值，如果是字典中的类型，则为dict的code * 属性值，如果是字典中的类型，则为dict的code
......
guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/service/impl/SysConfigServiceImpl.java
...@@ -8,6 +8,7 @@ import cn.stylefeng.guns.sys.modular.consts.model.params.SysConfigParam; ...@@ -8,6 +8,7 @@ import cn.stylefeng.guns.sys.modular.consts.model.params.SysConfigParam;
import cn.stylefeng.guns.sys.modular.consts.model.result.SysConfigResult; import cn.stylefeng.guns.sys.modular.consts.model.result.SysConfigResult;
import cn.stylefeng.guns.sys.modular.consts.service.SysConfigService; import cn.stylefeng.guns.sys.modular.consts.service.SysConfigService;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -50,7 +51,21 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig ...@@ -50,7 +51,21 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
SysConfig oldEntity = getOldEntity(param); SysConfig oldEntity = getOldEntity(param);
SysConfig newEntity = getEntity(param); SysConfig newEntity = getEntity(param);
ToolUtil.copyProperties(newEntity, oldEntity); ToolUtil.copyProperties(newEntity, oldEntity);
this.updateById(newEntity);
UpdateWrapper<SysConfig> updateWrapper = new UpdateWrapper<SysConfig>().eq("id", param.getId());
//如果是字典类型
if (ToolUtil.isNotEmpty(param.getDictFlag())
&& param.getDictFlag().equalsIgnoreCase("Y")) {
newEntity.setValue(param.getDictValue());
} else {
//如果是非字典，则标识位置为空
newEntity.setDictFlag("N");
updateWrapper.set(true, "dict_type_id", null);
}
this.update(newEntity, updateWrapper);
} }
@Override @Override
......
guns-sys/src/main/webapp/assets/modular/sysConfig/sysConfig_add.js
...@@ -31,14 +31,14 @@ layui.use(['form', 'admin', 'ax'], function () { ...@@ -31,14 +31,14 @@ layui.use(['form', 'admin', 'ax'], function () {
status = "dict"; status = "dict";
//初始化所有字典类型 //初始化所有字典类型
$("#dictTypeCode").html('<option value="">请选择系统字典类型</option>'); $("#dictTypeId").html('<option value="">请选择系统字典类型</option>');
var ajax = new $ax(Feng.ctxPath + "/dictType/listTypes", function (data) { var ajax = new $ax(Feng.ctxPath + "/dictType/listTypes", function (data) {
for (var i = 0; i < data.data.length; i++) { for (var i = 0; i < data.data.length; i++) {
var dictTypeId = data.data[i].dictTypeId; var dictTypeId = data.data[i].dictTypeId;
var name = data.data[i].name; var name = data.data[i].name;
var code = data.data[i].code; var code = data.data[i].code;
$("#dictTypeCode").append('<option value="' + dictTypeId + '">' + code + '--' + name + '</option>'); $("#dictTypeId").append('<option value="' + dictTypeId + '">' + code + '--' + name + '</option>');
} }
form.render(); form.render();
...@@ -62,7 +62,7 @@ layui.use(['form', 'admin', 'ax'], function () { ...@@ -62,7 +62,7 @@ layui.use(['form', 'admin', 'ax'], function () {
var radio = $('input:radio[name="dictValue"]:checked').val(); var radio = $('input:radio[name="dictValue"]:checked').val();
if (!$("#dictTypeCode").val() || !radio) { if (!$("#dictTypeId").val() || !radio) {
Feng.error("请选择具体字典！"); Feng.error("请选择具体字典！");
return false; return false;
} }
...@@ -95,7 +95,7 @@ layui.use(['form', 'admin', 'ax'], function () { ...@@ -95,7 +95,7 @@ layui.use(['form', 'admin', 'ax'], function () {
}); });
//监听字典选择 //监听字典选择
form.on('select(dictTypeCode)', function (data) { form.on('select(dictTypeId)', function (data) {
var dictTypeId = data.value; var dictTypeId = data.value;
......
guns-sys/src/main/webapp/assets/modular/sysConfig/sysConfig_edit.js
...@@ -21,16 +21,93 @@ layui.use(['form', 'admin', 'ax'], function () { ...@@ -21,16 +21,93 @@ layui.use(['form', 'admin', 'ax'], function () {
var form = layui.form; var form = layui.form;
var admin = layui.admin; var admin = layui.admin;
//让当前iframe弹层高度适应
admin.iframeAuto();
//获取详情信息，填充表单 //获取详情信息，填充表单
var ajax = new $ax(Feng.ctxPath + "/sysConfig/detail?id=" + Feng.getUrlParam("id")); var ajax = new $ax(Feng.ctxPath + "/sysConfig/detail?id=" + Feng.getUrlParam("id"));
var result = ajax.start(); var result = ajax.start();
form.val('sysConfigForm', result.data); form.val('sysConfigForm', result.data);
//初始化字典选择框
var activeDictSelect = function () {
$("#dictCodeDiv").show();
$("#customCodeDiv").hide();
status = "dict";
//初始化所有字典类型
$("#dictTypeId").html('<option value="">请选择系统字典类型</option>');
var ajax = new $ax(Feng.ctxPath + "/dictType/listTypes", function (data) {
for (var i = 0; i < data.data.length; i++) {
var dictTypeId = data.data[i].dictTypeId;
var name = data.data[i].name;
var code = data.data[i].code;
$("#dictTypeId").append('<option value="' + dictTypeId + '">' + code + '--' + name + '</option>');
}
form.render();
}, function (data) {
});
ajax.start();
};
//初始化非字典选择
var activeCustomSelect = function () {
$("#dictCodeDiv").hide();
$("#customCodeDiv").show();
status = "custom";
};
//更新字典详情列表
var updateDictDetail = function (dictTypeId, activeCode) {
$("#dictDetails").html('');
var ajax = new $ax(Feng.ctxPath + "/dict/listDicts", function (data) {
for (var i = 0; i < data.data.length; i++) {
var name = data.data[i].name;
var code = data.data[i].code;
if (activeCode === code) {
$("#dictDetails").append('<input type="radio" name="dictValue" value="' + code + '" title="' + name + '" checked="checked">');
} else {
$("#dictDetails").append('<input type="radio" name="dictValue" value="' + code + '" title="' + name + '">');
}
}
form.render();
}, function (data) {
});
ajax.set("dictTypeId", dictTypeId);
ajax.start();
};
//监听单选切换
form.on('radio(dictChecked)', function (data) {
if (data.value === "Y") {
activeDictSelect();
} else {
activeCustomSelect();
}
});
//表单提交事件 //表单提交事件
form.on('submit(btnSubmit)', function (data) { form.on('submit(btnSubmit)', function (data) {
//如果是选择字典
if (status === "dict") {
var radio = $('input:radio[name="dictValue"]:checked').val();
if (!$("#dictTypeId").val() || !radio) {
Feng.error("请选择具体字典！");
return false;
}
} else {
if (!$("#value").val()) {
Feng.error("请填写参数值！");
return false;
}
}
var ajax = new $ax(Feng.ctxPath + "/sysConfig/editItem", function (data) { var ajax = new $ax(Feng.ctxPath + "/sysConfig/editItem", function (data) {
Feng.success("更新成功！"); Feng.success("更新成功！");
window.location.href = Feng.ctxPath + '/sysConfig' window.location.href = Feng.ctxPath + '/sysConfig'
...@@ -43,9 +120,33 @@ layui.use(['form', 'admin', 'ax'], function () { ...@@ -43,9 +120,33 @@ layui.use(['form', 'admin', 'ax'], function () {
return false; return false;
}); });
//监听字典选择
form.on('select(dictTypeId)', function (data) {
var dictTypeId = data.value;
//初始化字典详细列表
updateDictDetail(dictTypeId);
});
//返回按钮 //返回按钮
$("#backupPage").click(function () { $("#backupPage").click(function () {
window.location.href = Feng.ctxPath + '/sysConfig' window.location.href = Feng.ctxPath + '/sysConfig'
}); });
//如果当前字典有dictTypeId则初始化字典类型选择
if (result.data.dictTypeId) {
activeDictSelect();
//更新选项
$("#dictTypeId").val(result.data.dictTypeId);
form.render();
//更新字典类型的详情
updateDictDetail(result.data.dictTypeId, result.data.value);
} else {
activeCustomSelect();
}
}); });
\ No newline at end of file
guns-sys/src/main/webapp/pages/modular/sysConfig/sysConfig_add.html
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">名称<span style="color: red;">*</span></label> <label class="layui-form-label">名称<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="name" name="name" placeholder="请输入名称" type="text" class="layui-input" lay-verify="required" required/> <input id="name" name="name" placeholder="请输入名称" type="text" class="layui-input" autocomplete="off" lay-verify="required" required/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">编码<span style="color: red;">*</span></label> <label class="layui-form-label">编码<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="code" name="code" placeholder="属性编码" type="text" class="layui-input" lay-verify="required" required/> <input id="code" name="code" placeholder="属性编码" type="text" class="layui-input" autocomplete="off" lay-verify="required" required/>
</div> </div>
<div class="layui-form-mid layui-word-aux form-tips">推荐采用下划线大写风格，例如，KAPTCH_OPEN</div> <div class="layui-form-mid layui-word-aux form-tips">推荐采用下划线大写风格，例如，KAPTCH_OPEN</div>
</div> </div>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">字典类型<span style="color: red;">*</span></label> <label class="layui-form-label">字典类型<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<select name="dictTypeCode" id="dictTypeCode" lay-filter="dictTypeCode"> <select name="dictTypeId" id="dictTypeId" lay-filter="dictTypeId">
<option value="">请选择系统字典类型</option> <option value="">请选择系统字典类型</option>
</select> </select>
</div> </div>
...@@ -53,13 +53,13 @@ ...@@ -53,13 +53,13 @@
<div class="layui-form-item" id="customCodeDiv"> <div class="layui-form-item" id="customCodeDiv">
<label class="layui-form-label">参数值<span style="color: red;">*</span></label> <label class="layui-form-label">参数值<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="value" name="value" placeholder="属性值" type="text" class="layui-input"/> <input id="value" name="value" placeholder="属性值" type="text" autocomplete="off" class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">备注</label> <label class="layui-form-label">备注</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="remark" name="remark" placeholder="请输入备注" type="text" class="layui-input"/> <input id="remark" name="remark" placeholder="请输入备注" type="text" autocomplete="off" class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
......
guns-sys/src/main/webapp/pages/modular/sysConfig/sysConfig_edit.html
...@@ -12,31 +12,54 @@ ...@@ -12,31 +12,54 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">名称<span style="color: red;">*</span></label> <label class="layui-form-label">名称<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="name" name="name" placeholder="请输入名称" type="text" class="layui-input" lay-verify="required" required/> <input id="name" name="name" placeholder="请输入名称" type="text" class="layui-input" autocomplete="off" lay-verify="required" required/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">字典标识<span style="color: red;">*</span></label> <label class="layui-form-label">编码<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="dictFlag" name="dictFlag" placeholder="系统字典标识" type="text" class="layui-input" lay-verify="required" required/> <input id="code" name="code" placeholder="属性编码" type="text" class="layui-input" autocomplete="off" lay-verify="required" required/>
</div> </div>
<div class="layui-form-mid layui-word-aux form-tips">推荐采用下划线大写风格，例如，KAPTCH_OPEN</div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">编码<span style="color: red;">*</span></label> <label class="layui-form-label">取值范围<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="code" name="code" placeholder="属性编码" type="text" class="layui-input" lay-verify="required" required/> <input type="radio" name="dictFlag" value="Y" title="字典" lay-filter="dictChecked" checked="checked">
<input type="radio" name="dictFlag" value="N" title="非字典" lay-filter="dictChecked">
</div> </div>
<div class="layui-form-mid layui-word-aux">如果选择字典，则取值来自于 系统管理->字典管理</div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">属性值<span style="color: red;">*</span></label> <!-- 从字典取值 -->
<div id="dictCodeDiv">
<div class="layui-form-item">
<label class="layui-form-label">字典类型<span style="color: red;">*</span></label>
<div class="layui-input-block">
<select name="dictTypeId" id="dictTypeId" lay-filter="dictTypeId">
<option value="">请选择系统字典类型</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">参数值<span style="color: red;">*</span></label>
<div class="layui-input-block" id="dictDetails">
<input type="radio" name="dictValue" value="" title="无" disabled="disabled">
</div>
</div>
</div>
<!-- 手动输入 -->
<div class="layui-form-item" id="customCodeDiv">
<label class="layui-form-label">参数值<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="value" name="value" placeholder="属性值" type="text" class="layui-input" lay-verify="required" required/> <input id="value" name="value" placeholder="属性值" type="text" autocomplete="off" class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">备注<span style="color: red;">*</span></label> <label class="layui-form-label">备注</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="remark" name="remark" placeholder="请输入备注" type="text" class=" " lay-verify="required" required/> <input id="remark" name="remark" placeholder="请输入备注" type="text" autocomplete="off" class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment