角色-菜单

business/base-service/src/main/java/com/yihu/jw/application/dao/BaseApplicationMenuDao.java

@@ -2,6 +2,8 @@ package com.yihu.jw.application.dao;
import com.yihu.jw.entity.base.application.BaseApplicationMenuDO;
import com.yihu.jw.entity.base.area.BaseCityDO;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
@@ -16,6 +18,8 @@ public interface BaseApplicationMenuDao extends JpaRepository<BaseApplicationMen
    @Query("select p from BaseApplicationMenuDO p where p.type = ?1 and p.status=1 order by p.menuSort desc")
    List<BaseApplicationMenuDO> getParentList(String type);
    @Query("from BaseApplicationMenuDO p where  p.name like %?2% and  p.type = ?1  and p.status=1 order by p.menuSort desc")
    List<BaseApplicationMenuDO> getTypeAndNameList(String type,String name);
    @Query("select p from BaseApplicationMenuDO p where p.type = ?1 and p.parentId=?2 and p.status=1 order by p.menuSort desc ")
    List<BaseApplicationMenuDO> getChildBuParent(String type,String parentId);

business/base-service/src/main/java/com/yihu/jw/application/dao/BaseApplicationRoleUserDao.java

@@ -21,4 +21,7 @@ public interface BaseApplicationRoleUserDao extends JpaRepository<BaseApplicatio
    @Query("select p from BaseApplicationRoleUserDO p where p.roleId=?1 ")
    List<BaseApplicationRoleUserDO> findByRoleId(String roleId);
    @Query("select p from BaseApplicationRoleUserDO p where p.roleId=?1 and p.userCode=?2 ")
    BaseApplicationRoleUserDO findByRolIdAnduserCode(String roleId,String userCode);
}

business/base-service/src/main/java/com/yihu/jw/application/service/BaseApplicationMenuService.java

@@ -98,8 +98,13 @@ public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMe
     * @param type
     * @return
     */
    public List<BaseApplicationMenuDO> getMenuTree(String type){
        List<BaseApplicationMenuDO> baseApplicationMenuDOS = applicationMenuDao.getParentList(type);
    public List<BaseApplicationMenuDO> getMenuTree(String type,String name){
        List<BaseApplicationMenuDO> baseApplicationMenuDOS = new ArrayList<>();
        if (StringUtils.isNoneBlank(name)){
            baseApplicationMenuDOS = applicationMenuDao.getTypeAndNameList(type,name);
        }else {
            baseApplicationMenuDOS = applicationMenuDao.getParentList(type);
        }
        Map<String,List<BaseApplicationMenuDO>> map = baseApplicationMenuDOS.stream().collect(Collectors.groupingBy(BaseApplicationMenuDO::getParentId));
        baseApplicationMenuDOS.forEach(menu->{
            List<BaseApplicationMenuDO> tmp = map.get(menu.getId());

business/base-service/src/main/java/com/yihu/jw/application/service/BaseApplicationRoleDictService.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -191,13 +192,16 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
     */
    public List<BaseApplicationRoleUserDO> insertRoleUser(List<BaseApplicationRoleUserDO> roleUserDOS,String uuid) throws Exception {
        if (roleUserDOS!=null&&roleUserDOS.size()!=0){
            String roleId = roleUserDOS.get(0).getRoleId();
            applicationRoleUserDao.deleteByRoleId(roleId);
            List<BaseApplicationRoleUserDO> roleUserDOList = new ArrayList<>();
            UserDO userDO = userDao.findById(uuid).get();
            for (BaseApplicationRoleUserDO roleUserDO:roleUserDOS){
                roleUserDO.setCreateTime(new Date());
                roleUserDO.setCreateUser(uuid);
                roleUserDO.setCreateUserName(userDO.getName());
                BaseApplicationRoleUserDO applicationRoleUserDO = applicationRoleUserDao.findByRolIdAnduserCode(roleUserDO.getRoleId(),roleUserDO.getUserCode());
                if (applicationRoleUserDO!=null){
                    applicationRoleUserDao.deleteById(applicationRoleUserDO.getId());
                }
            }
            return applicationRoleUserDao.saveAll(roleUserDOS);
        }else {
@@ -205,6 +209,11 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
        }
    }
    public void removeRoleUser(String id){
        applicationRoleUserDao.deleteById(id);
    }
    /**
     * 根据角色id获取角色关联的成员
     * @param roleId

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -994,6 +994,8 @@ public class BaseRequestMapping {
        public static final String selectUserByRoleId = "/selectUserByRoleId";
        public static final String selectByCondition = "/selectByCondition";
        public static final String insertRoleUser ="/insertRoleUser";
        public static final String removeRoleUser="/removeRoleUser";
        public static final String selectMenuByRoleId="/selectMenuByRoleId";
        public static final String insertRoleMenu = "/insertRoleMenu";
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/application/BaseApplicationMenuEndpoint.java

@@ -62,8 +62,10 @@ private BaseApplicationMenuService applicationMenuService;
    @ApiOperation(value = "获取资源菜单树型结构")
    public Envelop getMenuTree (
            @ApiParam(name = "type", value = "type", required = true)
            @RequestParam(value = "type") String type) throws Exception {
        return success(applicationMenuService.getMenuTree(type));
            @RequestParam(value = "type") String type,
            @ApiParam(name = "name", value = "name", required = false)
            @RequestParam(value = "name",required = false) String name) throws Exception {
        return success(applicationMenuService.getMenuTree(type,name));
    }
    @GetMapping(value = BaseRequestMapping.ApplicationMenu.selectByCondition)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/application/BaseApplicationRoleDictEndpoint.java

@@ -98,6 +98,15 @@ private BaseApplicationRoleDictService applicationRoleDictService;
        return success(applicationRoleDictService.insertRoleUser(roleUserDOS,uuid));
    }
    @PostMapping(value = BaseRequestMapping.ApplicationRoleDict.removeRoleUser)
    @ApiOperation(value = "角色成员移除")
    public Envelop removeRoleUser (
            @ApiParam(name = "id", value = "主键id", required = true)
            @RequestParam(value = "id") String id) throws Exception {
        applicationRoleDictService.removeRoleUser(id);
        return success("请求成功");
    }
    @PostMapping(value = BaseRequestMapping.ApplicationRoleDict.insertRoleMenu)
    @ApiOperation(value = "角色菜单配置")