saas相关类代码冲突合并

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

@@ -22,6 +22,14 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
	 * 角色名称
	 */
	private String name;
	/**
	 * 角色代码
     */
	private String code;
	/**
	 * 1.系统管理员，2.saas管理员，3.机构管理员
     */
	private String type;
	/**
	 * 备注
	 */
@@ -65,4 +73,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-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDO.java

@@ -29,8 +29,6 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
		//已删除
		delete
    }
    private String orgCode; //机构编码
	private String name; //系统名称
	private Status status; //状态  0待审核 1审核通过 2审核不通过 3已删除
	private String remark; //备注
@@ -43,22 +41,14 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
	private String businessLicense; //营业执照url
	private String systemName; //系统名称
	private String areaNumber; //行政区划代码
    List<BaseOrgDO> orgList;
    List<SaasModuleDO> saasModuleList;
    //审核不通过的原因
    private String auditFailedReason;
    //管理员姓名
    private String managerName;
	@Column(name = "org_code", nullable = false)
	public String getOrgCode() {
		return orgCode;
	}
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
    //机构
    List<BaseOrgDO> orgList;
    //业务模块
    List<SaasModuleDO> saasModuleList;
	@Column(name = "name", nullable = false, length = 200)
	public String getName() {
@@ -105,29 +95,6 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
		this.type = type;
	}
	@Column(name = "manager", length = 50)
	public String getManager() {
		return manager;
	}
	public void setManager(String manager) {
		this.manager = manager;
	}
	@Column(name = "email")
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(name = "mobile")
	public String getMobile() {
		return mobile;
	}
    @Column(name = "organization_code")
    public String getOrganizationCode() {
        return organizationCode;
@@ -181,9 +148,6 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    public void setSaasModuleList(List<SaasModuleDO> saasModuleList) {
        this.saasModuleList = saasModuleList;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "audit_failed_reason")
    public String getAuditFailedReason() {
@@ -202,4 +166,31 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    public void setManagerName(String managerName) {
        this.managerName = managerName;
    }
    @Column(name = "manager")
    public String getManager() {
        return manager;
    }
    public void setManager(String manager) {
        this.manager = manager;
    }
    @Column(name = "email")
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
}

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;
	}
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasVO.java

@@ -35,6 +35,12 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	private String email;
	@ApiModelProperty(value = "管理员手机号码", example = "18888888888")
	private String mobile;
	@ApiModelProperty(value = "审核不通过的原因", example = "信息不准确")
	private String auditFailedReason;
	@ApiModelProperty(value = "租户类型名称", example = "家医型")
	private String typeName;
	@ApiModelProperty(value = "管理员姓名", example = "张三")
	private String managerName;
	@ApiModelProperty(value = "组织机构代码", example = "46542")
	private String organizationCode;
	@ApiModelProperty(value = "营业执照url", example = "../img/")
@@ -48,12 +54,7 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	List<BaseOrgVO> orgList;
	@ApiModelProperty(value = "业务模块", example = "业务模块")
	List<SaasModuleVO> saasModuleList;
    @ApiModelProperty(value = "审核不通过的原因", example = "信息不准确")
    private String auditFailedReason;
    @ApiModelProperty(value = "租户类型名称", example = "家医型")
    private String typeName;
    @ApiModelProperty(value = "管理员姓名", example = "张三")
    private String managerName;
	public String getOrgCode() {
		return orgCode;
@@ -123,6 +124,10 @@ public class SaasVO extends UuidIdentityVOWithOperator {
		return mobile;
	}
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
	public String getOrganizationCode() {
		return organizationCode;
	}
@@ -170,9 +175,6 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	public void setSaasModuleList(List<SaasModuleVO> saasModuleVOList) {
		this.saasModuleList = saasModuleList;
	}
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getAuditFailedReason() {
        return auditFailedReason;

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

@@ -17,6 +17,8 @@ public interface SaasTypeDictDao extends PagingAndSortingRepository<SaasTypeDict
    SaasTypeDictDO findById(String id);
    SaasTypeDictDO findByCode(Integer code);
    @Query("select Max(code) from SaasTypeDictDO ")
    Integer findTopCode();

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

@@ -1,14 +1,18 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.saas.SaasTypeDictService;
import com.yihu.jw.base.service.saas.SaasService;
import com.yihu.jw.base.service.user.UserService;
import com.yihu.jw.base.util.ErrorCodeUtil;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.base.service.saas.SaasService;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.exception.code.BaseErrorCode;
import com.yihu.jw.restmodel.base.saas.SaasVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -35,6 +39,8 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private UserService userService;
    @Autowired
    private SaasTypeDictService saasTypeDictService;
    @Autowired
    private ErrorCodeUtil errorCodeUtil;
    @PostMapping(value = BaseRequestMapping.Saas.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -111,18 +117,37 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
        return success(saasDOS, SaasVO.class);
    }
    @PostMapping(value = BaseRequestMapping.Saas.FINDBYID)
    @ApiOperation(value = "租户审核：根据租户id获取租户信息")
    public ObjEnvelop<SaasVO> audit(
            @ApiParam(name = "id", value = "SaasId", required = true)
            @RequestParam(value = "id") String id) throws Exception {
        SaasDO saasDO = saasService.retrieve(id);
        if (null == saasDO) {
            return failed("无相关SAAS配置", ObjEnvelop.class);
        }
        SaasVO saasVO = convertToModel(saasDO, SaasVO.class);
        //根据租户类型编码，获取租户类型名称
        SaasTypeDictDO saasTypeDictDO = saasTypeDictService.findByCode(saasVO.getType());
        saasVO.setTypeName(null == saasTypeDictDO ? "" : saasTypeDictDO.getName());
        return success(saasVO);
    }
    @PostMapping(value = BaseRequestMapping.Saas.AUDIT)
    @ApiOperation(value = "审核")
    public Envelop audit (
    public Envelop audit(
            @ApiParam(name = "id", value = "SaasId", required = true)
            @RequestParam(value = "id") String id,
            @ApiParam(name = "status", value = "状态", required = true)
            @RequestParam(value = "status") SaasDO.Status status) throws Exception {
            @RequestParam(value = "status") SaasDO.Status status,
            @ApiParam(name = "auditFailedReason", value = "审核不通过的原因（非必填）")
            @RequestParam(value = "auditFailedReason",required = false) String auditFailedReason) throws Exception {
        SaasDO saasDO = saasService.retrieve(id);
        if (null == saasDO) {
            return failed("无相关SAAS配置", Envelop.class);
        }
        saasDO.setStatus(status);
        saasDO.setAuditFailedReason(auditFailedReason);
        saasService.save(saasDO);
        return success("操作成功");
    }

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);

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

@@ -103,5 +103,8 @@ public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasType
    public SaasTypeDictDO findById(String id) {
        return saasTypeDictDao.findById(id);
    }
    public SaasTypeDictDO findByCode(Integer code) {
        return saasTypeDictDao.findByCode(code);
    }
}