合并

src/main/java/com.huiju.welcome/controller/SysUserController.java

@@ -265,9 +265,9 @@ public class SysUserController extends BaseController {
 
     @ApiOperation(value = "员工管理角色权限添加", notes = "员工管理角色权限添加")
     @RequestMapping(value = "/addUserRole", method = RequestMethod.POST)
-    public ResponseBean userManagement(@RequestParam(value = "phone",required = false) String phone,
+    public ResponseBean userManagement(@RequestParam(value = "userId",required = false) String userId,
                                        @RequestParam(value = "roleId",required = false) List<String> roleId) {
-        ResponseBean userManagement= sysUserService.addUserRole(phone,roleId);
+        ResponseBean userManagement= sysUserService.addUserRole(userId,roleId);
         return userManagement;
     }
 
@@ -311,4 +311,22 @@ public class SysUserController extends BaseController {
         ResponseBean deleteUserRole= sysUserService.deleteUserRole(userId);
         return deleteUserRole;
     }
+
+    @ApiOperation(value = "菜单列表", notes = "菜单列表")
+    @RequestMapping(value = "/sysmenu", method = RequestMethod.GET)
+    public ResponseBean sysmenu(@RequestParam(defaultValue = "1") int pageNum,
+                                       @RequestParam(defaultValue = "10") int pageSize) {
+        IPage<SysMenu> pg = new Page<>(pageNum, pageSize);
+        ResponseBean sysmenu= sysUserService.sysmenu(pg);
+        return sysmenu;
+    }
+
+    @ApiOperation(value = "操作菜单", notes = "操作菜单")
+    @RequestMapping(value = "/sysmenuAdd", method = RequestMethod.POST)
+    public ResponseBean sysmenuAdd(@RequestParam(value = "menuId",required = false) Integer menuId,
+                                   @RequestParam(value = "menuName",required = false) String menuName,
+                                   @RequestParam(value = "Integer",required = false) Integer code) {
+        ResponseBean sysmenu= sysUserService.sysmenuAdd(menuId,menuName,code);
+        return sysmenu;
+    }
 }

src/main/java/com.huiju.welcome/mapper/SysMenuMapper.java

@@ -1,8 +1,10 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.SysMenu;
 import com.huiju.welcome.model.SysRole;
+import com.huiju.welcome.model.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultType;
@@ -35,4 +37,16 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
     List<SysMenu> getAllMenusWithAuthority();
 
+    /**
+     * 菜单列表
+     * @param pg
+     * @return
+     */
+    IPage<SysMenu> selectSysMenu(IPage<SysMenu> pg);
+
+    /**
+     * 添加菜单
+     * @param sysMenu
+     */
+    void updateSysMenu(SysMenu sysMenu);
 }

src/main/java/com.huiju.welcome/service/ISysUserService.java

@@ -3,10 +3,7 @@ package com.huiju.welcome.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.common.base.ResponseBean;
-import com.huiju.welcome.model.SysRole;
-import com.huiju.welcome.model.SysUser;
-import com.huiju.welcome.model.SysUserRole;
-import com.huiju.welcome.model.TaVisitorAppointment;
+import com.huiju.welcome.model.*;
 
 import java.util.Map;
 import java.util.List;
@@ -51,11 +48,10 @@ public interface ISysUserService extends IService<SysUser> {
     Map<String,Object> getProfileWithRights(Integer userId);
     /**
      * 添加角色权限
-     * @param phone
      * @param role
      * @return
      */
-    ResponseBean addUserRole(String phone, List<String> role);
+    ResponseBean addUserRole(String userId, List<String> role);
 
     /**
      * 查询当前员工所有权限
@@ -83,4 +79,18 @@ public interface ISysUserService extends IService<SysUser> {
      * @return
      */
     ResponseBean deleteUserRole(Integer userId);
+
+    /**
+     * 菜单管理
+     * @param pg
+     * @return
+     */
+    ResponseBean sysmenu(IPage<SysMenu> pg);
+
+    /**
+     * 添加当前节点
+     * @param menuId
+     * @return
+     */
+    ResponseBean sysmenuAdd(Integer menuId,String menuName,Integer code);
 }

src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java

@@ -11,6 +11,7 @@ import com.huiju.welcome.utils.StatusUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -92,18 +93,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             put("menus", menus);
         }};
     }
-
-    public ResponseBean addUserRole(String phone, List<String> role) {
+    @Override
+    public ResponseBean addUserRole(String userId, List<String> role) {
         ResponseBean responseBean = new ResponseBean<>();
         String[] strArray = role.toArray(new String[role.size()]);
-        /*查询当前号码是否存在*/
         QueryWrapper<SysUser> sysUserQueryWrapper= new QueryWrapper<>();
-        sysUserQueryWrapper.eq("phone",phone);
+        sysUserQueryWrapper.eq("user_id",userId);
         SysUser sysUser = sysUserMapper.selectOne(sysUserQueryWrapper);
-        if (null == sysUser){
-            responseBean.addError("此号码不存在");
-            return responseBean;
-        }
         // 查询当前人员角色权限是否存在
         List<SysUserRole> sysUserRole= sysUserRoleMapper.selectListSysUserRole(sysUser.getUserId());
         if (sysUserRole!=null && !sysUserRole.isEmpty()){
@@ -172,4 +168,36 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         responseBean.addSuccess(sysUserRole);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean sysmenu(IPage<SysMenu> pg) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<SysMenu> list = sysMenuMapper.selectSysMenu(pg);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean sysmenuAdd(Integer menuId,String menuName,Integer code) {
+        ResponseBean responseBean= new ResponseBean<>();
+        QueryWrapper<SysMenu> sysMenuQuery= new QueryWrapper<>();
+        sysMenuQuery.eq("menu_id",menuId);
+        // sysMenu 不为空时是父节点信息
+        SysMenu sysMenu= sysMenuMapper.selectOne(sysMenuQuery);
+        if ("".equals(code)&& null!=code){
+            sysMenu.setMenuName(menuName);
+            responseBean.addSuccess("成功");
+            sysMenuMapper.updateSysMenu(sysMenu);
+            return responseBean;
+        }
+        SysMenu menu = new SysMenu();
+                menu.setMenuId(menuId+"")
+                        .setMenuName(menuName)
+                        .setMenuPid(sysMenu.getMenuId())
+                        .setMenuParents(menuId+","+sysMenu.getMenuId())
+                        .setStatus(1).setCreateDate(LocalDateTime.now());
+            sysMenuMapper.insert(menu);
+            responseBean.addSuccess("成功");
+            return responseBean;
+    }
 }

src/main/resources/mapper/SysMenuMapper.xml

@@ -10,4 +10,12 @@
         GROUP BY
             menu_id
     </select>
+
+    <select id="selectSysMenu" resultType="com.huiju.welcome.model.SysMenu">
+        select * from sys_menu
+    </select>
+
+    <select id="updateSysMenu">
+        UPDATE sys_menu SET menu_name = #{menuName}WHERE menu_id =#{menuId}
+    </select>
 </mapper>