合并

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthMenuController.java

@@ -6,6 +6,7 @@ import com.google.gson.JsonArray;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaRole;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +66,9 @@ public class TaUserAuthMenuController extends BaseController {
         Integer userId = Object.getInteger("id");
         JSONArray JSONArray = Object.getJSONArray("sysMenu");
         List<SysMenu> sysMenuList = JSONArray.toJavaList(SysMenu.class);
-        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList,name,getOrgId(request));
+
+        JSONArray buttonArray = Object.getJSONArray("sysButton");
+        List<SysButtonInMenu> sysButtonInMenuList = buttonArray.toJavaList(SysButtonInMenu.class);
+        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList,name,getOrgId(request),sysButtonInMenuList);
     }
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthMenuService.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.center.taUser.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
 
 import java.util.List;
@@ -18,5 +19,5 @@ public interface ITaUserAuthMenuService extends IService<SysMenu> {
 
     ResponseBean getAllMenu(Integer pageNum, Integer pageSize);
 
-    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid);
+    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid,List<SysButtonInMenu> sysButtonInMenuList);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -9,14 +9,14 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaRole;
-import com.huiju.estateagents.entity.TaRoleMenu;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.mapper.TaRoleMenuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -41,6 +41,9 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     @Autowired
     private  TaRoleMapper taRoleMapper;
 
+    @Autowired
+    private TaRoleButtonMapper taRoleButtonMapper;
+
     /**
      * 根据用户id获取授权菜单
      * @param pageNum
@@ -77,11 +80,10 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     }
 
     @Override
-    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgid) {
+    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
         ResponseBean responseBean = new ResponseBean();
         if (null == roleId){
-            Boolean isA = addUserAuthMenu( sysMenuList,name,orgid);
-            responseBean.addSuccess(isA==true?"成功":"失败");
+            addUserAuthMenu( sysMenuList,name,orgId,sysButtonInMenuList);
             return responseBean;
         }
         try {
@@ -97,9 +99,18 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
             TaRole taRole = new TaRole();
             taRole.setRoleId(roleId);
             taRole.setRoleName(name);
-            taRole.setOrgId(orgid);
             taRoleMapper.updateById(taRole);
-            responseBean.addSuccess("操作成功");
+
+            // 当前角色的所有按钮再重新插入
+
+            taRoleButtonMapper.deleteCurrentBut(roleId);
+            for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList) {
+                TaRoleButton taRoleButton = new TaRoleButton();
+                taRoleButton.setRoleId(taRole.getRoleId());
+                taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
+                taRoleButtonMapper.insert(taRoleButton);
+            }
+                responseBean.addSuccess("操作成功");
             return responseBean;
         } catch (Exception e) {
             responseBean.addSuccess("操作失败");
@@ -108,18 +119,29 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
         }
     }
 
-    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgid) {
+    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
         ResponseBean responseBean = new ResponseBean();
         try{
+            // 新增角色
             TaRole taRole = new TaRole();
             taRole.setRoleName(name);
-            taRole.setOrgId(orgid);
+            taRole.setOrgId(orgId);
+            taRole.setCreateDate(LocalDateTime.now());
             taRoleMapper.insert(taRole);
+
+            // 新增角色需要的菜单
           for (SysMenu sysMenu: sysMenuList){
               TaRoleMenu taRoleMenu = new TaRoleMenu();
               taRoleMenu.setRoleId(taRole.getRoleId());
               taRoleMenu.setMenuId(sysMenu.getMenuId());
               taRoleMenuMapper.insert(taRoleMenu);
+          }
+          // 新增角色按钮
+          for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList){
+              TaRoleButton  taRoleButton = new TaRoleButton();
+              taRoleButton.setRoleId(taRole.getRoleId());
+              taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
+              taRoleButtonMapper.insert(taRoleButton);
           }
             responseBean.addSuccess("操作成功");
             return  true;

src/main/java/com/huiju/estateagents/mapper/TaRoleButtonMapper.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaRoleButton;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRoleButtonMapper extends BaseMapper<TaRoleButton> {
 
+    void deleteCurrentBut(@Param("roleId") Integer roleId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

@@ -2,14 +2,8 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.SysButtonInMenu;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaRole;
-import com.huiju.estateagents.entity.TaRoleMenu;
-import com.huiju.estateagents.mapper.SysButtonInMenuMapper;
-import com.huiju.estateagents.mapper.SysMenuMapper;
-import com.huiju.estateagents.mapper.TaRoleMapper;
-import com.huiju.estateagents.mapper.TaRoleMenuMapper;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +33,9 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
     @Autowired
     SysButtonInMenuMapper sysButtonInMenuMapper;
 
+    @Autowired
+    TaRoleButtonMapper taRoleButtonMapper;
+
     @Override
     public List<TaRole> getRolesByUser(Integer userId) {
         return taRoleMapper.getRolesByUser(userId);
@@ -56,12 +53,19 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
         for (TaRoleMenu taRoleMenu :taRoleMenusList){
             SysMenu sysMenu = sysMenuMapper.selectById(taRoleMenu.getMenuId());
             sysMenuList.add(sysMenu);
-            // 查询按钮
-            QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
-            sysButtonInMenuQuery.eq("menu_id",sysMenu.getMenuId());
-            List<SysButtonInMenu> sysButtonInMenuList= sysButtonInMenuMapper.selectList(sysButtonInMenuQuery);
-            sysMenu.setSysButtonInMenu(sysButtonInMenuList);
 
+            // 查询按钮
+            QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
+            taRoleButtonQuery.eq("role_id",id);
+            List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
+            List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
+            for(TaRoleButton taRoleButton :taRoleButtonList){
+                QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
+                sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
+                SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
+                sysButtonInArr.add(sysButtonInMenuList);
+            }
+            sysMenu.setSysButtonInMenu(sysButtonInArr);
         }
         taRole.setSysMenuList(sysMenuList);
         return taRole;

src/main/resources/mapper/TaRoleButtonMapper.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaRoleButtonMapper">
-
+<delete  id="deleteCurrentBut">
+    delete from ta_role_button where ta_role_button.role_id = #{roleId}
+</delete >
 </mapper>