Merge branch 'v4' of http://git.ycjcjy.com/welcome/service-welcome3 into v4

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

@@ -0,0 +1,83 @@
+package com.huiju.welcome.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysRole;
+import com.huiju.welcome.service.ISysRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 角色控制器
+ * @author weiximei
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "角色控制器", description = "角色控制器")
+public class SysRoleController {
+
+    @Autowired
+    private ISysRoleService iSysRoleService;
+
+    @ApiOperation("查询角色列表")
+    @GetMapping(value = "/role")
+    public ResponseBean getList(@RequestParam(value = "roleName", required = false) String roleName,
+                                @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return iSysRoleService.getList(roleName, pageNum, pageSize);
+    }
+
+    @ApiOperation("根据角色Id查询")
+    @GetMapping("/roleById")
+    public ResponseBean getRoleId(@RequestParam("roleId") Integer roleId) {
+        return iSysRoleService.getByRoleId(roleId);
+    }
+
+    @ApiOperation("添加角色")
+    @PostMapping("/role")
+    public ResponseBean roleSave(@RequestParam("roleName") String roleName, @RequestParam("menuIds") String [] menuIds) {
+        SysRole sysRole = new SysRole();
+        sysRole.setRoleName(roleName);
+        return iSysRoleService.roleSaveOrUpdate(sysRole, menuIds);
+    }
+
+    @ApiOperation("修改角色")
+    @PutMapping("/role")
+    public ResponseBean roleUpdate(@RequestParam("roleId") Integer roleId,
+                                   @RequestParam("roleName") String roleName,
+                                   @RequestParam("menuIds") String [] menuIds){
+        SysRole sysRole = new SysRole();
+        sysRole.setRoleId(roleId);
+        sysRole.setRoleName(roleName);
+        return iSysRoleService.roleSaveOrUpdate(sysRole, menuIds);
+    }
+
+    @ApiOperation("查询所有菜单")
+    @GetMapping("/menus")
+    public ResponseBean getMenus() {
+        return iSysRoleService.getMenus();
+    }
+
+
+    @ApiOperation("删除角色")
+    @DeleteMapping("/role")
+    public ResponseBean deleteRole(@RequestParam("menuIds") String [] menuIds){
+        ResponseBean responseBean = new ResponseBean();
+        List<SysRole> sysRoleList = Arrays.asList(menuIds).stream().map(e-> {
+            SysRole sysRole = new SysRole();
+            sysRole.setRoleId(Integer.valueOf(e));
+            sysRole.setStatus(-1);
+            return sysRole;
+        }).collect(Collectors.toList());
+        iSysRoleService.updateBatchById(sysRoleList);
+
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+}

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) String menuId,
+                                   @RequestParam(value = "menuName",required = false) String menuName,
+                                   @RequestParam(value = "Integer",required = false) String code) {
+        ResponseBean sysmenu= sysUserService.sysmenuAdd(menuId,menuName,code);
+        return sysmenu;
+    }
 }

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

@@ -1,8 +1,16 @@
 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;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 import java.util.List;
 
@@ -16,5 +24,28 @@ import java.util.List;
  */
 @Mapper
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
+
+    /**
+     * 根据角色ID查询所有菜单
+     * @param roleId
+     * @return
+     */
+    @ResultType(SysMenu.class)
+    @Select("select * from sys_role_menu srm left join sys_menu sm on srm.menu_id = sm.menu_id where srm.role_id=#{roleId} and menu_pid != -1")
+    List<SysMenu> selectRoleMenuList(@Param("roleId") Integer roleId);
+
+
     List<SysMenu> getAllMenusWithAuthority();
+
+    /**
+     * 菜单列表
+     * @param pg
+     * @return
+     */
+    IPage<SysMenu> selectSysMenu(IPage<SysMenu> pg);
+
+    /**
+     * 添加菜单
+     */
+    void updateSysMenu(@Param("menuId") String menuId,@Param("menuName") String menuName);
 }

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

@@ -3,6 +3,9 @@ package com.huiju.welcome.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.SysRoleMenu;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
 
+    /**
+     * 批量添加
+     * @param sysRoleMenuList
+     */
+    void insertBeach(@Param("sysRoleMenuList") List<SysRoleMenu> sysRoleMenuList);
+
 }

src/main/java/com.huiju.welcome/model/SysMenu.java

@@ -2,6 +2,7 @@ package com.huiju.welcome.model;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
@@ -41,6 +42,12 @@ public class SysMenu implements Serializable {
     /*创建*/
     private LocalDateTime createDate;
 
+    /**
+     * 子节点
+     */
+    @TableField(exist = false)
+    private List<SysMenu> children;
+
     // 角色列表, 逗号连接
     @TableField(exist = false)
     String authority;

src/main/java/com.huiju.welcome/model/SysRole.java

@@ -1,9 +1,12 @@
 package com.huiju.welcome.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -33,5 +36,10 @@ public class SysRole implements Serializable {
     /*创建*/
     private LocalDateTime createDate;
 
+    /**
+     * 菜单列表
+     */
+    @TableField(exist = false)
+    private List<SysMenu> menuList;
 
 }

src/main/java/com.huiju.welcome/model/SysRoleMenu.java

@@ -1,8 +1,11 @@
 package com.huiju.welcome.model;
 
 import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 /**
@@ -16,6 +19,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
 public class SysRoleMenu implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -0,0 +1,43 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysMenu;
+import com.huiju.welcome.model.SysRole;
+
+import java.util.List;
+
+/**
+ * 角色业务
+ * @author weiximei
+ */
+public interface ISysRoleService extends IService<SysRole> {
+
+    /**
+     * 获取角色
+     * @param roleName
+     * @return
+     */
+    ResponseBean getList(String roleName, Integer pageNum, Integer pageSize);
+
+    /**
+     * 根据id查询角色
+     * @param roleId
+     * @return
+     */
+    ResponseBean getByRoleId(Integer roleId);
+
+    /**
+     * 添加或修改
+     * @param role
+     * @param menuIds
+     * @return
+     */
+    ResponseBean roleSaveOrUpdate(SysRole  role, String [] menuIds);
+
+    /**
+     * 查询出所有菜单
+     * @return
+     */
+    ResponseBean getMenus();
+}

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(String menuId,String menuName,String code);
 }

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

@@ -0,0 +1,131 @@
+package com.huiju.welcome.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.welcome.common.base.ResponseBean;
+import com.huiju.welcome.mapper.SysMenuMapper;
+import com.huiju.welcome.mapper.SysRoleMapper;
+import com.huiju.welcome.mapper.SysRoleMenuMapper;
+import com.huiju.welcome.model.SysMenu;
+import com.huiju.welcome.model.SysRole;
+import com.huiju.welcome.model.SysRoleMenu;
+import com.huiju.welcome.service.ISysRoleService;
+import org.apache.commons.lang3.StringUtils;
+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;
+import java.util.stream.Collectors;
+
+/**
+ * 角色业务
+ * @author weiximei
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+
+    @Autowired
+    private SysMenuMapper sysMenuMapper;
+
+    @Autowired
+    private SysRoleMenuMapper sysRoleMenuMapper;
+
+    @Override
+    public ResponseBean getList(String roleName, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<SysRole> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(roleName), "role_name", roleName);
+        IPage<SysRole> sysRoleIPage = this.page(page, queryWrapper);
+        responseBean.addSuccess(sysRoleIPage);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getByRoleId(Integer roleId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        SysRole role = this.getById(roleId);
+        if (null ==  role) {
+            responseBean.addError("角色不存在！");
+            return responseBean;
+        }
+
+        // 查询出该角色下所有菜单
+        List<SysMenu> sysMenus = sysMenuMapper.selectRoleMenuList(role.getRoleId());
+        role.setMenuList(sysMenus);
+        responseBean.addSuccess(role);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean roleSaveOrUpdate(SysRole role, String [] menuIdArray) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 存在roleId表示修改，否则添加
+        if (null == role.getRoleId()) {
+            role.setCreateDate(LocalDateTime.now());
+            role.setStatus(1);
+        }
+
+        boolean result = this.saveOrUpdate(role);
+        if (!result) {
+            responseBean.addError("角色修改错误！");
+            return responseBean;
+        }
+
+        // 删除菜单，并重新添加
+
+
+        QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("role_id", role.getRoleId());
+        sysRoleMenuMapper.delete(queryWrapper);
+
+        List<SysRoleMenu> sysRoleMenuList = Arrays.asList(menuIdArray).stream()
+                .map(e -> new SysRoleMenu(role.getRoleId(), e + ""))
+                .collect(Collectors.toList());
+        sysRoleMenuMapper.insertBeach(sysRoleMenuList);
+
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getMenus() {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("menu_pid","-1");
+        queryWrapper.eq("status","1");
+        List<SysMenu> sysMenus = sysMenuMapper.selectList(queryWrapper);
+        getMenuChildren(sysMenus);
+        responseBean.addSuccess(sysMenus);
+        return responseBean;
+    }
+
+    /**
+     * 查询子节点
+     * @param sysMenus
+     */
+    private void getMenuChildren(List<SysMenu> sysMenus) {
+        sysMenus.forEach(e -> {
+            QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("menu_pid",e.getMenuId());
+            queryWrapper.eq("status","1");
+            List<SysMenu> sysMenuChildren = sysMenuMapper.selectList(queryWrapper);
+            if (null != sysMenuChildren) {
+                getMenuChildren(sysMenuChildren);
+            }
+            e.setChildren(sysMenuChildren);
+        });
+    }
+}

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(String menuId,String menuName,String 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(menuId,menuName);
+            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>

src/main/resources/mapper/SysRoleMenuMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.welcome.mapper.SysRoleMenuMapper">
 
+    <insert id="insertBeach">
+        insert into sys_role_menu(role_id, menu_id) values
+        <foreach collection="sysRoleMenuList" index="index" item="item" separator=",">
+            (#{item.roleId},#{item.menuId})
+        </foreach>
+    </insert>
+
 </mapper>