基数统计-根据登录人所在租户获取数据

common/common-entity/src/main/java/com/yihu/jw/entity/base/user/UserDO.java

@@ -55,6 +55,8 @@ public class UserDO extends UuidIdentityEntityWithOperator {
    private Date loginDate;
    //登陆失败次数
    private Integer loginFailureCount;
    //saas化的id
    private String  saasId;
    public UserDO(){}
@@ -189,4 +191,12 @@ public class UserDO extends UuidIdentityEntityWithOperator {
    public void setLoginFailureCount(Integer loginFailureCount) {
        this.loginFailureCount = loginFailureCount;
    }
    @Column(name = "saas_id",nullable = false)
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/user/UserVO.java

@@ -56,6 +56,9 @@ public class UserVO extends UuidIdentityVOWithOperator {
    //登陆失败次数
    @ApiModelProperty(value = "登陆失败次数", example = "0")
    private Integer loginFailureCount;
    //saas化的id
    @ApiModelProperty(value = "saadid", example = "25f9e794323b453885f5181f1b620009")
    private String  saasId;
    public String getUsername() {
        return username;
@@ -170,4 +173,12 @@ public class UserVO extends UuidIdentityVOWithOperator {
    public void setLoginFailureCount(Integer loginFailureCount) {
        this.loginFailureCount = loginFailureCount;
    }
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasDao.java

@@ -12,4 +12,6 @@ public interface SaasDao extends PagingAndSortingRepository<SaasDO, String> {
    SaasDO findByName(String name);
    SaasDO findById(String id);
    SaasDO findByCreateUser(String createUser);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/user/UserDao.java

@@ -21,4 +21,6 @@ public interface UserDao extends PagingAndSortingRepository<UserDO, String>, Jpa
    boolean existsByMobile(String mobile);
    boolean existsByUsername(String username);
    UserDO findByUsername(String username);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/population/BasePopulationEndpoint.java

@@ -120,12 +120,15 @@ public class BasePopulationEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "provinceCode", required = false) String provinceCode,
            @ApiParam(name = "cityCode", value = "城市编码")
            @RequestParam(value = "cityCode", required = false) String cityCode,
            @ApiParam(name = "createUser", value = "当前用户id-必填")
            @RequestParam(value = "createUser", required = true) String createUser,
            @ApiParam(name = "year", value = "时间")
            @RequestParam(value = "year", required = false) String year,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
       SaasDO saasDO= saasService.findByCreateUser(createUser);
        StringBuffer s = new StringBuffer();
        if (StringUtils.isNotBlank(saasName)) {
            s.append("saasName?" + saasName + " g1;");
@@ -139,6 +142,10 @@ public class BasePopulationEndpoint extends EnvelopRestEndpoint {
        if (StringUtils.isNotBlank(year)) {
            s.append("year=" + year + ";");
        }
        //一个用户对应一个租户，若没有关联的租户，则为超管，查询所有租户
        if (null != saasDO) {
            s.append("saasId=" + saasDO.getId() + ";");
        }
        //时间（最近时间排最前）>租户创建时间（最新创建租户排最前）
        String sorts = "-createTime,-saasCreateTime";
        String filters = s.toString();
@@ -154,8 +161,15 @@ public class BasePopulationEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "createUser", value = "当前用户id-必填")
            @RequestParam(value = "createUser", required = true) String createUser,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        SaasDO saasDO = saasService.findByCreateUser(createUser);
        //一个用户对应一个租户，若没有关联的租户，则为超管，查询所有租户
        if (null != saasDO) {
            filters = filters + "saasId=" + saasDO.getId() + ";";
        }
        List<BasePopulationDO> basePopulations = basePopulationService.search(fields, filters, sorts);
        return success(basePopulations, BasePopulationVO.class);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -241,7 +241,6 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            //发送者
            mainMessage.setFrom(username);
            //接收者
//            mainMessage.setTo("763558454@qq.com");
            mainMessage.setTo(saasDO.getEmail());
            //发送的标题
            mainMessage.setSubject(baseEmailTemplateConfigDO.getTemplateName());

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasService.java

@@ -336,6 +336,9 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
    public SaasDO findById(String id){
        return saasDao.findById(id);
    }
    public SaasDO findByCreateUser(String createUser){
        return saasDao.findByCreateUser(createUser);
    }
    public SaasDO findByName(String name){
        return saasDao.findByName(name);
@@ -351,24 +354,38 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
    public SaasDO saasAudit(SaasDO saas, UserDO user) {
        //初始化角色
        RoleDO roleDO = roleDao.findByCode(roleCode);
        //初始化租户管理员
        user.setEnabled(true);
        user.setLocked(false);
        user.setSalt(randomString(5));
        user.setName(user.getEmail());
        String password = user.getPassword();
        //密码默认手机号后6位
        if (StringUtils.isEmpty(password)) {
            password = user.getMobile().substring(0, 6);
        //判断该用户是否已经存在
       UserDO userDO= userDao.findByUsername(saas.getEmail());
        if (null == userDO) {
            //初始化租户管理员
            user.setEnabled(true);
            user.setLocked(false);
            user.setSalt(randomString(5));
            //姓名
            user.setName(user.getEmail());
            //账号
            user.setUsername(user.getEmail());
            String password = user.getPassword();
            //密码默认手机号后6位
            if (StringUtils.isEmpty(password)) {
                password = user.getMobile().substring(0, 6);
            }
            user.setPassword(MD5.md5Hex(password + "{" + user.getSalt() + "}"));
            user.setSaasId(saas.getId());
            user = userDao.save(user);
        } else {
            userDO.setSaasId(saas.getId());
            user = userDao.save(userDO);
        }
        user.setPassword(MD5.md5Hex(password + "{" + user.getSalt() + "}"));
        //初始化管理员角色
        UserRoleDO userRoleDO = new UserRoleDO();
        userRoleDO.setRoleId(roleDO.getId());
        userDao.save(user);
        userRoleDO.setUserId(user.getId());
        userRoleDao.save(userRoleDO);
        saas.setManager(user.getId());
        saas.setManagerName(user.getName());
        saas.setAppId(getCode());
        saas.setAppSecret(getCode());
        saas = saasDao.save(saas);