修复告警信息

das/src/main/java/com/das/common/constant/BaseEntity.java

@@ -1,6 +1,7 @@
 package com.das.common.constant;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.Version;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -47,4 +48,8 @@ public class BaseEntity implements Serializable {
     @TableField("updated_time")
     private Date updatedTime;
 
+    /** 乐观锁 */
+    @Version
+    @TableField("revision")
+    private Integer revision ;
 }

das/src/main/java/com/das/common/utils/SnowFlakeGenerator.java

@@ -6,7 +6,7 @@ public class SnowFlakeGenerator {
     private static final long MAX_DATACENTER_ID = 63L;
     private static final long sequenceBits = 12L;
     private static final long SEQUENCE_MAX;
-    private static final long TWEPOCH = 1440000000000L;
+    private static final long TW_EPOCH = 1440000000000L;
     private final long datacenterIdShift;
     private final long timestampLeftShift;
     private volatile long lastTimestamp;

das/src/main/java/com/das/modules/auth/controller/SysMenusController.java

@@ -5,7 +5,6 @@ import com.das.common.config.SessionUtil;
 import com.das.common.constant.SysAuthorityIds;
 import com.das.common.result.R;
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.dto.DeleteDto;
 import com.das.modules.auth.domain.dto.SysMenuDto;
 import com.das.modules.auth.domain.dto.SysMenuQueryDto;

das/src/main/java/com/das/modules/auth/controller/SysOrgController.java

@@ -4,7 +4,6 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.das.common.constant.SysAuthorityIds;
 import com.das.common.result.R;
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.dto.DeleteDto;
 import com.das.modules.auth.domain.dto.SysOrgDto;
 import com.das.modules.auth.domain.dto.SysOrgQueryDto;

das/src/main/java/com/das/modules/auth/controller/SysRoleController.java

@@ -4,7 +4,6 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.das.common.constant.SysAuthorityIds;
 import com.das.common.result.R;
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.dto.DeleteDto;
 import com.das.modules.auth.domain.dto.SysRoleDto;
 import com.das.modules.auth.domain.dto.SysRoleQueryDto;

das/src/main/java/com/das/modules/auth/controller/SysUserController.java

@@ -4,7 +4,6 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.das.common.constant.SysAuthorityIds;
 import com.das.common.result.R;
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.dto.DeleteDto;
 import com.das.modules.auth.domain.dto.SysUserDto;
 import com.das.modules.auth.domain.dto.SysUserQueryDto;

das/src/main/java/com/das/modules/auth/entity/SysAuthority.java

@@ -1,6 +1,9 @@
 package com.das.modules.auth.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.das.common.constant.BaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -46,12 +49,4 @@ public class SysAuthority extends BaseEntity {
      */
     @TableField("authority_name")
     private String authorityName;
-
-    /**
-     * 乐观锁
-     */
-    @Version
-    @TableField("revision")
-    private Integer revision;
-
 }

das/src/main/java/com/das/modules/auth/entity/SysMenu.java

@@ -1,6 +1,9 @@
 package com.das.modules.auth.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.das.common.constant.BaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -55,8 +58,4 @@ public class SysMenu extends BaseEntity {
     /** 上级菜单ID */
     @TableField("parent_menu_id")
     private Long parentMenuId ;
-    /** 乐观锁 */
-    @Version
-    @TableField("revision")
-    private Integer revision ;
 }

das/src/main/java/com/das/modules/auth/entity/SysOrg.java

@@ -1,6 +1,9 @@
 package com.das.modules.auth.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.das.common.constant.BaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -92,14 +95,6 @@ public class SysOrg extends BaseEntity {
     @TableField("parent_org_id")
     private Long parentOrgId;
 
-    /**
-     * 乐观锁
-     */
-    @Version
-    @TableField("revision")
-    private Integer revision;
-
-
     /**
      * 别名
      */

das/src/main/java/com/das/modules/auth/entity/SysRole.java

@@ -1,6 +1,9 @@
 package com.das.modules.auth.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.das.common.constant.BaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -46,12 +49,4 @@ public class SysRole extends BaseEntity {
      */
     @TableField("role_name")
     private String roleName;
-
-    /**
-     * 乐观锁
-     */
-    @Version
-    @TableField("revision")
-    private Integer revision;
-
 }

das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java

@@ -4,7 +4,6 @@ package com.das.modules.auth.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.das.common.constant.BaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -47,11 +46,4 @@ public class SysRoleAuthority extends BaseEntity implements Serializable {
     @TableField("role_id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
-
-    /**
-     * 乐观锁
-     */
-    @Version
-    @TableField("revision")
-    private Integer revision;
 }

das/src/main/java/com/das/modules/auth/entity/SysUser.java

@@ -1,6 +1,9 @@
 package com.das.modules.auth.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.das.common.constant.BaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -85,12 +88,4 @@ public class SysUser extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("last_login")
     private Date lastLogin;
-
-    /**
-     * 乐观锁
-     */
-    @Version
-    @TableField("revision")
-    private Integer revision;
-
 }

das/src/main/java/com/das/modules/auth/entity/SysUserRole.java

@@ -4,7 +4,6 @@ package com.das.modules.auth.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.das.common.constant.BaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -47,11 +46,4 @@ public class SysUserRole extends BaseEntity implements Serializable {
     @TableField("role_id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
-
-    /**
-     * 乐观锁
-     */
-    @Version
-    @TableField("revision")
-    private Integer revision;
 }

das/src/main/java/com/das/modules/auth/service/LoginService.java

@@ -2,7 +2,6 @@ package com.das.modules.auth.service;
 
 
 import com.das.modules.auth.domain.dto.ChangePasswordDto;
-import com.das.modules.auth.domain.vo.LoginUserDetailsVo;
 import com.das.modules.auth.domain.dto.LoginDto;
 import com.das.modules.auth.domain.dto.RefreshTokenDto;
 import com.das.modules.auth.domain.vo.LoginUserDetailsVo;

das/src/main/java/com/das/modules/auth/service/SysMenuService.java

@@ -1,7 +1,6 @@
 package com.das.modules.auth.service;
 
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.dto.DeleteDto;
 import com.das.modules.auth.domain.dto.SysMenuDto;
 import com.das.modules.auth.domain.dto.SysMenuQueryDto;

das/src/main/java/com/das/modules/auth/service/SysOrgService.java

@@ -1,7 +1,6 @@
 package com.das.modules.auth.service;
 
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.dto.DeleteDto;
 import com.das.modules.auth.domain.dto.SysOrgDto;
 import com.das.modules.auth.domain.dto.SysOrgQueryDto;

das/src/main/java/com/das/modules/auth/service/SysRoleService.java

@@ -1,7 +1,6 @@
 package com.das.modules.auth.service;
 
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.dto.DeleteDto;
 import com.das.modules.auth.domain.dto.SysRoleDto;
 import com.das.modules.auth.domain.dto.SysRoleQueryDto;

das/src/main/java/com/das/modules/auth/service/SysUserService.java

@@ -1,7 +1,6 @@
 package com.das.modules.auth.service;
 
 import com.das.common.utils.PageDataInfo;
-import com.das.common.utils.PageQuery;
 import com.das.modules.auth.domain.dto.DeleteDto;
 import com.das.modules.auth.domain.dto.SysUserDto;
 import com.das.modules.auth.domain.dto.SysUserQueryDto;

das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java

@@ -11,7 +11,6 @@ import com.das.common.config.SessionUtil;
 import com.das.common.exceptions.ServiceException;
 import com.das.common.utils.AdminRedisTemplate;
 import com.das.modules.auth.domain.dto.ChangePasswordDto;
-import com.das.modules.auth.domain.vo.LoginUserDetailsVo;
 import com.das.modules.auth.domain.dto.LoginDto;
 import com.das.modules.auth.domain.dto.RefreshTokenDto;
 import com.das.modules.auth.domain.vo.LoginUserDetailsVo;

das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java

@@ -26,9 +26,9 @@ public class SysAuthorityServiceImpl implements SysAuthorityService {
     @PostConstruct
     public void init() {
         List<SysAuthority> list = new ArrayList<>();
-        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN,"SYS_AUTHORITY_ID_ADMIN","系统管理权限",1));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN,"SYS_AUTHORITY_ID_ADMIN","系统管理权限"));
-        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR,"SYS_AUTHORITY_ID_DEVICE_MGR","设备台账维护权限",1));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR,"SYS_AUTHORITY_ID_DEVICE_MGR","设备台账维护权限"));
-        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_VIEW,"SYS_AUTHORITY_ID_DEVICE_VIEW","设备台账浏览权限",1));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_VIEW,"SYS_AUTHORITY_ID_DEVICE_VIEW","设备台账浏览权限"));
 
         try {
             // 性能优化：先查询所有需要的权限是否存在，减少数据库访问次数

das/src/main/resources/application.yml

@@ -53,7 +53,7 @@ spring:
       client-type: lettuce
 
 
-# 配置 xml 文件所在位置    配置全局的 主键策略，默认为 ASSIGN_ID 默认为 【雪花算法】 , atuo 自增
+# 配置 xml 文件所在位置    配置全局的 主键策略，默认为 ASSIGN_ID 默认为 【雪花算法】 , auto 自增
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/*.xml
   # 搜索指定包别名
@@ -87,4 +87,4 @@ captcha:
 
 das:
   aes:
-    key: b6967ee87b86d85a
+    key: b6967ee87b86d85a

das/src/main/resources/mapper/SysAuthorityMapper.xml

@@ -13,7 +13,7 @@
     <insert id="batchInsert">
         insert into sys_authority(id,authority_code , authority_name, revision) values
         <foreach collection='list' item='item' index='index ' separator=', '>
-            (#{item.id}, #{item.authorityCode}, #{item.authorityName}, #{item.revision})
+            (#{item.id}, #{item.authorityCode}, #{item.authorityName},1)
         </foreach>
     </insert>