Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

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

@@ -18,10 +18,12 @@ public class ModuleVO extends UuidIdentityVOWithOperator {
    private String name;
    @ApiModelProperty(value = "父ID", example = "402803ee656498890165649ad2da0000")
    private String parentId;
    @ApiModelProperty(value = "父name", example = "无")
    private String parentName;
    @ApiModelProperty(value = "url", example = "/doctor/*")
    private String url;
    @ApiModelProperty(value = "类型", example = "0通用，1医生端你，2居民端")
    private String type;
    private Integer type;
    @ApiModelProperty(value = "状态", example = "1有效，0失效")
    private Integer status;
    @ApiModelProperty(value = "备注", example = "我是备注")
@@ -83,11 +85,11 @@ public class ModuleVO extends UuidIdentityVOWithOperator {
        this.isEnd = isEnd;
    }
    public String getType() {
    public Integer getType() {
        return type;
    }
    public void setType(String type) {
    public void setType(Integer type) {
        this.type = type;
    }
@@ -114,4 +116,12 @@ public class ModuleVO extends UuidIdentityVOWithOperator {
    public void setIsCheck(Integer isCheck) {
        this.isCheck = isCheck;
    }
    public String getParentName() {
        return parentName;
    }
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }
}

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

@@ -1,8 +1,11 @@
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasDO;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Dao - SAAS
 * Created by progr1mmer on 2018/8/14.
@@ -14,4 +17,7 @@ public interface SaasDao extends PagingAndSortingRepository<SaasDO, String> {
    SaasDO findById(String id);
    SaasDO findByCreateUser(String createUser);
    @Query("from SaasDO  ")
    List<SaasDO> findList();
}

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

@@ -19,6 +19,8 @@ public interface SaasTypeDictDao extends PagingAndSortingRepository<SaasTypeDict
    SaasTypeDictDO findByCode(Integer code);
    List<SaasTypeDictDO> findListByStatus(SaasTypeDictDO.Status status);
    @Query("select Max(code) from SaasTypeDictDO ")
    Integer findTopCode();

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

@@ -132,22 +132,41 @@ public class ModuleEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取列表")
    public ListEnvelop<ModuleVO> findAll (
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status) throws Exception {
        String filters = null;
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "type", value = "类型")
            @RequestParam(value = "type", required = false) String type,
            @ApiParam(name = "name", value = "名称")
            @RequestParam(value = "name", required = false) String name) throws Exception {
        String filters = "";
        if(StringUtils.isNotBlank(status)){
            filters = "status="+status;
            filters = "status="+status+";";
        }
        List<ModuleDO> modules = moduleService.search(null, filters, null);
        if(StringUtils.isNotBlank(name)){
            filters += "name?"+name+";";
        }
        if(StringUtils.isNotBlank(type)){
            filters += "type="+type+";";
        }
        List<ModuleDO> modules = moduleService.search(null, filters, "-createTime");
        List<ModuleVO> moduleVOs = convertToModels(modules,new ArrayList<>(modules.size()),ModuleVO.class);
        moduleVOs.forEach(moduleVO -> {
            if(CommonContant.DEFAULT_PARENTID.equals(moduleVO.getParentId())){
                moduleVO.setParentName(CommonContant.DEFAULT_PARENTNAME);
            }else {
                ModuleDO moduleDO = moduleService.findOne(moduleVO.getParentId());
                moduleVO.setParentName(moduleDO.getName());
            }
        });
        Map<String,List<ModuleVO>> map = moduleVOs.stream().collect(Collectors.groupingBy(ModuleVO::getParentId));
        moduleVOs.forEach(module->{
            List<ModuleVO> tmp = map.get(module.getId());
            module.setChildren(tmp);
        });
        moduleVOs = moduleVOs.stream()
                .filter(module -> CommonContant.DEFAULT_PARENTID.equals(module.getParentId()))
                .collect(Collectors.toList());
        if(StringUtils.isBlank(name)) {
            moduleVOs = moduleVOs.stream()
                    .filter(module -> CommonContant.DEFAULT_PARENTID.equals(module.getParentId()))
                    .collect(Collectors.toList());
        }
        return success(moduleVOs);
    }

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

@@ -84,10 +84,9 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
            }
            //租户类型
            Iterable<SaasTypeDictDO> saasTypeDictDOs = saasTypeDictDao.findAll();
            List<SaasTypeDictDO> saasTypeDictDOs = saasTypeDictDao.findListByStatus(SaasTypeDictDO.Status.effective);
            List<SaasTypeModuleDO> saasTypeModuleDOList = new ArrayList<>(16);
            while (saasTypeDictDOs.iterator().hasNext()){
                SaasTypeDictDO saasTypeDictDO = saasTypeDictDOs.iterator().next();
            for (SaasTypeDictDO saasTypeDictDO : saasTypeDictDOs) {
                SaasTypeModuleDO saasTypeModuleDO = new SaasTypeModuleDO();
                saasTypeModuleDO.setCreateTime(new Date());
                saasTypeModuleDO.setDel(moduleDO.getDel());
@@ -128,10 +127,9 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
            saasTypeModuleDao.save(saasTypeModuleDOList);
            //租户
            Iterable<SaasDO> saasDOs = saasDao.findAll();
            Iterable<SaasDO> saasDOs = saasDao.findList();
            List<SaasModuleDO> saasModuleDOList = new ArrayList<>(16);
            while (saasDOs.iterator().hasNext()){
                SaasDO saasDO = saasDOs.iterator().next();
            for (SaasDO saasDO : saasDOs) {
                SaasModuleDO saasModuleDO = new SaasModuleDO();
                saasModuleDO.setCreateTime(new Date());
                saasModuleDO.setDel(moduleDO.getDel());
@@ -197,14 +195,16 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
     * @param moduleDO
     */
    public void available(ModuleDO moduleDO){
        moduleDO.setStatus(ModuleDO.Status.unAvailable.getValue());
        moduleDO.setStatus(ModuleDO.Status.available.getValue());
        moduleDao.save(moduleDO);
        addSubModule(moduleDO);
        ModuleDO parentModule = moduleDao.findOne(moduleDO.getParentId());
        if(ModuleDO.Status.unAvailable.getValue().equals(parentModule.getStatus())){
            available(moduleDO);
        if(!CommonContant.DEFAULT_PARENTID.equals(moduleDO.getParentId())){
            ModuleDO parentModule = moduleDao.findOne(moduleDO.getParentId());
            if(ModuleDO.Status.available.getValue().equals(parentModule.getStatus())){
                available(parentModule);
            }
        }
    }
@@ -224,8 +224,8 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
        //把子类失效
        List<ModuleDO> moduleDOList = moduleDao.findByParentId(moduleDO.getId());
        moduleDOList.forEach(module->{
            if(ModuleDO.Status.available.getValue().equals(module.getStatus())){
                unavailable(moduleDO);
            if(ModuleDO.Status.unAvailable.getValue().equals(module.getStatus())){
                unavailable(module);
            }
        });
    }
@@ -239,4 +239,7 @@ public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
        return moduleDao.isExistName(name);
    }
    public ModuleDO findOne(String id){
        return moduleDao.findOne(id);
    }
}