Commit 213afd4919e3555907596311115ff7a7dbdb5077
1 parent
31906465cf
Exists in
master
and in
6 other branches
高危缓存
Showing 1 changed file with 40 additions and 30 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
View file @
213afd4
... | ... | @@ -32,30 +32,36 @@ |
32 | 32 | @Autowired |
33 | 33 | private BasicConfigService basicConfigService; |
34 | 34 | |
35 | + private static List<BasicConfig> mainBasicConfigList; | |
36 | + | |
35 | 37 | /** |
36 | 38 | * 获取新版的高危因数 |
39 | + * | |
37 | 40 | * @return |
38 | 41 | */ |
39 | - public BaseResponse findNewHighRisk(){ | |
42 | + public BaseResponse findNewHighRisk() { | |
40 | 43 | // //true-开发、false-正式 |
41 | 44 | // boolean isTest = true; |
42 | 45 | // if(isTest){ |
43 | 46 | // return findNewTestSyncHighRisk(); |
44 | 47 | // } |
45 | 48 | |
46 | - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); | |
47 | - basicConfigQuery.setEnable(1); | |
48 | - basicConfigQuery.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); | |
49 | + if (CollectionUtils.isEmpty(mainBasicConfigList)) { | |
50 | + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); | |
51 | + basicConfigQuery.setEnable(1); | |
52 | + basicConfigQuery.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); | |
49 | 53 | |
50 | - //所有数据 | |
51 | - List<BasicConfig> basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); | |
54 | + //所有数据 | |
55 | + List<BasicConfig> basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); | |
52 | 56 | |
53 | - //主节点数据 | |
54 | - basicConfigQuery.setTypeId(null); | |
55 | - basicConfigQuery.setParentId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); | |
56 | - List<BasicConfig> mainBasicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); | |
57 | + //主节点数据 | |
58 | + basicConfigQuery.setTypeId(null); | |
59 | + basicConfigQuery.setParentId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); | |
60 | + mainBasicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); | |
61 | + dispNewHighRisk(basicConfigList, mainBasicConfigList); | |
62 | + } | |
57 | 63 | |
58 | - dispNewHighRisk(basicConfigList,mainBasicConfigList); | |
64 | + | |
59 | 65 | BaseResponse baseResponse = new BaseResponse(); |
60 | 66 | baseResponse.setObject(mainBasicConfigList); |
61 | 67 | return baseResponse; |
62 | 68 | |
... | ... | @@ -63,9 +69,10 @@ |
63 | 69 | |
64 | 70 | /** |
65 | 71 | * 新版高危测试库数据 --- 用于开发测试 |
72 | + * | |
66 | 73 | * @return |
67 | 74 | */ |
68 | - public BaseResponse findNewTestSyncHighRisk(){ | |
75 | + public BaseResponse findNewTestSyncHighRisk() { | |
69 | 76 | |
70 | 77 | List<BasicConfig> mainBasicConfigList = new ArrayList<>(); |
71 | 78 | try { |
... | ... | @@ -82,7 +89,7 @@ |
82 | 89 | basicConfigQuery.setTypeId(null); |
83 | 90 | basicConfigQuery.setParentId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); |
84 | 91 | mainBasicConfigList = mongoTemplate.find(basicConfigQuery.convertToQuery().convertToMongoQuery(), BasicConfig.class); |
85 | - dispNewHighRisk(basicConfigList,mainBasicConfigList); | |
92 | + dispNewHighRisk(basicConfigList, mainBasicConfigList); | |
86 | 93 | } catch (Exception e) { |
87 | 94 | e.printStackTrace(); |
88 | 95 | } |
89 | 96 | |
90 | 97 | |
91 | 98 | |
... | ... | @@ -93,21 +100,22 @@ |
93 | 100 | } |
94 | 101 | |
95 | 102 | //将list数据根据id转换成list |
96 | - public static Map<String, BasicConfig> listConvertBasicMap(List<BasicConfig> basicConfigList){ | |
103 | + public static Map<String, BasicConfig> listConvertBasicMap(List<BasicConfig> basicConfigList) { | |
97 | 104 | Map<String, BasicConfig> slaveBasicConfigMap = new HashMap<>(); |
98 | 105 | for (BasicConfig bc : basicConfigList) { |
99 | 106 | bc.setColor(HosptialHighRiskFacade.colorMap.get(bc.getParentId())); |
100 | - slaveBasicConfigMap.put(bc.getId(),bc); | |
107 | + slaveBasicConfigMap.put(bc.getId(), bc); | |
101 | 108 | } |
102 | 109 | return slaveBasicConfigMap; |
103 | 110 | } |
104 | 111 | |
105 | 112 | /** |
106 | 113 | * 处理新版高危数据,生成树结构 |
114 | + * | |
107 | 115 | * @param basicConfigList |
108 | 116 | * @param mainBasicConfigList |
109 | 117 | */ |
110 | - public List<BasicConfig> dispNewHighRisk(List<BasicConfig> basicConfigList,List<BasicConfig> mainBasicConfigList){ | |
118 | + public List<BasicConfig> dispNewHighRisk(List<BasicConfig> basicConfigList, List<BasicConfig> mainBasicConfigList) { | |
111 | 119 | Map<String, List<BasicConfig>> slaveBasicConfigMap = new HashMap<>(); |
112 | 120 | for (BasicConfig bc : basicConfigList) { |
113 | 121 | bc.setColor(HosptialHighRiskFacade.colorMap.get(bc.getParentId())); |
... | ... | @@ -131,8 +139,8 @@ |
131 | 139 | Collections.sort(mainBasicConfigList, new Comparator<BasicConfig>() { |
132 | 140 | @Override |
133 | 141 | public int compare(BasicConfig o1, BasicConfig o2) { |
134 | - if(o1.getWeight()!=null&&o2.getWeight()!=null){ | |
135 | - return -Integer.compare(o1.getWeight(),o2.getWeight()); | |
142 | + if (o1.getWeight() != null && o2.getWeight() != null) { | |
143 | + return -Integer.compare(o1.getWeight(), o2.getWeight()); | |
136 | 144 | } |
137 | 145 | return 0; |
138 | 146 | } |
139 | 147 | |
140 | 148 | |
141 | 149 | |
142 | 150 | |
... | ... | @@ -142,29 +150,29 @@ |
142 | 150 | |
143 | 151 | |
144 | 152 | //子节点根据权重排序 |
145 | - public void configData(BasicConfig bs,Map<String, List<BasicConfig>> slaveBasicConfigMap) { | |
153 | + public void configData(BasicConfig bs, Map<String, List<BasicConfig>> slaveBasicConfigMap) { | |
146 | 154 | |
147 | 155 | if (slaveBasicConfigMap.containsKey(bs.getId())) { |
148 | 156 | bs.setBasicConfigs(slaveBasicConfigMap.get(bs.getId())); |
149 | - for(BasicConfig basicConfig:bs.getBasicConfigs()){ | |
150 | - configData(basicConfig,slaveBasicConfigMap); | |
157 | + for (BasicConfig basicConfig : bs.getBasicConfigs()) { | |
158 | + configData(basicConfig, slaveBasicConfigMap); | |
151 | 159 | } |
152 | 160 | } |
153 | 161 | } |
154 | 162 | |
155 | - public void sortBasicConfig(BasicConfig basicConfig){ | |
156 | - if(CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())){ | |
157 | - for(BasicConfig bs:basicConfig.getBasicConfigs()){ | |
158 | - if(CollectionUtils.isNotEmpty(bs.getBasicConfigs())){ | |
163 | + public void sortBasicConfig(BasicConfig basicConfig) { | |
164 | + if (CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())) { | |
165 | + for (BasicConfig bs : basicConfig.getBasicConfigs()) { | |
166 | + if (CollectionUtils.isNotEmpty(bs.getBasicConfigs())) { | |
159 | 167 | sortBasicConfig(bs); |
160 | 168 | } |
161 | 169 | } |
162 | 170 | Collections.sort(basicConfig.getBasicConfigs(), new Comparator<BasicConfig>() { |
163 | 171 | @Override |
164 | 172 | public int compare(BasicConfig o1, BasicConfig o2) { |
165 | - if(o1.getWeight()!=null&&o2.getWeight()!=null){ | |
173 | + if (o1.getWeight() != null && o2.getWeight() != null) { | |
166 | 174 | return o1.getWeight().compareTo(o2.getWeight()); |
167 | - }else{ | |
175 | + } else { | |
168 | 176 | return 0; |
169 | 177 | } |
170 | 178 | } |
171 | 179 | |
... | ... | @@ -320,13 +328,14 @@ |
320 | 328 | } |
321 | 329 | return configResults; |
322 | 330 | } |
331 | + | |
323 | 332 | /** |
324 | 333 | * 查询基础数据通过parentId |
325 | 334 | * |
326 | 335 | * @param parentId |
327 | 336 | * @return |
328 | 337 | */ |
329 | - public List<BasicConfigResult> getBaseicConfigByParentIdWithWight(String parentId,boolean wight) { | |
338 | + public List<BasicConfigResult> getBaseicConfigByParentIdWithWight(String parentId, boolean wight) { | |
330 | 339 | BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); |
331 | 340 | basicConfigQuery.setYn(YnEnums.YES.getId()); |
332 | 341 | basicConfigQuery.setParentId(parentId); |
... | ... | @@ -334,7 +343,7 @@ |
334 | 343 | List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery); |
335 | 344 | List<BasicConfigResult> configResults = new ArrayList<>(); |
336 | 345 | if (datas != null) { |
337 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(parentId); | |
346 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(parentId); | |
338 | 347 | for (BasicConfig data : datas) { |
339 | 348 | BasicConfigResult br = new BasicConfigResult(); |
340 | 349 | br.setId(data.getId()); |
341 | 350 | |
... | ... | @@ -343,12 +352,13 @@ |
343 | 352 | br.setName(data.getName()); |
344 | 353 | br.setParentId(data.getParentId()); |
345 | 354 | br.setWeight(data.getWeight()); |
346 | - br.setParentName(null==basicConfig?"":basicConfig.getName()); | |
355 | + br.setParentName(null == basicConfig ? "" : basicConfig.getName()); | |
347 | 356 | configResults.add(br); |
348 | 357 | } |
349 | 358 | } |
350 | 359 | return configResults; |
351 | 360 | } |
361 | + | |
352 | 362 | /** |
353 | 363 | * 根据类型查询响应的 基础数据 |
354 | 364 | * [[ycs],[jws]] |