菜单和按钮接口

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

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthButtonController
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserAuthButtonController extends BaseController {
+
+    @Autowired
+    public ITaUserAuthButtonService iTaUserAuthButtonService;
+
+    /**
+     * 根据userId获取菜单列表
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value="/admin/userAuthButton/{userId}",method= RequestMethod.GET)
+    public ResponseBean getButtonByUserId(@RequestParam("pageNum")Integer pageNum,
+                                        @RequestParam("pageSize")Integer pageSize,
+                                        @PathVariable String userId){
+        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId);
+    }
+
+
+    /**
+     * 获取所有的菜单按钮
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/buttonList",method= RequestMethod.GET)
+    public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
+                                      @RequestParam("pageSize")Integer pageSize){
+        return iTaUserAuthButtonService.getAllButton(pageNum, pageSize);
+    }
+
+    /**
+     * 用户授权按钮
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value="/admin/updateAuthButton/{userId}",method= RequestMethod.PUT)
+    public ResponseBean updateUserAuthMenu(@PathVariable Integer userId,
+                                           @RequestBody List<SysButtonInMenu> sysButtonList){
+        return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonList);
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+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.SysMenu;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuController
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserAuthMenuController extends BaseController {
+
+    @Autowired
+    public ITaUserAuthMenuService iTaUserAuthMenuService;
+
+    /**
+     * 根据userId获取菜单列表
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value="/admin/userAuthMenu/{userId}",method= RequestMethod.GET)
+    public ResponseBean  getMenuByUserId(@RequestParam("pageNum")Integer pageNum,
+                                         @RequestParam("pageSize")Integer pageSize,
+                                         @PathVariable String userId){
+        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId);
+    }
+
+    /**
+     * 获取所有菜单
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/menuList",method= RequestMethod.GET)
+    public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
+                                      @RequestParam("pageSize")Integer pageSize){
+        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize);
+    }
+
+    /**
+     * 用户授权菜单
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value="/admin/updateAuthMenu/{userId}",method= RequestMethod.PUT)
+    public ResponseBean updateUserAuthMenu(@PathVariable Integer userId,
+                                           @RequestBody List<SysMenu> sysMenuList){
+        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList);
+    }
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserAuthButtonMapper.java

@@ -0,0 +1,40 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: TaUserAuthButtonMapper
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@Mapper
+public interface TaUserAuthButtonMapper  extends BaseMapper<SysButtonInMenu> {
+    /**
+     * 根据用户Id查询按钮列表
+     * @param page
+     * @param userId
+     * @return
+     */
+    IPage<SysButtonInMenu> sysButtonListByUserId(Page page, @Param("userId")String userId);
+
+
+    /**
+     * 根据角色Id查询按钮列表
+     * @param page
+     * @return
+     */
+    IPage<SysButtonInMenu> sysButtonListByRoleId(Page page);
+
+    void deleteUserAuthButton(@Param("userId") Integer userId);
+
+    void addUserAuthButton(@Param("userId") Integer userId, @Param("sysButtons") List<SysButtonInMenu> sysButtonInMenus);
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserAuthMenuMapper.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuMapper
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@Mapper
+public interface TaUserAuthMenuMapper extends BaseMapper<SysMenu> {
+    /**
+     * 根据用户Id查询菜单列表
+     * @param page
+     * @param userId
+     * @return
+     */
+    IPage<SysMenu> sysMenuListByUserId(Page page, @Param("userId")String userId);
+
+
+    /**
+     * 根据角色Id查询菜单列表
+     * @param page
+     * @return
+     */
+    IPage<SysMenu> sysMenuListByRoleId(Page page);
+
+    /**
+     * 删除授权的菜单
+     * @param userId
+     */
+    void deleteUserAuthMenu(@Param("userId") Integer userId);
+
+    /**
+     * 新增授权的菜单
+     * @param userId
+     */
+    void addUserAuthMenu(@Param("userId") Integer userId, @Param("sysMenus") List<SysMenu> sysMenuList);
+}

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

@@ -0,0 +1,22 @@
+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 java.util.List;
+
+/**
+ * @author admin
+ * @Title: ITaUserAuthButtonService
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+public interface ITaUserAuthButtonService extends IService<SysButtonInMenu> {
+
+    ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId);
+
+    ResponseBean getAllButton(Integer pageNum, Integer pageSize);
+
+    ResponseBean updateUserAuthButton(Integer userId, List<SysButtonInMenu> sysButtonInMenus);
+}

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

@@ -0,0 +1,22 @@
+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.SysMenu;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: ITaUserAuthMenuService
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+public interface ITaUserAuthMenuService extends IService<SysMenu> {
+
+    ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId);
+
+    ResponseBean getAllMenu(Integer pageNum, Integer pageSize);
+
+    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList);
+}

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

@@ -0,0 +1,97 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserAuthButtonMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: TaUserAuthButtonServiceImpl
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@Service
+public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMapper, SysButtonInMenu> implements ITaUserAuthButtonService {
+
+    @Autowired
+    TaUserAuthButtonMapper taUserAuthButtonMapper;
+    @Autowired
+    TaRoleButtonMapper taRoleButtonMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Override
+    public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId) {
+        Page<SysMenu> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByUserId(page, userId).getRecords();
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean getAllButton(Integer pageNum, Integer pageSize) {
+        Page<SysButtonInMenu> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<SysButtonInMenu> sysMenuIPage = taUserAuthButtonMapper.sysButtonListByRoleId(page);
+        List<SysButtonInMenu> records = sysMenuIPage.getRecords();
+
+        QueryWrapper<TaRoleButton> queryWrapper = new QueryWrapper();
+        List<TaRoleButton> taRoleButtons = taRoleButtonMapper.selectList(queryWrapper);
+
+        for (SysButtonInMenu sysButtonInMenu : records){
+            ArrayList<Integer> roles = new ArrayList<>();
+            for (TaRoleButton taRoleButton : taRoleButtons){
+                if (sysButtonInMenu.getBtnId().equals(taRoleButton.getBtnId())){
+                    roles.add(taRoleButton.getBtnId());
+                }
+            }
+            sysButtonInMenu.setRoles(roles);
+        }
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean updateUserAuthButton(Integer userId, List<SysButtonInMenu> sysButtonInMenus) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 人员
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (null == taUser) {
+            responseBean.addError("授权人不存在");
+            return responseBean;
+        }
+
+        try{
+            //授权菜单按钮，先删除在新增
+            taUserAuthButtonMapper.deleteUserAuthButton(userId);
+            taUserAuthButtonMapper.addUserAuthButton(userId, sysButtonInMenus);
+            responseBean.addSuccess("操作成功");
+            return  responseBean;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+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.TaRoleMenu;
+import com.huiju.estateagents.mapper.TaRoleMenuMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuServiceImpl
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@Service
+public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper, SysMenu> implements ITaUserAuthMenuService {
+
+
+    @Autowired
+    private TaUserAuthMenuMapper taUserAuthMenuMapper;
+    @Autowired
+    private TaRoleMenuMapper taRoleMenuMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    /**
+     * 根据用户id获取授权菜单
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @return
+     */
+    @Override
+    public ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId) {
+        Page<SysMenu> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<SysMenu> sysMenuIPage = taUserAuthMenuMapper.sysMenuListByUserId(page, userId);
+        List<SysMenu> records = sysMenuIPage.getRecords();
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize) {
+        Page<SysMenu> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<SysMenu> sysMenuIPage = taUserAuthMenuMapper.sysMenuListByRoleId(page);
+        List<SysMenu> records = sysMenuIPage.getRecords();
+
+        QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
+        List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);
+
+        for (SysMenu sysMenu : records){
+            ArrayList<Integer> roles = new ArrayList<>();
+            for (TaRoleMenu taRoleMenu : taRoleMenus){
+                if (taRoleMenu.getMenuId().equals(sysMenu.getMenuId())){
+                    roles.add(taRoleMenu.getRoleId());
+                }
+            }
+            sysMenu.setRoles(roles);
+        }
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 人员
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (null == taUser) {
+            responseBean.addError("授权人不存在");
+            return responseBean;
+        }
+
+        try{
+            //授权菜单，先删除在新增
+            taUserAuthMenuMapper.deleteUserAuthMenu(userId);
+            taUserAuthMenuMapper.addUserAuthMenu(userId, sysMenuList);
+            responseBean.addSuccess("操作成功");
+            return  responseBean;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+
+    }
+
+}

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

@@ -1,12 +1,14 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -46,5 +48,6 @@ public class SysButtonInMenu implements Serializable {
 
     private String code;
 
-
+    @TableField(exist = false)
+    private List<Integer> roles;
 }

src/main/java/com/huiju/estateagents/entity/SysMenu.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -75,4 +76,10 @@ public class SysMenu implements Serializable {
      */
     @TableField(exist = false)
     private Boolean hasRights;
+
+    /**
+     * 是否有权限
+     */
+    @TableField(exist = false)
+    private List<Integer> roles;
 }

src/main/resources/mapper/TaUserAuthButtonMapper.xml

@@ -0,0 +1,60 @@
+<?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.center.taUser.mapper.TaUserAuthButtonMapper">
+
+    <sql id="queryColumn">
+		t.btn_id,
+		t.menu_id,
+		t.name,
+		t.status,
+		t.code
+	</sql>
+
+    <select id="sysButtonListByUserId" resultType="com.huiju.estateagents.entity.SysButtonInMenu">
+        select
+          <include refid="queryColumn"></include>
+        from
+          sys_button_in_menu t
+        where
+            t.btn_id in (
+                SELECT
+                a.role_id
+                from
+                ta_role_button a
+                where
+                a.role_id in (
+                    select
+                    role_id
+                    from
+                    ta_user_role b
+                    where
+                    b.user_id = #{userId}
+                )
+            )
+    </select>
+
+    <select id="sysButtonListByRoleId" resultType="com.huiju.estateagents.entity.SysButtonInMenu">
+        select
+          <include refid="queryColumn"></include>
+        from
+        sys_button_in_menu t
+    </select>
+
+    <delete id="deleteUserAuthButton">
+      delete from ta_role_button where role_id in (
+        select role_id from ta_user_role r where r.user_id = #{userId}
+      )
+    </delete>
+
+    <update id="addUserAuthButton">
+        <foreach item="item" index="index" collection="sysButtons" separator=";" >
+            insert into ta_role_button (role_id, btn_id)
+            values
+            (
+            (select role_id from ta_user_role u where u.user_id = #{userId}),
+            #{item.btnId}
+            )
+        </foreach>
+    </update>
+
+</mapper>

src/main/resources/mapper/TaUserAuthMenuMapper.xml

@@ -0,0 +1,67 @@
+<?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.center.taUser.mapper.TaUserAuthMenuMapper">
+
+    <sql id="queryColumn">
+		t.menu_id,
+		t.code,
+		t.name,
+		t.parent_code,
+		t.icon,
+		t.app_type,
+		t.status,
+		t.menu_root
+	</sql>
+
+    <select id="sysMenuListByUserId" resultType="com.huiju.estateagents.entity.SysMenu">
+        select
+          <include refid="queryColumn"></include>
+        from
+            sys_menu t
+        where
+            t.menu_id in (
+                SELECT
+                    a.menu_id
+                from
+                    ta_role_menu a
+                where
+                    a.role_id in (
+                        select
+                            role_id
+                        from
+                            ta_user_role b
+                        where
+                            b.user_id = #{userId}
+                    )
+            )
+        order by t.sort_num desc
+    </select>
+
+    <select id="sysMenuListByRoleId" resultType="com.huiju.estateagents.entity.SysMenu">
+        select
+          <include refid="queryColumn"></include>
+        from
+          sys_menu t
+        where
+          t.app_type = 'estateagent-admin'
+          order by t.sort_num
+    </select>
+
+    <delete id="deleteUserAuthMenu">
+      delete from ta_role_menu where role_id in (
+        select role_id from ta_user_role r where r.user_id = #{userId}
+      )
+    </delete>
+
+    <update id="addUserAuthMenu">
+        <foreach item="item" index="index" collection="sysMenus" separator=";" >
+            insert into ta_role_menu (role_id, menu_id)
+            values
+            (
+              (select role_id from ta_user_role u where u.user_id = #{userId}),
+               #{item.menuId}
+            )
+        </foreach>
+    </update>
+
+</mapper>