feats

src/main/java/com/yunzhi/inte/controller/ResourcesController.java

@@ -48,7 +48,7 @@ public class ResourcesController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/resources")
     public ResponseBean list(@ApiParam("资源类型") @RequestParam(value = "type") String type,
-                             @ApiParam("角色ID") @RequestParam(value = "roleId") Integer roleId) throws Exception {
+                             @ApiParam("角色ID") @RequestParam(value = "roleId", required = false) Integer roleId) throws Exception {
 
         List<Resources> result = resourcesService.listBy(type, roleId);
         

src/main/java/com/yunzhi/inte/controller/RoleResourcesController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
+
+import java.util.HashMap;
 import java.util.List;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -62,14 +64,20 @@ public class RoleResourcesController extends BaseController {
     /** 
      * 新增数据
      *
-     * @param roleResources 实例对象
+     * @param roleId 角色ID
+     * @param roleResourcesList 授权列表
      * @return 实例对象
      */
-    @ApiOperation("新增数据")
-    @PostMapping("/roleResources")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody RoleResources roleResources) throws Exception {
-        roleResourcesService.save(roleResources);
-        return ResponseBean.success(roleResources);
+    @ApiOperation("新增数据, 包含编辑")
+    @PostMapping("/role/{roleId}/Resources")
+    public ResponseBean add(@ApiParam("角色ID") @PathVariable Integer roleId,
+                            @ApiParam("授权列表") @RequestBody List<RoleResources> roleResourcesList) throws Exception {
+        if (null == roleResourcesList) {
+            return ResponseBean.error("未找到授权对象");
+        }
+
+        roleResourcesService.mergeData(roleId, roleResourcesList);
+        return ResponseBean.success(roleResourcesList);
     }
     
     /** 

src/main/java/com/yunzhi/inte/entity/RoleResources.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 public class RoleResources implements Serializable,Cloneable{
     /** ID */
     @ApiModelProperty(name = "ID",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id ;
     /** 角色ID */
     @ApiModelProperty(name = "角色ID",notes = "")

src/main/java/com/yunzhi/inte/mapper/RoleResourcesMapper.java

@@ -5,12 +5,19 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.inte.entity.RoleResources;
 
- /**
+import java.util.List;
+
+/**
  * 角色资源;(role_resources)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-10-12
  */
 @Mapper
 public interface RoleResourcesMapper  extends BaseMapper<RoleResources>{
-    
+
+     List<RoleResources> getByRole(@Param("roleId") Integer roleId);
+
+    RoleResources getByRoleAndResource(@Param("roleId") Integer roleId, @Param("resourceId") Integer resourceId);
+
+    int deleteNotIn(@Param("roleId") Integer roleId, @Param("idList") List<Integer> idList);
 }

src/main/java/com/yunzhi/inte/service/RoleResourcesService.java

@@ -1,13 +1,15 @@
 package com.yunzhi.inte.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.inte.entity.RoleResources;
 
- /**
+import java.util.List;
+
+/**
  * 角色资源;(role_resources)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-10-12
  */
 public interface RoleResourcesService extends IBaseService<RoleResources> {
-    
-}
+
+     boolean mergeData(Integer roleId, List<RoleResources> roleResourcesList);
+ }

src/main/java/com/yunzhi/inte/service/impl/RoleResourcesServiceImpl.java

@@ -1,16 +1,51 @@
 package com.yunzhi.inte.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yunzhi.inte.entity.RoleResources;
 import com.yunzhi.inte.mapper.RoleResourcesMapper;
 import com.yunzhi.inte.service.RoleResourcesService;
- /**
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
  * 角色资源;(role_resources)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-10-12
  */
 @Service
 public class RoleResourcesServiceImpl extends BaseServiceImpl<RoleResourcesMapper, RoleResources> implements RoleResourcesService {
-    
+
+    @Override
+    public boolean mergeData(Integer roleId, List<RoleResources> roleResourcesList) {
+        // 如果是空 list, 代表取消授权
+        if (roleResourcesList.size() == 0) {
+            removeByMap(new HashMap<String, Object>(){{
+                put("role_id", roleId);
+            }});
+            return true;
+        }
+
+        //
+        List<Integer> idList = new ArrayList<>();
+        for (RoleResources item: roleResourcesList) {
+            item.setRoleId(roleId);
+
+            RoleResources origin = baseMapper.getByRoleAndResource(roleId, item.getResourceId());
+            if (null != origin) {
+                item.setId(origin.getId());
+            } else {
+                baseMapper.insert(item);
+            }
+
+            idList.add(item.getId());
+        }
+
+        // 删除多余的数据
+        baseMapper.deleteNotIn(roleId, idList);
+
+        return false;
+    }
 }

src/main/resources/mapper/RoleResourcesMapper.xml

@@ -2,5 +2,33 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.yunzhi.inte.mapper.RoleResourcesMapper">
-    
+    <delete id="deleteNotIn">
+        DELETE
+        FROM
+            role_resources t
+        WHERE
+            t.role_id = 1
+          AND t.id NOT IN
+            <foreach item="item" collection="idList" separator="," open="(" close=")" index="">
+                #{item}
+            </foreach>
+    </delete>
+
+    <select id="getByRole" resultType="com.yunzhi.inte.entity.RoleResources">
+        SELECT
+            *
+        FROM
+            role_resources t
+        WHERE
+            t.role_id = #{roleId}
+    </select>
+    <select id="getByRoleAndResource" resultType="com.yunzhi.inte.entity.RoleResources">
+        SELECT
+            *
+        FROM
+            role_resources t
+        WHERE
+            t.role_id = #{roleId}
+            AND t.resource_id = #{resourceId}
+    </select>
 </mapper>