|
@@ -55,6 +55,19 @@ public class PangolinReportAppHourServiceImpl extends ServiceImpl<PangolinReport
|
|
|
List<JSONObject> dataList = new ArrayList<>();
|
|
|
for(int i=0;i<24;i++){
|
|
|
JSONObject getData = this.getComparedDate(appId,i,userId,type,today,yesterday,sevenDaysAgo,compareTime1,compareTime2,projectIds,accountNames);
|
|
|
+ if(null == getData){
|
|
|
+ getData = new JSONObject();
|
|
|
+ getData.put("today",0);
|
|
|
+ getData.put("yesterday",0);
|
|
|
+ getData.put("sevendaysAgo",0);
|
|
|
+ getData.put("hour",i);
|
|
|
+ if(null!=compareTime1&&!compareTime1.trim().equals("")){
|
|
|
+ getData.put(compareTime1,0);
|
|
|
+ }
|
|
|
+ if(null!=compareTime2&&!compareTime2.trim().equals("")){
|
|
|
+ getData.put(compareTime2,0);
|
|
|
+ }
|
|
|
+ }
|
|
|
dataList.add(getData);
|
|
|
}
|
|
|
resultMap.put("data",dataList);
|