b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ 字典添加数据类型

Browse Source
This commit is contained in:
b2baccline
2020-08-12 16:38:43 +08:00
parent 6b988fc068
commit 8f4af0e338
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java
View File

@@ -172,6 +172,7 @@ public class SysDictManager {
.map(SysDictConverter.INSTANCE::itemPoToVo).collect(Collectors.toList());
// 组装DataVO
DictDataVO dictDataVO = new DictDataVO();
dictDataVO.setType(sysDict.getType());
dictDataVO.setDictCode(sysDict.getCode());
dictDataVO.setHashCode(sysDict.getHashCode());
dictDataVO.setDictItems(setDictItems);

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDict.java
View File

@@ -60,6 +60,12 @@ public class SysDict extends Model<SysDict> {
@ApiModelProperty(value = "1：是 0：否")
private Integer editable;
/**
* 数据类型
*/
@ApiModelProperty("数据类型,1:Number 2:String 3:Boolean")
private Integer type;
/**
* 逻辑删除标识，已删除:0，未删除：删除时间戳
*/

3
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java
View File

@@ -21,6 +21,9 @@ public class DictDataVO {
@ApiModelProperty(value = "字典标识")
private String dictCode;
@ApiModelProperty("字典数据类型")
private Integer type;
/**
* 字典Hash值
*/

10
doc/2ballcat.sql
View File

@@ -113,6 +113,7 @@ CREATE TABLE `sys_dict` (
`title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称',
`remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`editable` tinyint(1) NULL DEFAULT 0 COMMENT '可编辑 1：是 0：否',
`type` tinyint(1) NULL DEFAULT 0 COMMENT '数据类型,1:Number 2:String 3:Boolean',
`hash_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'hash值，当字典项被修改时变更',
`deleted` bigint(20) NULL DEFAULT NULL COMMENT '逻辑删除标识，未删除为 0，已删除为删除时间',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
@@ -124,10 +125,11 @@ CREATE TABLE `sys_dict` (
-- ----------------------------
-- Records of sys_dict
-- ----------------------------
INSERT INTO `sys_dict` VALUES (1, 'dict_property', '字典属性', '只读、可写', 1, 'd243f9f46a9f4a5498b013242c8828b3', 0, '2020-03-27 01:05:29', '2020-07-03 14:30:03');
INSERT INTO `sys_dict` VALUES (2, 'log_type', '日志类型', '异常、正常', 1, 'f8af5ef4568735abf7e6cc00afe938b', 0, '2020-03-27 01:05:29', '2020-03-27 11:06:44');
INSERT INTO `sys_dict` VALUES (3, 'gender', '性别', '用户性别', 1, 'aca1caf123123e4872be29c8cc448', 0, '2020-03-27 01:05:29', '2020-03-27 00:55:28');
INSERT INTO `sys_dict` VALUES (4, 'grant_types', '授权类型', 'OAuth授权类型', 1, 'e5316daadb490e9ca7e1ac5c5607a4', 0, '2020-03-27 01:05:29', '2020-03-27 00:30:16');
INSERT INTO `sys_dict` VALUES (1, 'dict_property', '字典属性', '只读、可写', 1, 1, 'd243f9f46a9f4a5498b013242c8828b3', 0, '2020-03-27 01:05:29', '2020-07-03 14:30:03');
INSERT INTO `sys_dict` VALUES (2, 'log_type', '日志类型', '异常、正常', 1, 1, 'f8af5ef4568735abf7e6cc00afe938b', 0, '2020-03-27 01:05:29', '2020-03-27 11:06:44');
INSERT INTO `sys_dict` VALUES (3, 'gender', '性别', '用户性别', 1, 1, 'aca1caf123123e4872be29c8cc448', 0, '2020-03-27 01:05:29', '2020-03-27 00:55:28');
INSERT INTO `sys_dict` VALUES (4, 'grant_types', '授权类型', 'OAuth授权类型', 1, 1, 'e5316daadb490e9ca7e1ac5c5607a4', 0, '2020-03-27 01:05:29', '2020-03-27 00:30:16');
INSERT INTO `sys_dict` VALUES (5, 'dict_type', '字典数据类型', '字典数据类型', 1, 1, '582ed0dc179d4c99929b6dc5b63847fb', 0, '2020-03-27 01:05:29', '2020-03-27 00:30:16');
-- ----------------------------
-- Table structure for sys_dict_item