jiangjiazhi / regional-platform

Commit ac77a2d35f6010c7f1e323126c5910c45433ced5

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

新版高危因数排序

Showing 2 changed files with 64 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java

...	...	@@ -1441,16 +1441,47 @@
1441	1441
1442	1442	for (BasicConfig bs : mainBasicConfigList) {
1443	1443	configData(bs, basicConfigList, slaveBasicConfigMap);
	1444	+ sortBasicConfig(bs);
1444	1445	}
1445	1446
	1447	+ Collections.sort(mainBasicConfigList, new Comparator<BasicConfig>() {
	1448	+ @Override
	1449	+ public int compare(BasicConfig o1, BasicConfig o2) {
	1450	+ if(o1.getWeight()!=null&&o2.getWeight()!=null){
	1451	+ return -Integer.compare(o1.getWeight(),o2.getWeight());
	1452	+ }
	1453	+ return 0;
	1454	+ }
	1455	+ });
	1456	+
1446	1457	} catch (Exception e) {
1447	1458	e.printStackTrace();
1448	1459	}
	1460	+
1449	1461	BaseResponse baseResponse = new BaseResponse();
1450	1462	baseResponse.setObject(mainBasicConfigList);
1451	1463	return baseResponse;
1452	1464	}
1453	1465
	1466	+ public void sortBasicConfig(BasicConfig basicConfig){
	1467	+ if(CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())){
	1468	+ for(BasicConfig bs:basicConfig.getBasicConfigs()){
	1469	+ if(CollectionUtils.isNotEmpty(bs.getBasicConfigs())){
	1470	+ sortBasicConfig(bs);
	1471	+ }
	1472	+ }
	1473	+ Collections.sort(basicConfig.getBasicConfigs(), new Comparator<BasicConfig>() {
	1474	+ @Override
	1475	+ public int compare(BasicConfig o1, BasicConfig o2) {
	1476	+ if(o1.getWeight()!=null&&o2.getWeight()!=null){
	1477	+ return o1.getWeight().compareTo(o2.getWeight());
	1478	+ }else{
	1479	+ return 0;
	1480	+ }
	1481	+ }
	1482	+ });
	1483	+ }
	1484	+ }
1454	1485	public static void configData(BasicConfig bs, List<BasicConfig> basicConfigList, Map<String, List<BasicConfig>> slaveBasicConfigMap) {
1455	1486
1456	1487	if (slaveBasicConfigMap.containsKey(bs.getId())) {

...	...	@@ -22,10 +22,7 @@
22	22	import org.springframework.beans.factory.annotation.Autowired;
23	23	import org.springframework.stereotype.Component;
24	24
25		-import java.util.ArrayList;
26		-import java.util.HashMap;
27		-import java.util.List;
28		-import java.util.Map;
	25	+import java.util.*;
29	26
30	27	@Component
31	28	public class BasicConfigFacade {
32	29
33	30
...	...	@@ -75,12 +72,25 @@
75	72
76	73	for (BasicConfig bs : mainBasicConfigList) {
77	74	configData(bs, basicConfigList,slaveBasicConfigMap);
	75	+ sortBasicConfig(bs);
78	76	}
	77	+
	78	+ //根据权重排序
	79	+ Collections.sort(mainBasicConfigList, new Comparator<BasicConfig>() {
	80	+ @Override
	81	+ public int compare(BasicConfig o1, BasicConfig o2) {
	82	+ if(o1.getWeight()!=null&&o2.getWeight()!=null){
	83	+ return -Integer.compare(o1.getWeight(),o2.getWeight());
	84	+ }
	85	+ return 0;
	86	+ }
	87	+ });
79	88	BaseResponse baseResponse = new BaseResponse();
80	89	baseResponse.setObject(mainBasicConfigList);
81	90	return baseResponse;
82	91	}
83	92
	93	+ //子节点根据权重排序
84	94	public void configData(BasicConfig bs, List<BasicConfig> basicConfigList,Map<String, List<BasicConfig>> slaveBasicConfigMap) {
85	95
86	96	if (slaveBasicConfigMap.containsKey(bs.getId())) {
...	...	@@ -91,6 +101,25 @@
91	101	}
92	102	}
93	103
	104	+ public void sortBasicConfig(BasicConfig basicConfig){
	105	+ if(CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())){
	106	+ for(BasicConfig bs:basicConfig.getBasicConfigs()){
	107	+ if(CollectionUtils.isNotEmpty(bs.getBasicConfigs())){
	108	+ sortBasicConfig(bs);
	109	+ }
	110	+ }
	111	+ Collections.sort(basicConfig.getBasicConfigs(), new Comparator<BasicConfig>() {
	112	+ @Override
	113	+ public int compare(BasicConfig o1, BasicConfig o2) {
	114	+ if(o1.getWeight()!=null&&o2.getWeight()!=null){
	115	+ return o1.getWeight().compareTo(o2.getWeight());
	116	+ }else{
	117	+ return 0;
	118	+ }
	119	+ }
	120	+ });
	121	+ }
	122	+ }
94	123
95	124
96	125	/**