diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 766db96..cb86a3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -32,30 +32,36 @@ public class BasicConfigFacade { @Autowired private BasicConfigService basicConfigService; + private static List mainBasicConfigList; + /** * 获取新版的高危因数 + * * @return */ - public BaseResponse findNewHighRisk(){ + public BaseResponse findNewHighRisk() { // //true-开发、false-正式 // boolean isTest = true; // if(isTest){ // return findNewTestSyncHighRisk(); // } - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); - basicConfigQuery.setEnable(1); - basicConfigQuery.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + if (CollectionUtils.isEmpty(mainBasicConfigList)) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setEnable(1); + basicConfigQuery.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); - //所有数据 - List basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + //所有数据 + List basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + + //主节点数据 + basicConfigQuery.setTypeId(null); + basicConfigQuery.setParentId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + mainBasicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + dispNewHighRisk(basicConfigList, mainBasicConfigList); + } - //主节点数据 - basicConfigQuery.setTypeId(null); - basicConfigQuery.setParentId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); - List mainBasicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); - dispNewHighRisk(basicConfigList,mainBasicConfigList); BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(mainBasicConfigList); return baseResponse; @@ -63,9 +69,10 @@ public class BasicConfigFacade { /** * 新版高危测试库数据 --- 用于开发测试 + * * @return */ - public BaseResponse findNewTestSyncHighRisk(){ + public BaseResponse findNewTestSyncHighRisk() { List mainBasicConfigList = new ArrayList<>(); try { @@ -82,7 +89,7 @@ public class BasicConfigFacade { basicConfigQuery.setTypeId(null); basicConfigQuery.setParentId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); mainBasicConfigList = mongoTemplate.find(basicConfigQuery.convertToQuery().convertToMongoQuery(), BasicConfig.class); - dispNewHighRisk(basicConfigList,mainBasicConfigList); + dispNewHighRisk(basicConfigList, mainBasicConfigList); } catch (Exception e) { e.printStackTrace(); } @@ -93,21 +100,22 @@ public class BasicConfigFacade { } //将list数据根据id转换成list - public static Map listConvertBasicMap(List basicConfigList){ + public static Map listConvertBasicMap(List basicConfigList) { Map slaveBasicConfigMap = new HashMap<>(); for (BasicConfig bc : basicConfigList) { bc.setColor(HosptialHighRiskFacade.colorMap.get(bc.getParentId())); - slaveBasicConfigMap.put(bc.getId(),bc); + slaveBasicConfigMap.put(bc.getId(), bc); } return slaveBasicConfigMap; } /** * 处理新版高危数据,生成树结构 + * * @param basicConfigList * @param mainBasicConfigList */ - public List dispNewHighRisk(List basicConfigList,List mainBasicConfigList){ + public List dispNewHighRisk(List basicConfigList, List mainBasicConfigList) { Map> slaveBasicConfigMap = new HashMap<>(); for (BasicConfig bc : basicConfigList) { bc.setColor(HosptialHighRiskFacade.colorMap.get(bc.getParentId())); @@ -131,8 +139,8 @@ public class BasicConfigFacade { Collections.sort(mainBasicConfigList, new Comparator() { @Override public int compare(BasicConfig o1, BasicConfig o2) { - if(o1.getWeight()!=null&&o2.getWeight()!=null){ - return -Integer.compare(o1.getWeight(),o2.getWeight()); + if (o1.getWeight() != null && o2.getWeight() != null) { + return -Integer.compare(o1.getWeight(), o2.getWeight()); } return 0; } @@ -142,29 +150,29 @@ public class BasicConfigFacade { //子节点根据权重排序 - public void configData(BasicConfig bs,Map> slaveBasicConfigMap) { + public void configData(BasicConfig bs, Map> slaveBasicConfigMap) { if (slaveBasicConfigMap.containsKey(bs.getId())) { bs.setBasicConfigs(slaveBasicConfigMap.get(bs.getId())); - for(BasicConfig basicConfig:bs.getBasicConfigs()){ - configData(basicConfig,slaveBasicConfigMap); + for (BasicConfig basicConfig : bs.getBasicConfigs()) { + configData(basicConfig, slaveBasicConfigMap); } } } - public void sortBasicConfig(BasicConfig basicConfig){ - if(CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())){ - for(BasicConfig bs:basicConfig.getBasicConfigs()){ - if(CollectionUtils.isNotEmpty(bs.getBasicConfigs())){ + public void sortBasicConfig(BasicConfig basicConfig) { + if (CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())) { + for (BasicConfig bs : basicConfig.getBasicConfigs()) { + if (CollectionUtils.isNotEmpty(bs.getBasicConfigs())) { sortBasicConfig(bs); } } Collections.sort(basicConfig.getBasicConfigs(), new Comparator() { @Override public int compare(BasicConfig o1, BasicConfig o2) { - if(o1.getWeight()!=null&&o2.getWeight()!=null){ + if (o1.getWeight() != null && o2.getWeight() != null) { return o1.getWeight().compareTo(o2.getWeight()); - }else{ + } else { return 0; } } @@ -320,13 +328,14 @@ public class BasicConfigFacade { } return configResults; } + /** * 查询基础数据通过parentId * * @param parentId * @return */ - public List getBaseicConfigByParentIdWithWight(String parentId,boolean wight) { + public List getBaseicConfigByParentIdWithWight(String parentId, boolean wight) { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setParentId(parentId); @@ -334,7 +343,7 @@ public class BasicConfigFacade { List datas = basicConfigService.queryBasicConfig(basicConfigQuery); List configResults = new ArrayList<>(); if (datas != null) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(parentId); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(parentId); for (BasicConfig data : datas) { BasicConfigResult br = new BasicConfigResult(); br.setId(data.getId()); @@ -343,12 +352,13 @@ public class BasicConfigFacade { br.setName(data.getName()); br.setParentId(data.getParentId()); br.setWeight(data.getWeight()); - br.setParentName(null==basicConfig?"":basicConfig.getName()); + br.setParentName(null == basicConfig ? "" : basicConfig.getName()); configResults.add(br); } } return configResults; } + /** * 根据类型查询响应的 基础数据 * [[ycs],[jws]]