gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整配置ID日志链接有无日志数据时都添加日志链接

Browse Source
This commit is contained in:
leijun
2018-12-10 18:16:00 +08:00
parent 4ba77cf356
commit 3868221a25
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/nis/web/controller/report/NtcPzReportController.java
View File

@@ -116,22 +116,21 @@ public class NtcPzReportController extends BaseController{
String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate)); String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
List<NtcPzReport> list=getList(json); List<NtcPzReport> list=getList(json);
String[] idArr=compileIds.split(","); String[] idArr=compileIds.split(",");
if(list!=null&&(list.size()>0)){ for(String id:idArr) {
for(NtcPzReport report:list) { Map<String, Object> data=new HashMap<String, Object>();
Map<String, Object> data=new HashMap<String, Object>(); data.put("compileId", id);
data.put("compileId", report.getCfgId().longValue()); Long sum=(long) 0;
data.put("sum",report.getSum().longValue()); if(list!=null&&(list.size()>0)){
dataList.add(data); for(NtcPzReport report:list) {
} if(Long.valueOf(id).longValue() == report.getCfgId().longValue()){
}else { sum=report.getSum().longValue();
for(String id:idArr) { break;
Map<String, Object> data=new HashMap<String, Object>(); }
data.put("compileId", id); }
data.put("sum",0);
dataList.add(data);
} }
data.put("sum",sum);
dataList.add(data);
} }
return dataList; return dataList;
} }
@RequestMapping("/ntcPzReport") @RequestMapping("/ntcPzReport")