智能看板常用功能查询接口

src/main/java/com/sky/ioc/controller/system/MenuController.java

@@ -26,4 +26,10 @@ public class MenuController {
         return menuService.getMenusInfoList(parentId);
     }
 
+    @ApiOperation("查询常用菜单")
+    @GetMapping("getCommonMenus")
+    public ReturnMsg getCommonMenus(@RequestParam(value = "userId", required=true)  Integer userId){
+        return menuService.listByUserId(userId);
+    }
+
 }

src/main/java/com/sky/ioc/controller/system/UserController.java

@@ -58,13 +58,6 @@ public class UserController {
         return userService.phoneLogin(loginParam.getPhone(), loginParam.getCode());
     }
 
-    @ApiOperation("当前用户常用菜单")
-    @PostMapping("getCommonMenus")
-    public ReturnMsg getCommonMenus(@RequestParam(value = "userID")  long userID){
-
-
-        return userService.getUserInfoById(userID);
-    }
 
     public static void main(String[] args) {
         String pwd = "135246";

src/main/java/com/sky/ioc/mapper/system/MenuMapper.java

@@ -23,6 +23,6 @@ public interface MenuMapper extends BaseMapper<Menus> {
             " select * from menus " +
             " where id in (<foreach collection='ids' item='id' index='no' separator=','>#{id}</foreach>) "
             + "</script>")
-    List<Menus> getListByIds(String ids);
+    List<Menus> getListByIds(@Param("ids") List<Integer> ids);
 
 }

src/main/java/com/sky/ioc/mapper/system/UserMapper.java

@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Update;
 public interface UserMapper extends BaseMapper<Users> {
     @Update("update  users set common_menus=#{menuIDs} WHERE id=#{userId} ")
     Integer updateCommonMenusByUserIdAndMenuId(@Param("userId") long userId,@Param("menuIDs")  String menuIDs);
-    @Select("select * from users ")
+    @Select("select * from users where id = #{userId} ")
     Users getUsersById(@Param("userId") long userId);
 
 }

src/main/java/com/sky/ioc/service/system/MenuService.java

@@ -10,5 +10,5 @@ public interface MenuService {
 
     List<Menus> listWithTree(List<Menus> list,long parentId);
 
-    List<Menus> listByIds(String ids);
+    ReturnMsg listByUserId(Integer userId);
 }

src/main/java/com/sky/ioc/service/system/UserService.java

@@ -16,7 +16,6 @@ public interface UserService {
 
     ReturnMsg phoneLogin(String phone, String code);
 
-    ReturnMsg getUserInfoById(long userId);
 
     ReturnMsg getUserData();
 }

src/main/java/com/sky/ioc/service/system/impl/MenuServiceImpl.java

@@ -1,13 +1,16 @@
 package com.sky.ioc.service.system.impl;
 
 import com.sky.ioc.entity.domain.system.Menus;
+import com.sky.ioc.entity.domain.system.Users;
 import com.sky.ioc.mapper.system.MenuMapper;
+import com.sky.ioc.mapper.system.UserMapper;
 import com.sky.ioc.service.system.MenuService;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class MenuServiceImpl implements MenuService {
@@ -15,6 +18,9 @@ public class MenuServiceImpl implements MenuService {
     @Autowired
     MenuMapper menuMapper;
 
+    @Autowired
+    UserMapper userMapper;
+
 
     @Override
     public ReturnMsg getMenusInfoList(long parentId) {
@@ -44,8 +50,24 @@ public class MenuServiceImpl implements MenuService {
      }
 
     @Override
-    public List<Menus> listByIds(String ids) {
-        return  menuMapper.getListByIds(ids);
+    public ReturnMsg listByUserId(Integer userId) {
+        Users users = userMapper.getUsersById(userId);
+        if(users!=null){
+            List<Integer> ids = new ArrayList<>();
+            if(users.getCommonMenus()!=null&&!users.getCommonMenus().isEmpty()){
+               List<String> lists = Arrays.stream(users.getCommonMenus().split(",")).collect(Collectors.toList());
+               for(String id:lists){
+                   ids.add(Integer.parseInt(id));
+               }
+                List<Menus> menus =  menuMapper.getListByIds(ids);
+                return ReturnMsg.ok(menus);
+            }else{
+                return ReturnMsg.ok();
+            }
+
+        }else{
+            return ReturnMsg.fail("用户不存在");
+        }
     }
 }
 

src/main/java/com/sky/ioc/service/system/impl/UserServiceImpl.java

@@ -138,15 +138,7 @@ public class UserServiceImpl implements UserService {
         return ReturnMsg.ok(jsonObject, "登录成功");
     }
 
-    @Override
-    public ReturnMsg getUserInfoById(long userId) {
-        Users users = userMapper.selectOne(new LambdaQueryWrapper<Users>().eq(Users::getId, userId));
-        if(users!=null&&!users.getCommonMenus().isEmpty()){
-            List<Menus> menus = menuMapper.getListByIds(users.getCommonMenus());
-          //  users.set
-        }
-        return ReturnMsg.ok(users);
-    }
+
 
     @Override
     public ReturnMsg getUserData() {