diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index c011c56..feac7fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -1485,10 +1485,10 @@ public class RiskReportFacade { List> result=new ArrayList<>(); Integer count =0; if(CollectionUtils.isNotEmpty(datas)) { - count+= dataTierSort(datas, "315107bd-91fe-42a1-9237-752f3c046a40", result); - count+= dataTierSort(datas, "49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", result); - count+= dataTierSort(datas, "eb146c03-b19f-4e28-b85f-fda574b2283b", result); - count+= dataTierSort(datas, "224b2329-cb82-4da3-a071-8527f8283aab", result); + count+= riskDataType(datas, "315107bd-91fe-42a1-9237-752f3c046a40", result); + count+= riskDataType(datas, "49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", result); + count+= riskDataType(datas, "eb146c03-b19f-4e28-b85f-fda574b2283b", result); + count+= riskDataType(datas, "224b2329-cb82-4da3-a071-8527f8283aab", result); //自定义高危 count+= datas.get(datas.size()-1).getRiskCount(); result.add(MapUtil.beanToMap(datas.get(datas.size()-1))); @@ -1510,7 +1510,7 @@ public class RiskReportFacade { } //高危分类 - public int dataTierSort(List datas,String riskColor,List> result) { + public int riskDataType(List datas,String riskColor,List> result) { int count=0; for (RiskReportResult data : datas) { //黄色 @@ -1518,18 +1518,18 @@ public class RiskReportFacade { result.add(MapUtil.beanToMap(data)); count=data.getRiskCount(); for (RiskReportResult data2 : datas) { - a(data,data2,datas,result); + riskDataTier(data,data2,datas,result); } } } return count; } //层级关系 - public void a(RiskReportResult data,RiskReportResult data2,List datas,List> result){ + public void riskDataTier(RiskReportResult data,RiskReportResult data2,List datas,List> result){ if(data.getHighRiskId().equals(data2.getPid())){ result.add(MapUtil.beanToMap(data2)); for (RiskReportResult dataN : datas) { - a(data2, dataN,datas,result); + riskDataTier(data2, dataN,datas,result); } } }