refactor: 完成 lin_group 表 level 字段类型的修改

Author: colorful3

src/main/java/io/github/talelin/latticy/common/enumeration/GroupLevelEnum.java

@@ -21,20 +21,20 @@ public enum GroupLevelEnum {
     ;
 
     @EnumValue
-    private Integer code;
+    private Integer value;
 
-    private String value;
+    private String description;
 
-    GroupLevelEnum(Integer code , String value) {
-        this.code = code;
+    GroupLevelEnum(Integer value , String description) {
         this.value = value;
+        this.description = description;
     }
 
-    public Integer getCode() {
-        return code;
+    public Integer getValue() {
+        return value;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
+    public String getDescription() {
+        return description;
     }
 }

src/main/java/io/github/talelin/latticy/model/GroupDO.java

@@ -18,7 +18,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@TableName(value = "lin_group",autoResultMap = true)
+@TableName(value = "lin_group", autoResultMap = true)
 @EqualsAndHashCode(callSuper = true)
 public class GroupDO extends BaseModel implements Serializable {
 

src/main/java/io/github/talelin/latticy/service/impl/GroupServiceImpl.java

@@ -117,11 +117,11 @@ public List<Integer> getGroupUserIds(Integer id) {
 
     @Override
     public GroupDO getParticularGroupByLevel(GroupLevelEnum level) {
-        if (GroupLevelEnum.USER.getCode().equals(level.getCode())) {
+        if (GroupLevelEnum.USER == level) {
             return null;
         } else {
             QueryWrapper<GroupDO> wrapper = new QueryWrapper<>();
-            wrapper.lambda().eq(GroupDO::getLevel, level);
+            wrapper.lambda().eq(GroupDO::getLevel, level.getValue());
             GroupDO groupDO = this.baseMapper.selectOne(wrapper);
             return groupDO;
         }

src/main/resources/application-test.yml

@@ -12,16 +12,14 @@ logging:
 spring:
   # h2 内存数据库配置，供测试使用，其它环境勿用
   datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    password: '17605259250'
-    url: jdbc:mysql://jokky.fun:3306/lin-cms?useSSL=false&serverTimezone=UTC&characterEncoding=UTF8
-    username: root
-
-# 开启权限拦截
-auth:
-  enabled: true
-
-
-# 开启http请求日志记录
-request-log:
-  enabled: true
+    continue-on-error: false
+    driver-class-name: org.h2.Driver
+    password: ''
+    platform: h2
+    schema: classpath:/h2-test.sql
+    url: jdbc:h2:mem:testdbsa;MODE=MYSQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false
+    username: sa
+  h2:
+    console:
+      enabled: true
+      path: /h2

src/main/resources/application.yml

@@ -3,7 +3,7 @@
 spring:
   # 激活环境配置
   profiles:
-    active: test
+    active: dev
   # 文件编码 UTF8
   mandatory-file-encoding: UTF-8
   mvc:

src/main/resources/mapper/GroupMapper.xml

@@ -7,7 +7,7 @@
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="info" property="info"/>
-        <result column="level" property="level"/>
+        <result column="level" property="level" typeHandler="com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="delete_time" property="deleteTime"/>

src/main/resources/schema.sql

@@ -172,10 +172,10 @@ VALUES (1, 1, 'USERNAME_PASSWORD', 'root',
         'pbkdf2sha256:64000:18:24:n:yUnDokcNRbwILZllmUOItIyo9MnI00QW:6ZcPf+sfzyoygOU8h/GSoirF');
 
 INSERT INTO lin_group(id, name, info, level)
-VALUES (1, 'root', '超级用户组', 'root');
+VALUES (1, 'root', '超级用户组', 1);
 
 INSERT INTO lin_group(id, name, info, level)
-VALUES (2, 'guest', '游客组', 'guest');
+VALUES (2, 'guest', '游客组', 2);
 
 INSERT INTO lin_user_group(id, user_id, group_id)
 VALUES (1, 1, 1);

src/test/resources/h2-test.sql

@@ -75,7 +75,7 @@ CREATE TABLE lin_group
     id          int(10) unsigned NOT NULL AUTO_INCREMENT,
     name        varchar(60)      NOT NULL COMMENT '分组名称，例如：搬砖者',
     info        varchar(255)     DEFAULT NULL COMMENT '分组信息：例如：搬砖的人',
-    level       ENUM('root', 'guest', 'user') DEFAULT 'user' COMMENT '分组级别（root、guest分组只能存在一个）',
+    level       smallint(1) NOT NULL DEFAULT 3 COMMENT '分组级别 1：root 2：guest 3：user  root（root、guest分组只能存在一个)',
     create_time datetime(3)      NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
     update_time datetime(3)      NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
     delete_time datetime(3)               DEFAULT NULL,