Commit 99531e9ff27f612c4f86dc1125762f654b58d7ad

Authored by shiyang
1 parent 3a768ab5ef

update

Showing 1 changed file with 8 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 99531e9
... ... @@ -1485,10 +1485,10 @@
1485 1485 List<Map<String,Object>> result=new ArrayList<>();
1486 1486 Integer count =0;
1487 1487 if(CollectionUtils.isNotEmpty(datas)) {
1488   - count+= dataTierSort(datas, "315107bd-91fe-42a1-9237-752f3c046a40", result);
1489   - count+= dataTierSort(datas, "49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", result);
1490   - count+= dataTierSort(datas, "eb146c03-b19f-4e28-b85f-fda574b2283b", result);
1491   - count+= dataTierSort(datas, "224b2329-cb82-4da3-a071-8527f8283aab", result);
  1488 + count+= riskDataType(datas, "315107bd-91fe-42a1-9237-752f3c046a40", result);
  1489 + count+= riskDataType(datas, "49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", result);
  1490 + count+= riskDataType(datas, "eb146c03-b19f-4e28-b85f-fda574b2283b", result);
  1491 + count+= riskDataType(datas, "224b2329-cb82-4da3-a071-8527f8283aab", result);
1492 1492 //自定义高危
1493 1493 count+= datas.get(datas.size()-1).getRiskCount();
1494 1494 result.add(MapUtil.beanToMap(datas.get(datas.size()-1)));
... ... @@ -1510,7 +1510,7 @@
1510 1510  
1511 1511 }
1512 1512 //高危分类
1513   - public int dataTierSort(List<RiskReportResult> datas,String riskColor,List<Map<String,Object>> result) {
  1513 + public int riskDataType(List<RiskReportResult> datas,String riskColor,List<Map<String,Object>> result) {
1514 1514 int count=0;
1515 1515 for (RiskReportResult data : datas) {
1516 1516 //黄色
1517 1517  
1518 1518  
... ... @@ -1518,18 +1518,18 @@
1518 1518 result.add(MapUtil.beanToMap(data));
1519 1519 count=data.getRiskCount();
1520 1520 for (RiskReportResult data2 : datas) {
1521   - a(data,data2,datas,result);
  1521 + riskDataTier(data,data2,datas,result);
1522 1522 }
1523 1523 }
1524 1524 }
1525 1525 return count;
1526 1526 }
1527 1527 //层级关系
1528   - public void a(RiskReportResult data,RiskReportResult data2,List<RiskReportResult> datas,List<Map<String,Object>> result){
  1528 + public void riskDataTier(RiskReportResult data,RiskReportResult data2,List<RiskReportResult> datas,List<Map<String,Object>> result){
1529 1529 if(data.getHighRiskId().equals(data2.getPid())){
1530 1530 result.add(MapUtil.beanToMap(data2));
1531 1531 for (RiskReportResult dataN : datas) {
1532   - a(data2, dataN,datas,result);
  1532 + riskDataTier(data2, dataN,datas,result);
1533 1533 }
1534 1534 }
1535 1535 }