Merge branch 'dev' of trick9191/wlyy2.0 into dev

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

@@ -198,6 +198,7 @@ public class BaseRequestMapping {
        public static final String GET_TREE  = "/getTree";
        public static final String FIND_ALL  = "/findAll";
        public static final String findRoleMenuTree  = "/findRoleMenuTree";
        public static final String findLoginRoleMenuTree  = "/findLoginRoleMenuTree";
    }
    /**

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/WxWechatVO.java

@@ -22,6 +22,41 @@ public class WxWechatVO {
    private Integer status;
    @ApiModelProperty(value = "对接类型")
    private Integer publicType;
    @ApiModelProperty(value = "token")
    private String token;//token
    @ApiModelProperty(value = "加密密钥")
    private String encodingAesKey;//加密密钥
    @ApiModelProperty(value = "加密方式  0:明文模式   1:兼容模式   2:安全模式")
    private Integer encType;//加密方式  0:明文模式   1:兼容模式   2:安全模式
    @ApiModelProperty(value = "1：服务号 2 订阅号")
    private String type;//'1：服务号 2 订阅号
    @ApiModelProperty(value = "微信app_id")
    private String appId;//'微信app_id'
    @ApiModelProperty(value = "微信app_secret")
    private String appSecret;//'微信app_secret'
    @ApiModelProperty(value = "原始ID")
    private String appOriginId;//原始ID
    @ApiModelProperty(value = "微信base_url")
    private String baseUrl;//'微信base_url'
    @ApiModelProperty(value = "公总号登录账户")
    private String userName;//公总号登录账户
    @ApiModelProperty(value = "用户密码")
    private String password;//用户密码
    //创建时间
    protected Date createTime;
    //创建者
    protected String createUser;
    //创建者
    protected String createUserName;
    //更新时间
    protected Date updateTime;
    //更新者
    protected String updateUser;
    //更新者
    protected String updateUserName;
    @ApiModelProperty(value = "租户")
    private List<WxSaasVO> saas;
@@ -72,4 +107,84 @@ public class WxWechatVO {
    public void setSaas(List<WxSaasVO> saas) {
        this.saas = saas;
    }
    public String getToken() {
        return token;
    }
    public void setToken(String token) {
        this.token = token;
    }
    public String getEncodingAesKey() {
        return encodingAesKey;
    }
    public void setEncodingAesKey(String encodingAesKey) {
        this.encodingAesKey = encodingAesKey;
    }
    public Integer getEncType() {
        return encType;
    }
    public void setEncType(Integer encType) {
        this.encType = encType;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public String getAppSecret() {
        return appSecret;
    }
    public void setAppSecret(String appSecret) {
        this.appSecret = appSecret;
    }
    public String getAppOriginId() {
        return appOriginId;
    }
    public void setAppOriginId(String appOriginId) {
        this.appOriginId = appOriginId;
    }
    public String getBaseUrl() {
        return baseUrl;
    }
    public void setBaseUrl(String baseUrl) {
        this.baseUrl = baseUrl;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
}

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

@@ -280,4 +280,33 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
        }
        return false;
    }
    @GetMapping(value = BaseRequestMapping.Menu.findLoginRoleMenuTree)
    @ApiOperation(value = "获取角色登录菜单")
    public ListEnvelop<MenuVO> findLoginRoleMenuTree (
            @ApiParam(name = "roleId", value = "角色id")
            @RequestParam(value = "roleId", required = false)String roleId) throws Exception {
        List<MenuVO> menuVOs = roleMenuService.findMenuByRoleId(roleId);
        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);
        });
        menuVOs = menuVOs.stream()
                .filter(menu -> CommonContant.DEFAULT_PARENTID.equals(menu.getParentId()))
                .collect(Collectors.toList());
        return success(menuVOs);
    }
}

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

@@ -53,11 +53,11 @@ public class RoleEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.Module.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Module.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
            @ApiParam(name = "jsonData", value = "实体json", required = true)
            @RequestParam(value = "jsonData") String jsonData) throws Exception {
        RoleDO roleDO = toEntity(jsonData, RoleDO.class);
        if (null == roleDO.getId()) {
            return failed("ID不能为空", Envelop.class);

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

@@ -2,8 +2,11 @@ package com.yihu.jw.base.service.role;
import com.yihu.jw.base.dao.role.RoleMenuDao;
import com.yihu.jw.entity.base.role.RoleMenuDO;
import com.yihu.jw.restmodel.base.role.MenuVO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -17,8 +20,30 @@ public class RoleMenuService extends BaseJpaService<RoleMenuDO, RoleMenuDao> {
    @Autowired
    private RoleMenuDao roleMenuDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public List<RoleMenuDO> findRoleMenu(String roleId){
        return roleMenuDao.findByRoleId(roleId);
    }
    public List<MenuVO> findMenuByRoleId(String roleId){
        String sql ="SELECT " +
                " m.id, " +
                " m.parent_id AS parentId, " +
                " m.name, " +
                " m.sort, " +
                " m.url, " +
                " m.`status`," +
                " m.icon" +
                " FROM " +
                " base_menu m " +
                " JOIN base_role_menu r ON m.id = r.menu_id " +
                " WHERE " +
                " r.role_id = '"+roleId+"' " +
                " AND STATUS =1";
        List<MenuVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(MenuVO.class));
        return list;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -129,47 +129,58 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        Map<String,Object> userinfo = new HashedMap();
        UserDO user = userDao.findOne(id);
        RoleDO role = roleDao.findByCode(user.getRoleCode());
        userinfo.put("id",user.getId());
        userinfo.put("name",user.getName());
        userinfo.put("role",role.getName());
        userinfo.put("roleCode",role.getCode());
        userinfo.put("system",role.getSystem());
        if("admin".equals(role.getCode())){
        if(user!=null){
            userinfo.put("id",user.getId());
            userinfo.put("name",user.getName());
        }
        }else if("saasAdmin".equals(role.getCode())){
        //获取角色
        RoleDO role = roleDao.findOne(user.getRoleCode());
        if(role!=null){
            userinfo.put("role",role.getId());
            userinfo.put("roleCode",role.getCode());
            userinfo.put("system",role.getSystem());
            if("admin".equals(role.getCode())){
            }else if("saasAdmin".equals(role.getCode())){
                if(org.apache.commons.lang3.StringUtils.isNotBlank(user.getId())){
                    SaasDO saas = saasDao.findOne(user.getSaasId());
                    Map<String,Object> ss = new HashedMap();
                    ss.put("id",saas.getId());
                    ss.put("name",saas.getName());
                    userinfo.put("saas",ss);
                }
            }else if("hosAdmin".equals(role.getCode())){
                String sql = "SELECT " +
                        " g.code AS orgCode, " +
                        " g.province_code AS provinceCode, " +
                        " g.province_name AS privinceName, " +
                        " g.city_code AS cityCode, " +
                        " g.city_name AS cityName, " +
                        " g.town_code AS townCode, " +
                        " g.town_name AS townName, " +
                        " g.street_code AS streetCode, " +
                        " g.street_name AS streetName, " +
                        " g.name, " +
                        " address " +
                        " FROM " +
                        " base_org g " +
                        " JOIN base_org_user u ON g.`code` = u.org_code " +
                        " WHERE  " +
                        " u.user_id = '"+id+"'";
                List<Map<String,Object>> org = jdbcTemplate.queryForList(sql);
                if(org!=null&&org.size()>0){
                    userinfo.put("org",org.get(0));
                }else{
                    userinfo.put("org",null);
                }
            if(org.apache.commons.lang3.StringUtils.isNotBlank(user.getId())){
                SaasDO saas = saasDao.findOne(user.getSaasId());
                Map<String,Object> ss = new HashedMap();
                ss.put("id",saas.getId());
                ss.put("name",saas.getName());
                userinfo.put("saas",ss);
            }
        }else if("hosAdmin".equals(role.getCode())){
            String sql = "SELECT " +
                    " g.code AS orgCode, " +
                    " g.province_code AS provinceCode, " +
                    " g.province_name AS privinceName, " +
                    " g.city_code AS cityCode, " +
                    " g.city_name AS cityName, " +
                    " g.town_code AS townCode, " +
                    " g.town_name AS townName, " +
                    " g.street_code AS streetCode, " +
                    " g.street_name AS streetName, " +
                    " g.name, " +
                    " address " +
                    " FROM " +
                    " base_org g " +
                    " JOIN base_org_user u ON g.`code` = u.org_code " +
                    " WHERE  " +
                    " u.user_id = '"+id+"'";
            List<Map<String,Object>> org = jdbcTemplate.queryForList(sql);
            userinfo.put("org",org.get(0));
        }
        return userinfo;

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@@ -64,7 +64,22 @@ public class WechatService {
                " w.`status`, " +
                " w.type, " +
                " w.public_type AS publicType," +
                " w.remark " +
                " w.token," +
                " w.encType," +
                " w.type," +
                " w.appId," +
                " w.appSecret," +
                " w.appOriginId," +
                " w.baseUrl," +
                " w.userName," +
                " w.password," +
                " w.remark," +
                " w.createTime," +
                " w.createUser," +
                " w.createUserName," +
                " w.updateTime," +
                " w.updateUser," +
                " w.updateUserName" +
                " FROM " +
                " wx_wechat w ";
        if (StringUtils.isNotBlank(saasName)) {