yangshj
/
zhongwei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

#新版监控系统水位统计修改

zhongwei
yang_shj 1 year ago
parent
c88ec91f5c
commit
8ee3dccc35
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java

6
hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
Unescape View File

@ -1296,10 +1296,10 @@ public class RealTargetServiceImpl implements RealTargetService {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date()); calendar.setTime(new Date());
// 结束时间 // 结束时间
String end = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH:") + "59:59"; String end = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH") + ":59:59";
calendar.add(Calendar.HOUR_OF_DAY,-23); calendar.add(Calendar.HOUR_OF_DAY,-23);
// 开始时间 // 开始时间
String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME); String start = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH") + ":00:00";
List<AnalyseDataTaosVO> datas = dataService.periodTargetData(start, end,6, 2,instanceCode,signage); List<AnalyseDataTaosVO> datas = dataService.periodTargetData(start, end,6, 2,instanceCode,signage);
if(CollectionUtil.isEmpty(datas)){ if(CollectionUtil.isEmpty(datas)){
return new HashMap<>(); return new HashMap<>();
@ -1559,7 +1559,7 @@ public class RealTargetServiceImpl implements RealTargetService {
calendar.add(Calendar.HOUR_OF_DAY,-23); calendar.add(Calendar.HOUR_OF_DAY,-23);
// 开始日期 // 开始日期
Date start = calendar.getTime(); Date start = calendar.getTime();
List<AnalyseDataTaosVO> records = dataService.periodTargetData(DateUtil.format(start,"yyyy-MM-dd HH") + ":00:00", DateUtil.format(end,DateUtil.PATTERN_DATETIME), 3, 2, device.getEmCode(), HomePageConstant.PV_LOAD); List<AnalyseDataTaosVO> records = dataService.periodTargetData(DateUtil.format(start,"yyyy-MM-dd HH") + ":00:00", DateUtil.format(start,"yyyy-MM-dd HH") + ":59:59", 3, 2, device.getEmCode(), HomePageConstant.PV_LOAD);
List<ActivePowerVo> activePowers = new ArrayList<>(); List<ActivePowerVo> activePowers = new ArrayList<>();
while (start.compareTo(end) <= 0){ while (start.compareTo(end) <= 0){
String time = DateUtil.format(start,"yyyy-MM-dd HH"); String time = DateUtil.format(start,"yyyy-MM-dd HH");

Write Preview
Loading…
Cancel
Save