|
@@ -30,7 +30,7 @@ public class AlarmService {
|
|
cal.setTime(DateUtil.parseStrtoDate(faultTime, DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
cal.setTime(DateUtil.parseStrtoDate(faultTime, DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
cal.add(Calendar.HOUR, -5);
|
|
cal.add(Calendar.HOUR, -5);
|
|
String st = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
|
|
String st = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
|
|
- cal.add(Calendar.HOUR, 6);
|
|
|
|
|
|
+ cal.add(Calendar.HOUR, 5);
|
|
String et = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
|
|
String et = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
|
|
|
|
|
|
JSONObject data = remoteService.sharding().getAlertHistory("windturbine", st, et, station, wtId, 1);
|
|
JSONObject data = remoteService.sharding().getAlertHistory("windturbine", st, et, station, wtId, 1);
|
|
@@ -46,7 +46,7 @@ public class AlarmService {
|
|
cal.setTime(DateUtil.parseStrtoDate(faultTime, DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
cal.setTime(DateUtil.parseStrtoDate(faultTime, DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
cal.add(Calendar.HOUR, -5);
|
|
cal.add(Calendar.HOUR, -5);
|
|
String st = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
|
|
String st = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
|
|
- cal.add(Calendar.HOUR, 6);
|
|
|
|
|
|
+ cal.add(Calendar.HOUR, 5);
|
|
String et = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
|
|
String et = DateUtil.format(cal.getTime(), DateUtil.YYYY_MM_DD_HH_MM_SS);
|
|
|
|
|
|
JSONObject data = remoteService.sharding().getAlertHistory("windturbine", st, et, station, wtId, 1);
|
|
JSONObject data = remoteService.sharding().getAlertHistory("windturbine", st, et, station, wtId, 1);
|