|
@@ -57,14 +57,15 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
|
|
|
list.add(getTreedBySite("昨日", siteId, ysTime, yeTime));
|
|
|
list.add(getTreedBySite("今日", siteId, sTime, eTime));
|
|
|
}else {
|
|
|
- list.add(getTrendOne("昨日", userId, ysTime));
|
|
|
- list.add(getTrendOne("今日", userId, sTime));
|
|
|
+ list.add(getTrendOne("昨日", userId, ysTime,yeTime));
|
|
|
+ list.add(getTrendOne("今日", userId, sTime,eTime));
|
|
|
}
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
|
|
|
- public CommonIcoVO getTrendOne(String name,Integer userId,Date startTime){
|
|
|
+ public CommonIcoVO getTrendOne(String name,Integer userId,Date startTime,Date endTime){
|
|
|
+ List<HadSiteStatic> list = hadSiteStaticService.list(null, startTime, endTime, userId);
|
|
|
List<Object> objects = new ArrayList<>();
|
|
|
objects.add(0.0);
|
|
|
List<Object> dates = new ArrayList<>();
|
|
@@ -72,9 +73,15 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
|
|
|
for (int i = 2; i < 24 ; i+=2) {
|
|
|
//结束时间
|
|
|
Date hours = DateUtils.setHours(startTime, i);
|
|
|
- objects.add(hadSiteStaticService.getCount(userId,startTime,hours,null));
|
|
|
startTime = hours;
|
|
|
dates.add(DateUtils.getTime(hours));
|
|
|
+ Double hourCount = 0.00;
|
|
|
+ for (HadSiteStatic hadSiteStatic:list) {
|
|
|
+ CommonIcoVO commonIcoVO = JsonUtils.fromJson(hadSiteStatic.getLoadIco(), CommonIcoVO.class);
|
|
|
+ List<Double> dataList = (List<Double>) commonIcoVO.getList();
|
|
|
+ hourCount+=dataList.get(i/2);
|
|
|
+ }
|
|
|
+ objects.add(Arith.div(hourCount,1,2));
|
|
|
}
|
|
|
return CommonIcoVO.builder().name(name).list(objects).listDate(dates).build();
|
|
|
}
|