Merge branch 'dev' of yeshijie/jw2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/ModuleDO.java

@@ -141,6 +141,8 @@ public class ModuleDO extends UuidIdentityEntityWithOperator {
	private Integer status;
	//类型
	private Integer type;
	//菜单层级
	private Integer level;
	//备注
	private String remark;
	//0-表示有子节点，1-表示没有子节点
@@ -235,6 +237,15 @@ public class ModuleDO extends UuidIdentityEntityWithOperator {
		this.isMust = isMust;
	}
	@Column(name = "level")
	public Integer getLevel() {
		return level;
	}
	public void setLevel(Integer level) {
		this.level = level;
	}
	@Transient
	public List<ModuleDO> getChildren() {
		return children;

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/SaasModuleDO.java

@@ -31,6 +31,8 @@ public class SaasModuleDO extends UuidIdentityEntityWithOperator {
	private Integer status;
	//类型
	private Integer type;
	//菜单层级
	private Integer level;
	//备注
	private String remark;
	//0-表示有子节点，1-表示没有子节点
@@ -143,6 +145,15 @@ public class SaasModuleDO extends UuidIdentityEntityWithOperator {
		this.isMust = isMust;
	}
	@Column(name = "level")
	public Integer getLevel() {
		return level;
	}
	public void setLevel(Integer level) {
		this.level = level;
	}
	@Transient
	public List<SaasModuleDO> getChildren() {
		return children;

common/common-entity/src/main/java/com/yihu/jw/entity/base/module/SaasTypeModuleDO.java

@@ -31,6 +31,8 @@ public class SaasTypeModuleDO extends UuidIdentityEntityWithOperator {
	private Integer status;
	//类型
	private Integer type;
	//菜单层级
	private Integer level;
	//备注
	private String remark;
	//0-表示有子节点，1-表示没有子节点
@@ -143,6 +145,15 @@ public class SaasTypeModuleDO extends UuidIdentityEntityWithOperator {
		this.isMust = isMust;
	}
	@Column(name = "level")
	public Integer getLevel() {
		return level;
	}
	public void setLevel(Integer level) {
		this.level = level;
	}
	@Transient
	public List<SaasTypeModuleDO> getChildren() {
		return children;

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

@@ -36,6 +36,8 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
	 * 排序
	 */
	private Integer sort;
	//菜单层级
	private Integer level;
	/**
	 * 父级ID
	 */
@@ -145,6 +147,15 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
		this.show = show;
	}
	@Column(name = "level")
	public Integer getLevel() {
		return level;
	}
	public void setLevel(Integer level) {
		this.level = level;
	}
	@Transient
	public String getParentName() {
		return parentName;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/ModuleVO.java

@@ -26,6 +26,8 @@ public class ModuleVO extends UuidIdentityVOWithOperator {
    private Integer type;
    @ApiModelProperty(value = "状态", example = "1有效，0失效")
    private Integer status;
    @ApiModelProperty(value = "层级", example = "0")
    private Integer level;
    @ApiModelProperty(value = "备注", example = "我是备注")
    private String remark;
    @ApiModelProperty(value = "节点信息（0-表示有子节点，1-表示没有子节点)", example = "1")
@@ -124,4 +126,12 @@ public class ModuleVO extends UuidIdentityVOWithOperator {
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }
    public Integer getLevel() {
        return level;
    }
    public void setLevel(Integer level) {
        this.level = level;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/SaasModuleVO.java

@@ -26,6 +26,8 @@ public class SaasModuleVO extends UuidIdentityVOWithOperator {
	private String parentModuleId;
	@ApiModelProperty(value = "状态", example = "1有效，0失效")
	private Integer status;
	@ApiModelProperty(value = "层级", example = "0")
	private Integer level;
	@ApiModelProperty(value = "类型", example = "0通用，1医生端你，2居民端")
	private Integer type;
	@ApiModelProperty(value = "备注", example = "备注")
@@ -134,4 +136,12 @@ public class SaasModuleVO extends UuidIdentityVOWithOperator {
	public void setChildren(List<SaasModuleVO> children) {
		this.children = children;
	}
	public Integer getLevel() {
		return level;
	}
	public void setLevel(Integer level) {
		this.level = level;
	}
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/module/SaasTypeModuleVO.java

@@ -28,6 +28,8 @@ public class SaasTypeModuleVO extends UuidIdentityVOWithOperator {
	private Integer status;
	@ApiModelProperty(value = "类型", example = "0通用，1医生端你，2居民端")
	private Integer type;
	@ApiModelProperty(value = "层级", example = "0")
	private Integer level;
	@ApiModelProperty(value = "备注", example = "备注")
	private String remark;
	@ApiModelProperty(value = "0-表示有子节点，1-表示没有子节点", example = "1")
@@ -144,4 +146,12 @@ public class SaasTypeModuleVO extends UuidIdentityVOWithOperator {
	public void setIsCheck(Integer isCheck) {
		this.isCheck = isCheck;
	}
	public Integer getLevel() {
		return level;
	}
	public void setLevel(Integer level) {
		this.level = level;
	}
}

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

@@ -23,6 +23,8 @@ public class MenuVO extends UuidIdentityVOWithOperator {
//    private String method;
    @ApiModelProperty(value = "排序", example = "1")
    private Integer sort;
    @ApiModelProperty(value = "层级", example = "0")
    private Integer level;
    @ApiModelProperty(value = "父级ID", example = "父级ID")
    private String parentId;
    @ApiModelProperty(value = "父级名称", example = "父级名称")
@@ -115,4 +117,12 @@ public class MenuVO extends UuidIdentityVOWithOperator {
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }
    public Integer getLevel() {
        return level;
    }
    public void setLevel(Integer level) {
        this.level = level;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/org/BaseOrgSaasDao.java

@@ -2,6 +2,8 @@ package com.yihu.jw.base.dao.org;
import com.yihu.jw.entity.base.org.BaseOrgSaasDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
@@ -22,4 +24,8 @@ import java.util.List;
public interface BaseOrgSaasDao extends PagingAndSortingRepository<BaseOrgSaasDO, String>, JpaSpecificationExecutor<BaseOrgSaasDO>  {
    List<BaseOrgSaasDO> findBySaasid(String saasId);
    @Modifying
    @Query("delete from BaseOrgSaasDO p where p.saasid=?1 ")
    void deleteBySaasId(String saasId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleEndpoint.java

@@ -93,7 +93,7 @@ public class ModuleEndpoint extends EnvelopRestEndpoint {
        if(count > 1){
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Module.NAME_IS_EXIST), ObjEnvelop.class);
        }
        module = moduleService.save(module);
        module = moduleService.updateModule(module);
        return success(module, ModuleVO.class);
    }

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

@@ -102,7 +102,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
        if(count>1){
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Menu.NAME_IS_EXIST), ObjEnvelop.class);
        }
        menuDO = menuService.save(menuDO);
        menuDO = menuService.updateMenu(menuDO);
        return success(menuDO);
    }

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

@@ -73,10 +73,10 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            @RequestParam String jsonSaas) throws Exception {
        SaasDO saasDO = toEntity(jsonSaas, SaasDO.class);
        if(!ValidateUtil.isValidMobileNo(saasDO.getMobile())){
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Saas.MOBILE_IS_EXIST), Envelop.class);
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Saas.PHONE_IS_NOT_FORMAT), Envelop.class);
        }
        if(!ValidateUtil.isValidEmail(saasDO.getEmail())){
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Saas.EMAIL_IS_EXIST), Envelop.class);
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Saas.EMAIL_IS_NOT_FORMAT), Envelop.class);
        }
        if (saasService.search("name=" + saasDO.getName()).size() > 0) {
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Saas.NAME_IS_EXIST), Envelop.class);

svr/svr-base/src/main/java/com/yihu/jw/base/service/module/ModuleService.java

@@ -39,6 +39,47 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
    @Autowired
    private SaasDao saasDao;
    /**
     * 修改
     * @param moduleDO
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public ModuleDO updateModule(ModuleDO moduleDO){
        ModuleDO oldModule = moduleDao.findOne(moduleDO.getId());
        if(StringUtils.isBlank(moduleDO.getParentId())){
            moduleDO.setParentId(CommonContant.DEFAULT_PARENTID);
        }
        ModuleDO parentModule = null;
        //设置level
        if(CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
            moduleDO.setLevel(0);
        }else {
            parentModule = moduleDao.findOne(moduleDO.getParentId());
            moduleDO.setLevel(parentModule.getLevel()+1);
        }
        moduleDO.setDel(1);
        moduleDO.setIsEnd(1);
        moduleDao.save(moduleDO);
        //父节点设置非根节点
        if(!CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
            if(ModuleDO.End.no.getValue().equals(parentModule.getIsEnd())){
                parentModule.setIsEnd(ModuleDO.End.have.getValue());
                moduleDao.save(parentModule);
            }
        }
        //若新增某必选业务模块，则需为所有已创建的租户和租户类型添加此业务模块
        if(ModuleDO.Must.nonMust.getValue().equals(oldModule.getIsMust())&&
                ModuleDO.Must.must.getValue().equals(moduleDO.getIsMust())){
            addSubModule(moduleDO);
        }
        return moduleDO;
    }
    /**
     * 新增模块
     * @param moduleDO
@@ -49,12 +90,21 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
        if(StringUtils.isBlank(moduleDO.getParentId())){
            moduleDO.setParentId(CommonContant.DEFAULT_PARENTID);
        }
        ModuleDO parentModule = null;
        //设置level
        if(CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
            moduleDO.setLevel(0);
        }else {
            parentModule = moduleDao.findOne(moduleDO.getParentId());
            moduleDO.setLevel(parentModule.getLevel()+1);
        }
        moduleDO.setDel(1);
        moduleDO.setIsEnd(1);
        moduleDao.save(moduleDO);
        //父节点设置非根节点
        if(!CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
            ModuleDO parentModule = moduleDao.findOne(moduleDO.getParentId());
            if(ModuleDO.End.no.getValue().equals(parentModule.getIsEnd())){
                parentModule.setIsEnd(ModuleDO.End.have.getValue());
                moduleDao.save(parentModule);
@@ -100,6 +150,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
                saasTypeModuleDO.setSaasTypeId(saasTypeDictDO.getId());
                saasTypeModuleDO.setType(moduleDO.getType());
                saasTypeModuleDO.setUrl(moduleDO.getUrl());
                saasTypeModuleDO.setLevel(moduleDO.getLevel());
                saasTypeModuleDOList.add(saasTypeModuleDO);
                //父模块非必选
@@ -119,6 +170,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
                        typeModuleDO.setSaasTypeId(saasTypeDictDO.getId());
                        typeModuleDO.setType(parentModule.getType());
                        typeModuleDO.setUrl(parentModule.getUrl());
                        typeModuleDO.setLevel(parentModule.getLevel());
                        saasTypeModuleDOList.add(typeModuleDO);
                    }
                }
@@ -143,6 +195,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
                saasModuleDO.setSaasId(saasDO.getId());
                saasModuleDO.setType(moduleDO.getType());
                saasModuleDO.setUrl(moduleDO.getUrl());
                saasModuleDO.setLevel(moduleDO.getLevel());
                saasModuleDOList.add(saasModuleDO);
                //父模块非必选
@@ -162,6 +215,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
                        saasModule.setSaasId(saasDO.getId());
                        saasModule.setType(parentModule.getType());
                        saasModule.setUrl(parentModule.getUrl());
                        saasModule.setLevel(parentModule.getLevel());
                        saasModuleDOList.add(saasModule);
                    }
                }

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

@@ -31,6 +31,29 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
        menuDao.updateStatus(id,status);
    }
    /**
     * 修改菜单
     * @param menuDO
     * @return
     */
    public MenuDO updateMenu(MenuDO menuDO){
        if(StringUtils.isBlank(menuDO.getParentId())){
            menuDO.setParentId(CommonContant.DEFAULT_PARENTID);
            menuDO.setLevel(0);
        }
        //设置level
        if(CommonContant.DEFAULT_PARENTID.equals(menuDO.getParentId())){
            menuDO.setLevel(0);
        }else {
            MenuDO parentMemu = menuDao.findOne(menuDO.getParentId());
            menuDO.setLevel(parentMemu.getLevel()+1);
        }
        int sort = menuDao.countMenuByParentId(menuDO.getParentId())+1;
        menuDO.setSort(sort);
        menuDao.save(menuDO);
        return menuDO;
    }
    /**
     * 新增菜单
     * @param menuDO
@@ -39,6 +62,14 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
    public MenuDO addMenu(MenuDO menuDO){
        if(StringUtils.isBlank(menuDO.getParentId())){
            menuDO.setParentId(CommonContant.DEFAULT_PARENTID);
            menuDO.setLevel(0);
        }
        //设置level
        if(CommonContant.DEFAULT_PARENTID.equals(menuDO.getParentId())){
            menuDO.setLevel(0);
        }else {
            MenuDO parentMemu = menuDao.findOne(menuDO.getParentId());
            menuDO.setLevel(parentMemu.getLevel()+1);
        }
        int sort = menuDao.countMenuByParentId(menuDO.getParentId())+1;
        menuDO.setSort(sort);

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

@@ -113,8 +113,8 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
        saas.setStatus(SaasDO.Status.auditPassed);
        saas = saasDao.save(saas);
        List<BaseOrgDO> orgDOList = saas.getOrgList();
        List<BaseOrgSaasDO> baseOrgSaasDOs = new ArrayList<>(orgDOList.size());
        if(orgDOList!=null&&orgDOList.size()>0){
            List<BaseOrgSaasDO> baseOrgSaasDOs = new ArrayList<>(orgDOList.size());
            String saasId = saas.getId();
            orgDOList.forEach(org->{
                BaseOrgSaasDO baseOrgSaasDO = new BaseOrgSaasDO();
@@ -122,8 +122,8 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
                baseOrgSaasDO.setSaasid(saasId);
                baseOrgSaasDOs.add(baseOrgSaasDO);
            });
            baseOrgSaasDao.save(baseOrgSaasDOs);
        }
        baseOrgSaasDao.save(baseOrgSaasDOs);
        //用户信息初始化
        UserDO userDO = new UserDO();
@@ -222,40 +222,18 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
        userDO.setEmail(saas.getEmail());
        userDO.setMobile(saas.getMobile());
        userDO.setName(saas.getManagerName());
        baseOrgDao.deleteBySaasId(saasId);
        baseOrgSaasDao.deleteBySaasId(saasId);
        List<BaseOrgDO> orgDOList = saas.getOrgList();
        if(orgDOList!=null&&orgDOList.size()>0){
            List<BaseOrgSaasDO> baseOrgSaasDOs = new ArrayList<>(orgDOList.size());
            orgDOList.forEach(org->{
                BaseOrgDO orgDO = baseOrgDao.findByCodeAndSaasId(org.getCode(),defaultSaasId);
                org.setSaasid(saasId);
                org.setName(orgDO.getName());
                org.setCreateTime(new Date());
                org.setAddress(orgDO.getAddress());
                org.setAlias(orgDO.getAlias());
                org.setBrief(orgDO.getBrief());
                org.setCityCode(orgDO.getCityCode());
                org.setCityName(orgDO.getCityName());
                org.setDel(orgDO.getDel());
                org.setIntro(orgDO.getIntro());
                org.setLatitude(orgDO.getLatitude());
                org.setLegalperson(orgDO.getLegalperson());
                org.setLongitude(orgDO.getLongitude());
                org.setName(orgDO.getName());
                org.setOrgAdmin(orgDO.getOrgAdmin());
                org.setOrgUrl(orgDO.getOrgUrl());
                org.setPhoto(orgDO.getPhoto());
                org.setProvinceCode(orgDO.getProvinceCode());
                org.setProvinceName(orgDO.getProvinceName());
                org.setQrcode(orgDO.getQrcode());
                org.setSpell(orgDO.getSpell());
                org.setStreetCode(orgDO.getStreetCode());
                org.setStreetName(orgDO.getStreetName());
                org.setTownCode(orgDO.getTownCode());
                org.setTownName(orgDO.getTownName());
                org.setType(orgDO.getType());
                BaseOrgSaasDO baseOrgSaasDO = new BaseOrgSaasDO();
                baseOrgSaasDO.setOrgCode(org.getCode());
                baseOrgSaasDO.setSaasid(saasId);
                baseOrgSaasDOs.add(baseOrgSaasDO);
            });
            baseOrgSaasDao.save(baseOrgSaasDOs);
        }
        baseOrgDao.save(orgDOList);
        saasDao.save(oldSaas);
        userDao.save(userDO);
        return oldSaas;
@@ -361,8 +339,6 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
            user.setEnabled(true);
            user.setLocked(false);
            user.setSalt(randomString(5));
            //姓名
            user.setName(user.getEmail());
            //账号
            user.setUsername(user.getEmail());
            String password = user.getPassword();
@@ -380,7 +356,6 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
        }
        saas.setManager(user.getId());
        saas.setManagerName(user.getName());
        saas.setAppId(getCode());
        saas.setAppSecret(getCode());
        saas = saasDao.save(saas);