Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/MenuDO.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * @author progr1mmer
@@ -39,6 +40,7 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
	 * 父级ID
	 */
	private String parentId;
	private String parentName;
	/**
	 * 状态
	 */
@@ -142,4 +144,13 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
	public void setShow(Integer show) {
		this.show = show;
	}
	@Transient
	public String getParentName() {
		return parentName;
	}
	public void setParentName(String parentName) {
		this.parentName = parentName;
	}
}

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

@@ -86,6 +86,7 @@ public class BaseRequestMapping {
        public static final String STATUS  = "/status";
        public static final String IS_NAME_EXIST  = "/isNameExist";
        public static final String FIND_ALL  = "/findAll";
        public static final String GET_TREE  = "/getTree";
    }
@@ -188,6 +189,7 @@ public class BaseRequestMapping {
        public static final String IS_NAME_EXIST  = "/isNameExist";
        public static final String MOVE_UP  = "/moveUp";
        public static final String MOVE_DOWN  = "/moveDown";
        public static final String GET_TREE  = "/getTree";
        public static final String FIND_ALL  = "/findAll";
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/role/MenuVO.java

@@ -25,6 +25,8 @@ public class MenuVO extends UuidIdentityVOWithOperator {
    private Integer sort;
    @ApiModelProperty(value = "父级ID", example = "父级ID")
    private String parentId;
    @ApiModelProperty(value = "父级名称", example = "父级名称")
    private String parentName;
    @ApiModelProperty(value = "状态", example = "1生效，0失效")
    private Integer status;
    @ApiModelProperty(value = "备注", example = "说明")
@@ -105,4 +107,12 @@ public class MenuVO extends UuidIdentityVOWithOperator {
    public void setChildren(List<MenuVO> children) {
        this.children = children;
    }
    public String getParentName() {
        return parentName;
    }
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/contant/CommonContant.java

@@ -10,6 +10,10 @@ public class CommonContant {
     * 默认父类id 0
     */
    public static final String DEFAULT_PARENTID = "0";
    /**
     * 默认父类无
     */
    public static final String DEFAULT_PARENTNAME = "无";
    //是否必选0-表示非必选，1-表示必选
    public static final String IS_MUST = "1";
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/MenuEndpoint.java

@@ -127,19 +127,64 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Menu.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<MenuVO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<MenuDO> menuDOS = menuService.search(fields, filters, sorts);
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = false) String id) throws Exception {
        String filters = "";
        if(StringUtils.isNotBlank(id)){
            filters = "parentId="+id+";";
        }
        List<MenuDO> menuDOS = menuService.search(null, filters, "+sort");
        MenuDO menuDO = menuService.findOne(id);
        menuDOS.forEach(menu -> {
            if(CommonContant.DEFAULT_PARENTID.equals(menu.getParentId())){
                menu.setParentName(CommonContant.DEFAULT_PARENTNAME);
            }else {
                menu.setParentName(menuDO.getName());
            }
        });
        return success(menuDOS, MenuVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Module.FIND_ALL)
    @GetMapping(value = BaseRequestMapping.Menu.FIND_ALL)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<MenuVO> findAll (
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "name", value = "名称")
            @RequestParam(value = "name", required = false) String name) throws Exception {
        String filters = "";
        if(StringUtils.isNotBlank(status)){
            filters = "status="+status+";";
        }
        if(StringUtils.isNotBlank(name)){
            filters += "name?"+name+";";
        }
        List<MenuDO> menuDOs = menuService.search(null, filters, "+sort");
        List<MenuVO> menuVOs = convertToModels(menuDOs,new ArrayList<>(menuDOs.size()), MenuVO.class);
        menuVOs.forEach(menuVO -> {
            if(CommonContant.DEFAULT_PARENTID.equals(menuVO.getParentId())){
                menuVO.setParentName(CommonContant.DEFAULT_PARENTNAME);
            }else {
                MenuDO menuDO = menuService.findOne(menuVO.getParentId());
                menuVO.setParentName(menuDO.getName());
            }
        });
        Map<String,List<MenuVO>> map = menuVOs.stream().collect(Collectors.groupingBy(MenuVO::getParentId));
        menuVOs.forEach(menu->{
            List<MenuVO> tmp = map.get(menu.getId());
            menu.setChildren(tmp);
        });
        if(StringUtils.isBlank(name)){
            menuVOs = menuVOs.stream()
                    .filter(menu -> CommonContant.DEFAULT_PARENTID.equals(menu.getParentId()))
                    .collect(Collectors.toList());
        }
        return success(menuVOs);
    }
    @GetMapping(value = BaseRequestMapping.Menu.GET_TREE)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<MenuVO> getTree (
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status) throws Exception {
        String filters = null;

svr/svr-base/src/main/java/com/yihu/jw/base/service/role/MenuService.java

@@ -87,4 +87,8 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
    public int isExistName(String name){
        return menuDao.isExistName(name);
    }
    public MenuDO findOne(String id){
        return menuDao.findOne(id);
    }
}