移除地图摄像头返回
This commit is contained in:
parent
0b750b94d2
commit
16f199a8de
|
|
@ -356,6 +356,8 @@ public class IotCommonP2ServiceImpl {
|
||||||
}else if(IotConstants.month_days.equals(screenSummaryVo.getSummrayMode())){//月需要数据量
|
}else if(IotConstants.month_days.equals(screenSummaryVo.getSummrayMode())){//月需要数据量
|
||||||
LocalDate curDateMark = LocalDate.parse(startTime+"-01",daydtf);
|
LocalDate curDateMark = LocalDate.parse(startTime+"-01",daydtf);
|
||||||
todayDataCounts = curDateMark.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
|
todayDataCounts = curDateMark.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
|
||||||
|
} else if (IotConstants.year_months.equals(screenSummaryVo.getSummrayMode())) {
|
||||||
|
todayDataCounts = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(IotConstants.day_hours.equals(screenSummaryVo.getSummrayMode())){//检查是否是今天
|
if(IotConstants.day_hours.equals(screenSummaryVo.getSummrayMode())){//检查是否是今天
|
||||||
|
|
@ -407,6 +409,9 @@ public class IotCommonP2ServiceImpl {
|
||||||
|
|
||||||
timeList.addAll(nowItegrate.getIndexs().subList(0,todayDataCounts));
|
timeList.addAll(nowItegrate.getIndexs().subList(0,todayDataCounts));
|
||||||
|
|
||||||
|
if(dataMap.isEmpty()){//如果非今日,传入第一次的统计
|
||||||
|
dataMap.putAll(nowItegrate.getSurvResult());
|
||||||
|
}
|
||||||
voSurvIntegrateResult.setHeaders(nowItegrate.getHeaders());
|
voSurvIntegrateResult.setHeaders(nowItegrate.getHeaders());
|
||||||
voSurvIntegrateResult.setSurvResult(dataMap);
|
voSurvIntegrateResult.setSurvResult(dataMap);
|
||||||
voSurvIntegrateResult.setIndexs(timeList);
|
voSurvIntegrateResult.setIndexs(timeList);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue