user权限 改成 admin权限

pom.xml

@@ -16,6 +16,8 @@
 	<properties>
 		<java.version>8</java.version>
         <maven.test.skip>true</maven.test.skip>
+        <aop.version>2.2.2.RELEASE</aop.version>
+        <jackson.version>2.12.4</jackson.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -151,6 +153,19 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <!--  ********************** AOP ****************************************************  -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${aop.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <!--  ********************** AOP ****************************************************  -->
+
     </dependencies>
 
 	<build>

src/main/java/com/zh/project0512/annotation/AdminCheckAuthorityAnnotation.java

@@ -0,0 +1,16 @@
+package com.zh.project0512.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * admin检查权限注解
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AdminCheckAuthorityAnnotation {
+    //  权限编号
+    String jurisdictionId() default "";
+}

src/main/java/com/zh/project0512/aop/AdminCheckAuthorityAspect.java

@@ -0,0 +1,107 @@
+package com.zh.project0512.aop;
+
+import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation;
+import com.zh.project0512.service.IUserService;
+import com.zh.project0512.utils.JwtUtil;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.servlet.HandlerMapping;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 检查权限切面类
+ */
+@Order(3)//设置切面优先级为3，优先级越小优先级越高
+@Aspect
+@Component
+public class AdminCheckAuthorityAspect {
+
+    private final static Logger logger = LoggerFactory.getLogger(AdminCheckAuthorityAspect.class);
+
+    @Resource
+    IUserService userService;
+
+
+    /**
+     * 功能描述: 切点
+     */
+    @Pointcut("@annotation(com.zh.project0512.annotation.AdminCheckAuthorityAnnotation)")
+    public void executePointCut() {
+
+    }
+
+    /**
+     * 功能描述: 请求前执行
+     */
+    @Before("executePointCut()")
+    public void doBefore(JoinPoint joinPoint) {
+        // 接收到请求，记录请求内容
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+
+        //获取当前用户的信息
+        String tokenId = request.getHeader("token");
+        Integer userId = userService.selByOpenid(new JwtUtil().parseOpenid(tokenId)).getId();
+
+//        //如果不是超级管理员，则判断是否有足够权限
+//        if (manageUser.getType() != 1){//1.公司超级管理员
+//            //1、查询【当前用户】所拥有的【角色】
+//            String roleIdsStr = manageUser.getRoleId();
+//            if (roleIdsStr != null){
+//                String[] roleIds = roleIdsStr.split(",");
+//
+//                HashSet<Integer> jurisdictionIds = new HashSet<>();
+//                for (String roleId : roleIds) {
+//                    //2、根据【角色】查询对应的权限
+//                    List<Integer> jurisdictionIdList = manageCheckAuthorityService.findJurisdictionByRoleId(roleId,sysCommunity);
+//
+//                    //3、将各个角色的权限 合在一起 并进行 去重操作
+//                    jurisdictionIds.addAll(jurisdictionIdList);
+//                }
+//
+//
+//                //4、获取该api所需权限
+//                MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//                ManageCheckAuthorityAnnotation annotation = signature.getMethod().getAnnotation(ManageCheckAuthorityAnnotation.class);
+//                String jurisdictionId = annotation.jurisdictionId();
+//
+//                //5、判断该用户是否存在该api所需权限,如果存在，则通过，不存在则抛出提示权限不足
+//                if (!jurisdictionIds.contains(Integer.valueOf(jurisdictionId))){
+//                    throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"用户权限不足");
+//                }
+//            }else {
+//                throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"用户权限不足");
+//            }
+//        }
+
+    }
+
+    /**
+     * 请求后执行
+     */
+    @AfterReturning(returning = "ret", pointcut = "executePointCut()")
+    public void doAfterReturning(Object ret) {
+
+    }
+
+
+
+}

src/main/java/com/zh/project0512/controller/manage/AdminJurisdictionController.java

@@ -1,9 +1,9 @@
-package com.zh.project0512.controller.wxApp;
+package com.zh.project0512.controller.manage;
 
 import com.zh.project0512.model.dto.OperationRoleJurisdictionDTO;
-import com.zh.project0512.model.dto.UserJurisdictionFBIDTO;
-import com.zh.project0512.model.vo.UserJurisdictionFBRIVo;
-import com.zh.project0512.service.IUserJurisdictionService;
+import com.zh.project0512.model.dto.AdminJurisdictionFBIDTO;
+import com.zh.project0512.model.vo.AdminJurisdictionFBRIVo;
+import com.zh.project0512.service.IAdminJurisdictionService;
 import com.zh.project0512.utils.BizException;
 import com.zh.project0512.utils.result.HttpStatusEnum;
 import com.zh.project0512.utils.result.Result;
@@ -24,10 +24,10 @@ import javax.annotation.Resource;
  */
 @Tag(name = "用户权限")
 @RestController
-@RequestMapping("/wxApp/userJurisdiction")
-public class UserJurisdictionController {
+@RequestMapping("/manage/userJurisdiction")
+public class AdminJurisdictionController {
     @Resource
-    IUserJurisdictionService userJurisdictionService;
+    IAdminJurisdictionService userJurisdictionService;
 
     /**
      * 操作角色权限
@@ -46,12 +46,12 @@ public class UserJurisdictionController {
 
     /**
      * 根据角色主键id查询角色权限信息
-     * @param userJurisdictionFBIDTO 角色权限 FBI DTO
+     * @param adminJurisdictionFBIDTO 角色权限 FBI DTO
      * @return 角色权限信息
      */
     @Operation(summary = "根据角色主键id查询角色权限信息")
     @PostMapping("/findByRoleId")
-    public ResultList<UserJurisdictionFBRIVo> findByRoleId(@Validated @RequestBody UserJurisdictionFBIDTO userJurisdictionFBIDTO){
-        return ResultList.success(userJurisdictionService.findByRoleId(userJurisdictionFBIDTO));
+    public ResultList<AdminJurisdictionFBRIVo> findByRoleId(@Validated @RequestBody AdminJurisdictionFBIDTO adminJurisdictionFBIDTO){
+        return ResultList.success(userJurisdictionService.findByRoleId(adminJurisdictionFBIDTO));
     }
 }

src/main/java/com/zh/project0512/controller/manage/AdminRoleController.java

@@ -1,11 +1,10 @@
-package com.zh.project0512.controller.wxApp;
+package com.zh.project0512.controller.manage;
 
-import com.zh.project0512.model.dto.OperationRoleJurisdictionDTO;
-import com.zh.project0512.model.dto.UserRoleInsertDTO;
-import com.zh.project0512.model.dto.UserRoleListDTO;
-import com.zh.project0512.model.dto.UserRoleUpdateDTO;
-import com.zh.project0512.model.vo.UserRoleListVo;
-import com.zh.project0512.service.IUserRoleService;
+import com.zh.project0512.model.dto.AdminRoleInsertDTO;
+import com.zh.project0512.model.dto.AdminRoleListDTO;
+import com.zh.project0512.model.dto.AdminRoleUpdateDTO;
+import com.zh.project0512.model.vo.AdminRoleListVo;
+import com.zh.project0512.service.IAdminRoleService;
 import com.zh.project0512.utils.BizException;
 import com.zh.project0512.utils.result.HttpStatusEnum;
 import com.zh.project0512.utils.result.Result;
@@ -25,32 +24,32 @@ import javax.annotation.Resource;
  */
 @Tag(name = "用户角色")
 @RestController
-@RequestMapping("/wxApp/userRole")
-public class UserRoleController {
+@RequestMapping("/manage/userRole")
+public class AdminRoleController {
     @Resource
-    IUserRoleService userRoleService;
+    IAdminRoleService userRoleService;
 
 
     /**
      * 查询用户角色
-     * @param userRoleListDTO 用户角色 list DTO
+     * @param adminRoleListDTO 用户角色 list DTO
      * @return 用户角色
      */
     @Operation(summary = "查询用户角色")
     @PostMapping("/list")
-    public ResultPageInfo<UserRoleListVo> list(@Validated @RequestBody UserRoleListDTO userRoleListDTO){
-        return ResultPageInfo.success(userRoleService.list(userRoleListDTO));
+    public ResultPageInfo<AdminRoleListVo> list(@Validated @RequestBody AdminRoleListDTO adminRoleListDTO){
+        return ResultPageInfo.success(userRoleService.list(adminRoleListDTO));
     }
 
     /**
      * 添加用户角色
-     * @param userRoleInsertDTO 用户角色添加
+     * @param adminRoleInsertDTO 用户角色添加
      * @return 操作信息
      */
     @Operation(summary = "添加用户角色")
     @PostMapping("/insert")
-    public Result<String> insert(@Validated @RequestBody UserRoleInsertDTO userRoleInsertDTO){
-        if (userRoleService.insert(userRoleInsertDTO)){
+    public Result<String> insert(@Validated @RequestBody AdminRoleInsertDTO adminRoleInsertDTO){
+        if (userRoleService.insert(adminRoleInsertDTO)){
             return Result.success("添加用户角色","操作成功");
         }else {
             throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"添加失败");
@@ -59,13 +58,13 @@ public class UserRoleController {
 
     /**
      * 修改用户角色
-     * @param userRoleUpdateDTO 用户角色 update DTO
+     * @param adminRoleUpdateDTO 用户角色 update DTO
      * @return 操作信息
      */
     @Operation(summary = "修改用户角色")
     @PostMapping("/update")
-    public Result<String> update(@Validated @RequestBody UserRoleUpdateDTO userRoleUpdateDTO){
-        if (userRoleService.update(userRoleUpdateDTO)){
+    public Result<String> update(@Validated @RequestBody AdminRoleUpdateDTO adminRoleUpdateDTO){
+        if (userRoleService.update(adminRoleUpdateDTO)){
             return Result.success("修改用户角色","操作成功");
         }else {
             throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"修改失败");

src/main/java/com/zh/project0512/mapper/AdminJurisdictionMapper.java

@@ -0,0 +1,7 @@
+package com.zh.project0512.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zh.project0512.model.AdminJurisdiction;
+
+public interface AdminJurisdictionMapper extends BaseMapper<AdminJurisdiction> {
+}

src/main/java/com/zh/project0512/mapper/AdminMenusMapper.java

@@ -0,0 +1,7 @@
+package com.zh.project0512.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zh.project0512.model.AdminMenus;
+
+public interface AdminMenusMapper extends BaseMapper<AdminMenus> {
+}

src/main/java/com/zh/project0512/mapper/AdminOperationMapper.java

@@ -0,0 +1,7 @@
+package com.zh.project0512.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zh.project0512.model.AdminOperation;
+
+public interface AdminOperationMapper extends BaseMapper<AdminOperation> {
+}

src/main/java/com/zh/project0512/mapper/AdminRoleJurisdictionMapper.java

@@ -0,0 +1,7 @@
+package com.zh.project0512.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zh.project0512.model.AdminRoleJurisdiction;
+
+public interface AdminRoleJurisdictionMapper extends BaseMapper<AdminRoleJurisdiction> {
+}

src/main/java/com/zh/project0512/mapper/AdminRoleMapper.java

@@ -0,0 +1,7 @@
+package com.zh.project0512.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zh.project0512.model.AdminRole;
+
+public interface AdminRoleMapper extends BaseMapper<AdminRole> {
+}

src/main/java/com/zh/project0512/mapper/UserJurisdictionMapper.java

@@ -1,7 +0,0 @@
-package com.zh.project0512.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zh.project0512.model.UserJurisdiction;
-
-public interface UserJurisdictionMapper extends BaseMapper<UserJurisdiction> {
-}

src/main/java/com/zh/project0512/mapper/UserMenusMapper.java

@@ -1,7 +0,0 @@
-package com.zh.project0512.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zh.project0512.model.UserMenus;
-
-public interface UserMenusMapper extends BaseMapper<UserMenus> {
-}

src/main/java/com/zh/project0512/mapper/UserOperationMapper.java

@@ -1,7 +0,0 @@
-package com.zh.project0512.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zh.project0512.model.UserOperation;
-
-public interface UserOperationMapper extends BaseMapper<UserOperation> {
-}

src/main/java/com/zh/project0512/mapper/UserRoleJurisdictionMapper.java

@@ -1,7 +0,0 @@
-package com.zh.project0512.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zh.project0512.model.UserRoleJurisdiction;
-
-public interface UserRoleJurisdictionMapper extends BaseMapper<UserRoleJurisdiction> {
-}

src/main/java/com/zh/project0512/mapper/UserRoleMapper.java

@@ -1,7 +0,0 @@
-package com.zh.project0512.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zh.project0512.model.UserRole;
-
-public interface UserRoleMapper extends BaseMapper<UserRole> {
-}

src/main/java/com/zh/project0512/model/AdminJurisdiction.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("userJurisdiction")
-public class UserJurisdiction implements Serializable {
+public class AdminJurisdiction implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 主键id

src/main/java/com/zh/project0512/model/AdminMenus.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("userMenus")
-public class UserMenus implements Serializable {
+public class AdminMenus implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/AdminOperation.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("userOperation")
-public class UserOperation implements Serializable {
+public class AdminOperation implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/AdminRole.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("userRole")
-public class UserRole implements Serializable {
+public class AdminRole implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/AdminRoleJurisdiction.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("userRoleJurisdiction")
-public class UserRoleJurisdiction implements Serializable {
+public class AdminRoleJurisdiction implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/dto/AdminJurisdictionFBIDTO.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserJurisdictionFBIDTO implements Serializable {
+public class AdminJurisdictionFBIDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/dto/AdminRoleInsertDTO.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(title = "用户角色添加")
-public class UserRoleInsertDTO implements Serializable {
+public class AdminRoleInsertDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/dto/AdminRoleListDTO.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema
-public class UserRoleListDTO implements Serializable {
+public class AdminRoleListDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/dto/AdminRoleUpdateDTO.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserRoleUpdateDTO implements Serializable {
+public class AdminRoleUpdateDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/vo/AdminJurisdictionFBIVo.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserJurisdictionFBIVo implements Serializable {
+public class AdminJurisdictionFBIVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Integer id;

src/main/java/com/zh/project0512/model/vo/AdminJurisdictionFBRIOperationVo.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserJurisdictionFBRIOperationVo implements Serializable {
+public class AdminJurisdictionFBRIOperationVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/model/vo/AdminJurisdictionFBRIVo.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserJurisdictionFBRIVo implements Serializable {
+public class AdminJurisdictionFBRIVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -35,5 +35,5 @@ public class UserJurisdictionFBRIVo implements Serializable {
     /**
      * 操作集合
      */
-    private List<UserJurisdictionFBRIOperationVo> operationVoList;
+    private List<AdminJurisdictionFBRIOperationVo> operationVoList;
 }

src/main/java/com/zh/project0512/model/vo/AdminRoleListVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserRoleListVo implements Serializable {
+public class AdminRoleListVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/zh/project0512/service/IAdminJurisdictionService.java

@@ -1,12 +1,12 @@
 package com.zh.project0512.service;
 
 import com.zh.project0512.model.dto.OperationRoleJurisdictionDTO;
-import com.zh.project0512.model.dto.UserJurisdictionFBIDTO;
-import com.zh.project0512.model.vo.UserJurisdictionFBRIVo;
+import com.zh.project0512.model.dto.AdminJurisdictionFBIDTO;
+import com.zh.project0512.model.vo.AdminJurisdictionFBRIVo;
 
 import java.util.List;
 
-public interface IUserJurisdictionService {
+public interface IAdminJurisdictionService {
     /**
      * 操作角色权限
      * @param operationRoleJurisdictionDTO 操作用户权限DTO
@@ -16,9 +16,9 @@ public interface IUserJurisdictionService {
 
     /**
      * 根据角色主键id查询角色权限信息
-     * @param userJurisdictionFBIDTO 角色权限 FBI DTO
+     * @param adminJurisdictionFBIDTO 角色权限 FBI DTO
      * @return 角色权限信息
      */
-    List<UserJurisdictionFBRIVo> findByRoleId(UserJurisdictionFBIDTO userJurisdictionFBIDTO);
+    List<AdminJurisdictionFBRIVo> findByRoleId(AdminJurisdictionFBIDTO adminJurisdictionFBIDTO);
 
 }

src/main/java/com/zh/project0512/service/IAdminRoleService.java

@@ -0,0 +1,30 @@
+package com.zh.project0512.service;
+
+import com.zh.project0512.model.dto.AdminRoleInsertDTO;
+import com.zh.project0512.model.dto.AdminRoleListDTO;
+import com.zh.project0512.model.dto.AdminRoleUpdateDTO;
+import com.zh.project0512.model.vo.AdminRoleListVo;
+import com.zh.project0512.utils.page.PageInfo;
+
+public interface IAdminRoleService {
+    /**
+     * 查询用户角色
+     * @param adminRoleListDTO 用户角色 list DTO
+     * @return 用户角色
+     */
+    PageInfo<AdminRoleListVo> list(AdminRoleListDTO adminRoleListDTO);
+
+    /**
+     * 添加用户角色
+     * @param adminRoleInsertDTO 用户角色添加 DTO
+     * @return 操作结果
+     */
+    boolean insert(AdminRoleInsertDTO adminRoleInsertDTO);
+
+    /**
+     * 修改用户角色
+     * @param adminRoleUpdateDTO 用户角色 update DTO
+     * @return 操作结果
+     */
+    boolean update(AdminRoleUpdateDTO adminRoleUpdateDTO);
+}

src/main/java/com/zh/project0512/service/IUserRoleService.java

@@ -1,30 +0,0 @@
-package com.zh.project0512.service;
-
-import com.zh.project0512.model.dto.UserRoleInsertDTO;
-import com.zh.project0512.model.dto.UserRoleListDTO;
-import com.zh.project0512.model.dto.UserRoleUpdateDTO;
-import com.zh.project0512.model.vo.UserRoleListVo;
-import com.zh.project0512.utils.page.PageInfo;
-
-public interface IUserRoleService {
-    /**
-     * 查询用户角色
-     * @param userRoleListDTO 用户角色 list DTO
-     * @return 用户角色
-     */
-    PageInfo<UserRoleListVo> list(UserRoleListDTO userRoleListDTO);
-
-    /**
-     * 添加用户角色
-     * @param userRoleInsertDTO 用户角色添加 DTO
-     * @return 操作结果
-     */
-    boolean insert(UserRoleInsertDTO userRoleInsertDTO);
-
-    /**
-     * 修改用户角色
-     * @param userRoleUpdateDTO 用户角色 update DTO
-     * @return 操作结果
-     */
-    boolean update(UserRoleUpdateDTO userRoleUpdateDTO);
-}

src/main/java/com/zh/project0512/serviceImpl/AdminJurisdictionServiceImpl.java

@@ -0,0 +1,114 @@
+package com.zh.project0512.serviceImpl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zh.project0512.mapper.*;
+import com.zh.project0512.model.*;
+import com.zh.project0512.model.dto.OperationRoleJurisdictionDTO;
+import com.zh.project0512.model.dto.AdminJurisdictionFBIDTO;
+import com.zh.project0512.model.vo.AdminJurisdictionFBRIOperationVo;
+import com.zh.project0512.model.vo.AdminJurisdictionFBRIVo;
+import com.zh.project0512.service.IAdminJurisdictionService;
+import com.zh.project0512.utils.BizException;
+import com.zh.project0512.utils.PropertyUtils;
+import com.zh.project0512.utils.result.HttpStatusEnum;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class AdminJurisdictionServiceImpl implements IAdminJurisdictionService {
+    @Resource
+    AdminRoleJurisdictionMapper adminRoleJurisdictionMapper;
+    @Resource
+    AdminMenusMapper adminMenusMapper;
+    @Resource
+    AdminOperationMapper adminOperationMapper;
+    @Resource
+    AdminJurisdictionMapper adminJurisdictionMapper;
+    @Resource
+    AdminRoleMapper adminRoleMapper;
+
+    @Override
+    @Transactional
+    public boolean operationRoleJurisdiction(OperationRoleJurisdictionDTO operationRoleJurisdictionDTO) {
+        AdminRole adminRole = adminRoleMapper.selectById(operationRoleJurisdictionDTO.getRoleId());
+        if (adminRole == null){
+            throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"记录不存在");
+        }
+
+        //先删除角色-权限关联表
+        QueryWrapper<AdminRoleJurisdiction> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("roleId",operationRoleJurisdictionDTO.getRoleId());
+        adminRoleJurisdictionMapper.delete(queryWrapper);
+
+        //后添加角色-权限关联表
+        int[] jurisdictionIds = operationRoleJurisdictionDTO.getJurisdictionIds();
+        if (jurisdictionIds.length > 0){
+            for (int jurisdictionId : jurisdictionIds) {
+                AdminRoleJurisdiction adminRoleJurisdiction = new AdminRoleJurisdiction();
+                adminRoleJurisdiction.setRoleId(operationRoleJurisdictionDTO.getRoleId());
+                adminRoleJurisdiction.setJurisdictionId(jurisdictionId);
+                adminRoleJurisdictionMapper.insert(adminRoleJurisdiction);
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public List<AdminJurisdictionFBRIVo> findByRoleId(AdminJurisdictionFBIDTO adminJurisdictionFBIDTO) {
+        AdminRole adminRole = adminRoleMapper.selectById(adminJurisdictionFBIDTO.getRoleId());
+        if (adminRole == null){
+            throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"记录不存在");
+        }
+
+        ArrayList<AdminJurisdictionFBRIVo> adminJurisdictionFBRIVos = new ArrayList<>();
+
+        //查询所有菜单
+        QueryWrapper<AdminMenus> queryWrapper = new QueryWrapper<>();
+        List<AdminMenus> adminMenus = adminMenusMapper.selectList(queryWrapper);
+        if (adminMenus != null && adminMenus.size() >0){
+            for (AdminMenus userMenu : adminMenus) {
+                AdminJurisdictionFBRIVo adminJurisdictionFBRIVo = new AdminJurisdictionFBRIVo();
+                PropertyUtils.copyProperties(userMenu, adminJurisdictionFBRIVo);
+                adminJurisdictionFBRIVo.setCheck(false);//默认为未选中
+
+                //查询菜单下所有操作信息
+                ArrayList<AdminJurisdictionFBRIOperationVo> operationVoList = new ArrayList<>();
+                QueryWrapper<AdminJurisdiction> queryWrapper4 = new QueryWrapper<>();
+                queryWrapper4.eq("menusId",userMenu.getId());
+                List<AdminJurisdiction> adminJurisdictions = adminJurisdictionMapper.selectList(queryWrapper4);
+                if (adminJurisdictions != null && adminJurisdictions.size()>0){
+                    for (AdminJurisdiction adminJurisdiction : adminJurisdictions) {
+                        AdminOperation adminOperation = adminOperationMapper.selectById(adminJurisdiction.getOperationId());
+                        if (adminOperation != null){
+                            AdminJurisdictionFBRIOperationVo operationVo = new AdminJurisdictionFBRIOperationVo();
+                            PropertyUtils.copyProperties(adminOperation,operationVo);
+                            operationVo.setCheck(false);//默认为未选中
+                            //查询该操作是否选中,如果选中则菜单也被选中
+                            QueryWrapper<AdminRoleJurisdiction> queryWrapper5 = new QueryWrapper<>();
+                            queryWrapper5.eq("jurisdictionId", adminJurisdiction.getId());
+                            queryWrapper5.eq("roleId", adminJurisdictionFBIDTO.getRoleId());
+                            queryWrapper5.last("limit 1");
+                            AdminRoleJurisdiction adminRoleJurisdiction = adminRoleJurisdictionMapper.selectOne(queryWrapper5);
+                            if (adminRoleJurisdiction != null){
+                                operationVo.setCheck(true);
+                                adminJurisdictionFBRIVo.setCheck(true);
+                            }
+
+                            operationVoList.add(operationVo);
+                        }
+                    }
+                }
+
+                adminJurisdictionFBRIVo.setOperationVoList(operationVoList);
+                adminJurisdictionFBRIVos.add(adminJurisdictionFBRIVo);
+            }
+        }
+
+        return adminJurisdictionFBRIVos;
+    }
+}

src/main/java/com/zh/project0512/serviceImpl/AdminRoleServiceImpl.java

@@ -0,0 +1,72 @@
+package com.zh.project0512.serviceImpl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zh.project0512.mapper.AdminRoleMapper;
+import com.zh.project0512.model.AdminRole;
+import com.zh.project0512.model.dto.AdminRoleInsertDTO;
+import com.zh.project0512.model.dto.AdminRoleListDTO;
+import com.zh.project0512.model.dto.AdminRoleUpdateDTO;
+import com.zh.project0512.model.vo.AdminRoleListVo;
+import com.zh.project0512.service.IAdminRoleService;
+import com.zh.project0512.utils.BizException;
+import com.zh.project0512.utils.PropertyUtils;
+import com.zh.project0512.utils.page.PageInfo;
+import com.zh.project0512.utils.result.HttpStatusEnum;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class AdminRoleServiceImpl implements IAdminRoleService {
+    @Resource
+    AdminRoleMapper adminRoleMapper;
+
+    @Override
+    public PageInfo<AdminRoleListVo> list(AdminRoleListDTO adminRoleListDTO) {
+        ArrayList<AdminRoleListVo> adminRoleListVoList = new ArrayList<>();
+        QueryWrapper<AdminRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(adminRoleListDTO.getName()),"name", adminRoleListDTO.getName());
+
+        Page<AdminRole> page = new Page<>(adminRoleListDTO.getPageNum(), adminRoleListDTO.getPageSize());
+        IPage<AdminRole> userRoleIPage = adminRoleMapper.selectPage(page, queryWrapper);
+        List<AdminRole> records = userRoleIPage.getRecords();
+        if (records != null && records.size()>0){
+            for (AdminRole record : records) {
+                AdminRoleListVo adminRoleListVo = new AdminRoleListVo();
+                PropertyUtils.copyProperties(record, adminRoleListVo);
+                adminRoleListVoList.add(adminRoleListVo);
+            }
+        }
+        return new PageInfo<>(userRoleIPage.getPages(), adminRoleListVoList, userRoleIPage.getTotal());
+    }
+
+    @Override
+    public boolean insert(AdminRoleInsertDTO adminRoleInsertDTO) {
+        AdminRole adminRole = new AdminRole();
+        adminRole.setName(adminRoleInsertDTO.getName());
+        adminRole.setCode(UUID.randomUUID().toString().replace("-",""));
+        adminRole.setCreateAt(new Date());
+        int insert = adminRoleMapper.insert(adminRole);
+        return insert > 0;
+    }
+
+    @Override
+    public boolean update(AdminRoleUpdateDTO adminRoleUpdateDTO) {
+        AdminRole adminRole = adminRoleMapper.selectById(adminRoleUpdateDTO.getId());
+        if (adminRole == null){
+            throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"记录不存在");
+        }
+
+        adminRole.setName(adminRoleUpdateDTO.getName());
+        adminRole.setModifyAt(new Date());
+        int update = adminRoleMapper.updateById(adminRole);
+        return update > 0;
+    }
+}

src/main/java/com/zh/project0512/serviceImpl/UserJurisdictionServiceImpl.java

@@ -1,114 +0,0 @@
-package com.zh.project0512.serviceImpl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zh.project0512.mapper.*;
-import com.zh.project0512.model.*;
-import com.zh.project0512.model.dto.OperationRoleJurisdictionDTO;
-import com.zh.project0512.model.dto.UserJurisdictionFBIDTO;
-import com.zh.project0512.model.vo.UserJurisdictionFBRIOperationVo;
-import com.zh.project0512.model.vo.UserJurisdictionFBRIVo;
-import com.zh.project0512.service.IUserJurisdictionService;
-import com.zh.project0512.utils.BizException;
-import com.zh.project0512.utils.PropertyUtils;
-import com.zh.project0512.utils.result.HttpStatusEnum;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class UserJurisdictionServiceImpl implements IUserJurisdictionService {
-    @Resource
-    UserRoleJurisdictionMapper userRoleJurisdictionMapper;
-    @Resource
-    UserMenusMapper userMenusMapper;
-    @Resource
-    UserOperationMapper userOperationMapper;
-    @Resource
-    UserJurisdictionMapper userJurisdictionMapper;
-    @Resource
-    UserRoleMapper userRoleMapper;
-
-    @Override
-    @Transactional
-    public boolean operationRoleJurisdiction(OperationRoleJurisdictionDTO operationRoleJurisdictionDTO) {
-        UserRole userRole = userRoleMapper.selectById(operationRoleJurisdictionDTO.getRoleId());
-        if (userRole == null){
-            throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"记录不存在");
-        }
-
-        //先删除角色-权限关联表
-        QueryWrapper<UserRoleJurisdiction> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("roleId",operationRoleJurisdictionDTO.getRoleId());
-        userRoleJurisdictionMapper.delete(queryWrapper);
-
-        //后添加角色-权限关联表
-        int[] jurisdictionIds = operationRoleJurisdictionDTO.getJurisdictionIds();
-        if (jurisdictionIds.length > 0){
-            for (int jurisdictionId : jurisdictionIds) {
-                UserRoleJurisdiction userRoleJurisdiction = new UserRoleJurisdiction();
-                userRoleJurisdiction.setRoleId(operationRoleJurisdictionDTO.getRoleId());
-                userRoleJurisdiction.setJurisdictionId(jurisdictionId);
-                userRoleJurisdictionMapper.insert(userRoleJurisdiction);
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public List<UserJurisdictionFBRIVo> findByRoleId(UserJurisdictionFBIDTO userJurisdictionFBIDTO) {
-        UserRole userRole = userRoleMapper.selectById(userJurisdictionFBIDTO.getRoleId());
-        if (userRole == null){
-            throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"记录不存在");
-        }
-
-        ArrayList<UserJurisdictionFBRIVo> userJurisdictionFBRIVos = new ArrayList<>();
-
-        //查询所有菜单
-        QueryWrapper<UserMenus> queryWrapper = new QueryWrapper<>();
-        List<UserMenus> userMenus = userMenusMapper.selectList(queryWrapper);
-        if (userMenus != null && userMenus.size() >0){
-            for (UserMenus userMenu : userMenus) {
-                UserJurisdictionFBRIVo userJurisdictionFBRIVo = new UserJurisdictionFBRIVo();
-                PropertyUtils.copyProperties(userMenu,userJurisdictionFBRIVo);
-                userJurisdictionFBRIVo.setCheck(false);//默认为未选中
-
-                //查询菜单下所有操作信息
-                ArrayList<UserJurisdictionFBRIOperationVo> operationVoList = new ArrayList<>();
-                QueryWrapper<UserJurisdiction> queryWrapper4 = new QueryWrapper<>();
-                queryWrapper4.eq("menusId",userMenu.getId());
-                List<UserJurisdiction> userJurisdictions = userJurisdictionMapper.selectList(queryWrapper4);
-                if (userJurisdictions != null && userJurisdictions.size()>0){
-                    for (UserJurisdiction userJurisdiction : userJurisdictions) {
-                        UserOperation userOperation = userOperationMapper.selectById(userJurisdiction.getOperationId());
-                        if (userOperation != null){
-                            UserJurisdictionFBRIOperationVo operationVo = new UserJurisdictionFBRIOperationVo();
-                            PropertyUtils.copyProperties(userOperation,operationVo);
-                            operationVo.setCheck(false);//默认为未选中
-                            //查询该操作是否选中,如果选中则菜单也被选中
-                            QueryWrapper<UserRoleJurisdiction> queryWrapper5 = new QueryWrapper<>();
-                            queryWrapper5.eq("jurisdictionId",userJurisdiction.getId());
-                            queryWrapper5.eq("roleId",userJurisdictionFBIDTO.getRoleId());
-                            queryWrapper5.last("limit 1");
-                            UserRoleJurisdiction userRoleJurisdiction = userRoleJurisdictionMapper.selectOne(queryWrapper5);
-                            if (userRoleJurisdiction != null){
-                                operationVo.setCheck(true);
-                                userJurisdictionFBRIVo.setCheck(true);
-                            }
-
-                            operationVoList.add(operationVo);
-                        }
-                    }
-                }
-
-                userJurisdictionFBRIVo.setOperationVoList(operationVoList);
-                userJurisdictionFBRIVos.add(userJurisdictionFBRIVo);
-            }
-        }
-
-        return userJurisdictionFBRIVos;
-    }
-}

src/main/java/com/zh/project0512/serviceImpl/UserRoleServiceImpl.java

@@ -1,74 +0,0 @@
-package com.zh.project0512.serviceImpl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zh.project0512.mapper.UserRoleMapper;
-import com.zh.project0512.model.UserPointsRecords;
-import com.zh.project0512.model.UserRole;
-import com.zh.project0512.model.dto.UserRoleInsertDTO;
-import com.zh.project0512.model.dto.UserRoleListDTO;
-import com.zh.project0512.model.dto.UserRoleUpdateDTO;
-import com.zh.project0512.model.vo.UserPointsRecordListVo;
-import com.zh.project0512.model.vo.UserRoleListVo;
-import com.zh.project0512.service.IUserRoleService;
-import com.zh.project0512.utils.BizException;
-import com.zh.project0512.utils.PropertyUtils;
-import com.zh.project0512.utils.page.PageInfo;
-import com.zh.project0512.utils.result.HttpStatusEnum;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-@Service
-public class UserRoleServiceImpl implements IUserRoleService {
-    @Resource
-    UserRoleMapper userRoleMapper;
-
-    @Override
-    public PageInfo<UserRoleListVo> list(UserRoleListDTO userRoleListDTO) {
-        ArrayList<UserRoleListVo> userRoleListVoList = new ArrayList<>();
-        QueryWrapper<UserRole> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(userRoleListDTO.getName()),"name",userRoleListDTO.getName());
-
-        Page<UserRole> page = new Page<>(userRoleListDTO.getPageNum(), userRoleListDTO.getPageSize());
-        IPage<UserRole> userRoleIPage = userRoleMapper.selectPage(page, queryWrapper);
-        List<UserRole> records = userRoleIPage.getRecords();
-        if (records != null && records.size()>0){
-            for (UserRole record : records) {
-                UserRoleListVo userRoleListVo = new UserRoleListVo();
-                PropertyUtils.copyProperties(record,userRoleListVo);
-                userRoleListVoList.add(userRoleListVo);
-            }
-        }
-        return new PageInfo<>(userRoleIPage.getPages(), userRoleListVoList, userRoleIPage.getTotal());
-    }
-
-    @Override
-    public boolean insert(UserRoleInsertDTO userRoleInsertDTO) {
-        UserRole userRole = new UserRole();
-        userRole.setName(userRoleInsertDTO.getName());
-        userRole.setCode(UUID.randomUUID().toString().replace("-",""));
-        userRole.setCreateAt(new Date());
-        int insert = userRoleMapper.insert(userRole);
-        return insert > 0;
-    }
-
-    @Override
-    public boolean update(UserRoleUpdateDTO userRoleUpdateDTO) {
-        UserRole userRole = userRoleMapper.selectById(userRoleUpdateDTO.getId());
-        if (userRole == null){
-            throw new BizException(HttpStatusEnum.CUSTOM_EXCEPTION,"记录不存在");
-        }
-
-        userRole.setName(userRoleUpdateDTO.getName());
-        userRole.setModifyAt(new Date());
-        int update = userRoleMapper.updateById(userRole);
-        return update > 0;
-    }
-}