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/RoleDO.java

@@ -18,6 +18,14 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
	 * 角色名称
	 */
	private String name;
	/**
	 * 角色代码
     */
	private String code;
	/**
	 * 1.系统管理员，2.saas管理员，3.机构管理员
     */
	private String type;
	/**
	 * 备注
	 */
@@ -53,4 +61,22 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
	public void setSystem(Boolean system) {
		this.system = system;
	}
	@Column(name = "code")
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "type")
	public String getType() {
		return type;
	}
	public void setType(String type) {
		this.type = type;
	}
}

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

@@ -17,6 +17,10 @@ public class RoleVO extends UuidIdentityVOWithOperator {
	private String remark;
	@ApiModelProperty(value = "是否系统管理员", example = "1")
	private Boolean system;
	@ApiModelProperty(value = "角色代码", example = "1")
	private String code;
	@ApiModelProperty(value = "1.系统管理员，2.saas管理员，3.机构管理员", example = "1")
	private String type;
	public String getName() {
		return this.name;
@@ -41,4 +45,20 @@ public class RoleVO extends UuidIdentityVOWithOperator {
	public void setSystem(Boolean system) {
		this.system = system;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getType() {
		return type;
	}
	public void setType(String type) {
		this.type = type;
	}
}

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

@@ -1,9 +1,11 @@
package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.org.BaseOrgDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.saas.SaasDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.dao.user.UserRoleDao;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.user.UserDO;
@@ -15,6 +17,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.List;
/**
 * Service - SAAS
 * Created by progr1mmer on 2018/8/14.
@@ -34,6 +38,8 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
    private RoleDao roleDao;
    @Autowired
    private UserRoleDao userRoleDao;
    @Autowired
    private BaseOrgDao baseOrgDao;
    /**
     * 默认租户管理员角色code
@@ -64,19 +70,14 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
        UserRoleDO userRoleDO = new UserRoleDO();
        userRoleDO.setUserId(user.getId());
        userRoleDO.setRoleId(roleDO.getId());
        //初始化租户默认模块
//        List<SaasDefaultModuleFunctionDO> saasDefaultModuleDOS = saasDefaultModuleFunctionDao.findBySaasType(saas.getType());
//        List<SaasModuleFunctionDO> roleModuleFunctionDOS = new ArrayList<>();
//        saasDefaultModuleDOS.forEach(item -> {
//            SaasModuleFunctionDO saasModuleFunctionDO = new SaasModuleFunctionDO();
//            saasModuleFunctionDO.setSaasId(saasId);
//            saasModuleFunctionDO.setModuleId(item.getModuleId());
//            saasModuleFunctionDO.setFunctionId(item.getFunctionId());
//            roleModuleFunctionDOS.add(saasModuleFunctionDO);
//        });
        List<BaseOrgDO> orgDOList = saas.getOrgList();
        orgDOList.forEach(org->{
            org.setSaasid(saasId);
        });
        //保存数据
        saas.setStatus(SaasDO.Status.auditWait);
        saas = saasDao.save(saas);
        baseOrgDao.save(orgDOList);
        userDao.save(user);
        userRoleDao.save(userRoleDO);
//        roleModuleFunctionDao.save(roleModuleFunctionDOS);