取消分页查询

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

@@ -4,10 +4,10 @@ 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 javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -27,14 +27,14 @@ public class TaUserAuthButtonController extends BaseController {
      * 根据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);
+    @RequestMapping(value="/admin/userAuthButton",method= RequestMethod.GET)
+    public ResponseBean getButtonByUserId(HttpServletRequest servletRequest,
+                                          @RequestParam("pageNum")Integer pageNum,
+                                          @RequestParam("pageSize")Integer pageSize){
+        Integer userId = getUserId(servletRequest);
+        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId.toString());
     }
 
 
@@ -52,12 +52,12 @@ public class TaUserAuthButtonController extends BaseController {
 
     /**
      * 用户授权按钮
-     * @param userId
      * @return
      */
-    @RequestMapping(value="/admin/updateAuthButton/{userId}",method= RequestMethod.PUT)
-    public ResponseBean updateUserAuthMenu(@PathVariable Integer userId,
+    @RequestMapping(value="/admin/updateAuthButton",method= RequestMethod.PUT)
+    public ResponseBean updateUserAuthMenu(HttpServletRequest request,
                                            @RequestBody List<SysButtonInMenu> sysButtonList){
+        Integer userId = getUserId(request);
         return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonList);
     }
 }

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.entity.SysMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -26,14 +27,14 @@ public class TaUserAuthMenuController extends BaseController {
      * 根据userId获取菜单列表
      * @param pageNum
      * @param pageSize
-     * @param userId
      * @return
      */
-    @RequestMapping(value="/admin/userAuthMenu/{userId}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/userAuthMenu",method= RequestMethod.GET)
     public ResponseBean  getMenuByUserId(@RequestParam("pageNum")Integer pageNum,
                                          @RequestParam("pageSize")Integer pageSize,
-                                         @PathVariable String userId){
-        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId);
+                                         HttpServletRequest request){
+        Integer userId = getUserId(request);
+        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId.toString());
     }
 
     /**
@@ -50,12 +51,12 @@ public class TaUserAuthMenuController extends BaseController {
 
     /**
      * 用户授权菜单
-     * @param userId
      * @return
      */
-    @RequestMapping(value="/admin/updateAuthMenu/{userId}",method= RequestMethod.PUT)
-    public ResponseBean updateUserAuthMenu(@PathVariable Integer userId,
+    @RequestMapping(value="/admin/updateAuthMenu",method= RequestMethod.PUT)
+    public ResponseBean updateUserAuthMenu(HttpServletRequest request,
                                            @RequestBody List<SysMenu> sysMenuList){
+        Integer userId = getUserId(request);
         return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList);
     }
 }

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

@@ -4,7 +4,6 @@ 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;
 
@@ -20,11 +19,10 @@ import java.util.List;
 public interface TaUserAuthButtonMapper  extends BaseMapper<SysButtonInMenu> {
     /**
      * 根据用户Id查询按钮列表
-     * @param page
      * @param userId
      * @return
      */
-    IPage<SysButtonInMenu> sysButtonListByUserId(Page page, @Param("userId")String userId);
+    List<SysButtonInMenu> sysButtonListByUserId(@Param("userId")String userId);
 
 
     /**
@@ -32,7 +30,7 @@ public interface TaUserAuthButtonMapper  extends BaseMapper<SysButtonInMenu> {
      * @param page
      * @return
      */
-    IPage<SysButtonInMenu> sysButtonListByRoleId(Page page);
+    List<SysButtonInMenu> sysButtonListByRoleId();
 
     void deleteUserAuthButton(@Param("userId") Integer userId);
 

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

@@ -20,19 +20,17 @@ import java.util.List;
 public interface TaUserAuthMenuMapper extends BaseMapper<SysMenu> {
     /**
      * 根据用户Id查询菜单列表
-     * @param page
      * @param userId
      * @return
      */
-    IPage<SysMenu> sysMenuListByUserId(Page page, @Param("userId")String userId);
+    List<SysMenu> sysMenuListByUserId(@Param("userId")String userId);
 
 
     /**
-     * 根据角色Id查询菜单列表
-     * @param page
+     * 查询菜单列表
      * @return
      */
-    IPage<SysMenu> sysMenuListByRoleId(Page page);
+    List<SysMenu> sysMenuListByRoleId();
 
     /**
      * 删除授权的菜单

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

@@ -37,22 +37,13 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
 
     @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();
+        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByUserId(userId);
         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();
+        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByRoleId();
 
         QueryWrapper<TaRoleButton> queryWrapper = new QueryWrapper();
         List<TaRoleButton> taRoleButtons = taRoleButtonMapper.selectList(queryWrapper);

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

@@ -45,24 +45,15 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
      */
     @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();
 
+        List<SysMenu> records = taUserAuthMenuMapper.sysMenuListByUserId(userId);
         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();
+        List<SysMenu> records = taUserAuthMenuMapper.sysMenuListByRoleId();
 
         QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
         List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);