From da3b24f3a720f7a626ff67073bedb65acebb9af7 Mon Sep 17 00:00:00 2001 From: houwei Date: Fri, 28 Jun 2024 16:24:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=8A=E8=AD=A6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/das/common/constant/BaseEntity.java | 5 +++++ .../com/das/common/utils/SnowFlakeGenerator.java | 2 +- .../modules/auth/controller/SysMenusController.java | 1 - .../modules/auth/controller/SysOrgController.java | 1 - .../modules/auth/controller/SysRoleController.java | 1 - .../modules/auth/controller/SysUserController.java | 1 - .../com/das/modules/auth/entity/SysAuthority.java | 13 ++++--------- .../java/com/das/modules/auth/entity/SysMenu.java | 9 ++++----- .../java/com/das/modules/auth/entity/SysOrg.java | 13 ++++--------- .../java/com/das/modules/auth/entity/SysRole.java | 13 ++++--------- .../das/modules/auth/entity/SysRoleAuthority.java | 8 -------- .../java/com/das/modules/auth/entity/SysUser.java | 13 ++++--------- .../com/das/modules/auth/entity/SysUserRole.java | 8 -------- .../com/das/modules/auth/service/LoginService.java | 1 - .../das/modules/auth/service/SysMenuService.java | 1 - .../com/das/modules/auth/service/SysOrgService.java | 1 - .../das/modules/auth/service/SysRoleService.java | 1 - .../das/modules/auth/service/SysUserService.java | 1 - .../modules/auth/service/impl/LoginServiceImpl.java | 1 - .../auth/service/impl/SysAuthorityServiceImpl.java | 6 +++--- das/src/main/resources/application.yml | 4 ++-- .../main/resources/mapper/SysAuthorityMapper.xml | 2 +- 22 files changed, 32 insertions(+), 74 deletions(-) diff --git a/das/src/main/java/com/das/common/constant/BaseEntity.java b/das/src/main/java/com/das/common/constant/BaseEntity.java index ca100584..327c670d 100644 --- a/das/src/main/java/com/das/common/constant/BaseEntity.java +++ b/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 ; } diff --git a/das/src/main/java/com/das/common/utils/SnowFlakeGenerator.java b/das/src/main/java/com/das/common/utils/SnowFlakeGenerator.java index d307c4d6..7f24005a 100644 --- a/das/src/main/java/com/das/common/utils/SnowFlakeGenerator.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java index 70e4f549..ff4fd65c 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java b/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java index 7e8e8784..b813063d 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/controller/SysRoleController.java b/das/src/main/java/com/das/modules/auth/controller/SysRoleController.java index a79c33f6..bdce976b 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysRoleController.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/controller/SysUserController.java b/das/src/main/java/com/das/modules/auth/controller/SysUserController.java index 7206f252..a4527568 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysUserController.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java b/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java index 07582e95..49474206 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java +++ b/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; - } diff --git a/das/src/main/java/com/das/modules/auth/entity/SysMenu.java b/das/src/main/java/com/das/modules/auth/entity/SysMenu.java index 8ca9f09d..65d0fb77 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysMenu.java +++ b/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 ; } diff --git a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java index 1dde561f..200b8a82 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java +++ b/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; - - /** * 别名 */ diff --git a/das/src/main/java/com/das/modules/auth/entity/SysRole.java b/das/src/main/java/com/das/modules/auth/entity/SysRole.java index 02b1a592..af5d48b7 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysRole.java +++ b/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; - } diff --git a/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java b/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java index 9612b32c..e2f079e4 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java +++ b/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; } diff --git a/das/src/main/java/com/das/modules/auth/entity/SysUser.java b/das/src/main/java/com/das/modules/auth/entity/SysUser.java index 152b6286..07d2f317 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysUser.java +++ b/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; - } diff --git a/das/src/main/java/com/das/modules/auth/entity/SysUserRole.java b/das/src/main/java/com/das/modules/auth/entity/SysUserRole.java index b5fa43ce..ede65b52 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysUserRole.java +++ b/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; } diff --git a/das/src/main/java/com/das/modules/auth/service/LoginService.java b/das/src/main/java/com/das/modules/auth/service/LoginService.java index 10a48485..38e1b629 100644 --- a/das/src/main/java/com/das/modules/auth/service/LoginService.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/service/SysMenuService.java b/das/src/main/java/com/das/modules/auth/service/SysMenuService.java index 974bea43..08d1b541 100644 --- a/das/src/main/java/com/das/modules/auth/service/SysMenuService.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/service/SysOrgService.java b/das/src/main/java/com/das/modules/auth/service/SysOrgService.java index 455d0001..09d66896 100644 --- a/das/src/main/java/com/das/modules/auth/service/SysOrgService.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/service/SysRoleService.java b/das/src/main/java/com/das/modules/auth/service/SysRoleService.java index e7f00eec..8a19e2a4 100644 --- a/das/src/main/java/com/das/modules/auth/service/SysRoleService.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/service/SysUserService.java b/das/src/main/java/com/das/modules/auth/service/SysUserService.java index ede44b5f..e7bff2f4 100644 --- a/das/src/main/java/com/das/modules/auth/service/SysUserService.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java index 38dc5a02..7fde2837 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java +++ b/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; diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java index e02ced50..a0580467 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java +++ b/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 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_DEVICE_MGR,"SYS_AUTHORITY_ID_DEVICE_MGR","设备台账维护权限",1)); - list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_VIEW,"SYS_AUTHORITY_ID_DEVICE_VIEW","设备台账浏览权限",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","设备台账维护权限")); + list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_VIEW,"SYS_AUTHORITY_ID_DEVICE_VIEW","设备台账浏览权限")); try { // 性能优化：先查询所有需要的权限是否存在，减少数据库访问次数 diff --git a/das/src/main/resources/application.yml b/das/src/main/resources/application.yml index 31f63696..bb752d77 100644 --- a/das/src/main/resources/application.yml +++ b/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 \ No newline at end of file + key: b6967ee87b86d85a diff --git a/das/src/main/resources/mapper/SysAuthorityMapper.xml b/das/src/main/resources/mapper/SysAuthorityMapper.xml index bd1427eb..bf9303a3 100644 --- a/das/src/main/resources/mapper/SysAuthorityMapper.xml +++ b/das/src/main/resources/mapper/SysAuthorityMapper.xml @@ -13,7 +13,7 @@ insert into sys_authority(id,authority_code , authority_name, revision) values - (#{item.id}, #{item.authorityCode}, #{item.authorityName}, #{item.revision}) + (#{item.id}, #{item.authorityCode}, #{item.authorityName},1)