diff --git a/das/src/main/java/com/das/common/config/SysAuthorityIds.java b/das/src/main/java/com/das/common/config/SysAuthorityIds.java deleted file mode 100644 index d601a385..00000000 --- a/das/src/main/java/com/das/common/config/SysAuthorityIds.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.das.common.config; - -/** - * 系统权限ID定义列表 - */ -public class SysAuthorityIds { - /** - * 系统管理权限 - */ - public static final Long SYS_AUTHORITY_ID_ADMIN = 101L; - /** - * 设备台账维护权限 - */ - public static final Long SYS_AUTHORITY_ID_DEVICE_MGR = 102L; - /** - * 设备台账浏览权限 - */ - public static final Long SYS_AUTHORITY_ID_DEVICE_VIEW = 103L; -} diff --git a/das/src/main/java/com/das/common/constant/SysAuthorityIds.java b/das/src/main/java/com/das/common/constant/SysAuthorityIds.java new file mode 100644 index 00000000..c0e40bf4 --- /dev/null +++ b/das/src/main/java/com/das/common/constant/SysAuthorityIds.java @@ -0,0 +1,19 @@ +package com.das.common.constant; + +/** + * 系统权限ID定义列表 + */ +public interface SysAuthorityIds { + /** + * 系统管理权限 + */ + Long SYS_AUTHORITY_ID_ADMIN = 101L; + /** + * 设备台账维护权限 + */ + Long SYS_AUTHORITY_ID_DEVICE_MGR = 102L; + /** + * 设备台账浏览权限 + */ + Long SYS_AUTHORITY_ID_DEVICE_VIEW = 103L; +} 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 1ba8a5ef..0e579b6b 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 @@ -1,9 +1,7 @@ package com.das.modules.auth.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.stp.StpUtil; import com.das.common.config.SessionUtil; -import com.das.common.config.SysAuthorityIds; import com.das.common.result.R; import com.das.common.utils.PageDataInfo; import com.das.common.utils.PageQuery; @@ -15,7 +13,6 @@ import com.das.modules.auth.entity.SysMenu; import com.das.modules.auth.service.SysMenuService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; 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 ad771f90..23b42a2a 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 @@ -1,7 +1,5 @@ package com.das.modules.auth.controller; -import cn.dev33.satoken.stp.StpUtil; -import com.das.common.config.SysAuthorityIds; import com.das.common.result.R; import com.das.common.utils.PageDataInfo; import com.das.common.utils.PageQuery; @@ -15,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * @author chenhaojie * @Description 用户控制层 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 ac1351a7..25f3ce52 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 @@ -1,13 +1,10 @@ package com.das.modules.auth.controller; -import cn.dev33.satoken.stp.StpUtil; -import com.das.common.config.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.*; import com.das.modules.auth.domain.vo.SysRoleVo; -import com.das.modules.auth.entity.SysRole; import com.das.modules.auth.service.SysRoleService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; 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 c99d1059..1ced2fb5 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 @@ -1,7 +1,5 @@ package com.das.modules.auth.controller; -import cn.dev33.satoken.stp.StpUtil; -import com.das.common.config.SysAuthorityIds; import com.das.common.result.R; import com.das.common.utils.PageDataInfo; import com.das.common.utils.PageQuery; @@ -9,7 +7,6 @@ import com.das.modules.auth.domain.dto.DeleteDto; import com.das.modules.auth.domain.dto.SysUserDto; import com.das.modules.auth.domain.dto.SysUserQueryDto; import com.das.modules.auth.domain.vo.SysUserVo; -import com.das.modules.auth.entity.SysUser; import com.das.modules.auth.service.SysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; 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 b1738198..e02ced50 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 @@ -1,10 +1,7 @@ package com.das.modules.auth.service.impl; -import com.das.common.config.SysAuthorityIds; -import com.das.common.utils.BeanCopyUtils; -import com.das.common.utils.SequenceUtils; -import com.das.modules.auth.domain.dto.SysAuthorityDto; +import com.das.common.constant.SysAuthorityIds; import com.das.modules.auth.entity.SysAuthority; import com.das.modules.auth.mapper.SysAuthorityMapper; import com.das.modules.auth.service.SysAuthorityService; @@ -15,7 +12,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; @Slf4j