修复已知bug

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -891,17 +891,18 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
         Long sendId  = null;
         long minutes = 0;
         Date startTime = null;
+        Date endTime = null;
+        Date nowTime = new Date();
         for (AlarmDetailsVo alarmDetails : alarmDetailsVos) {
             sendId = alarmDetails.getId();
             AlarmDetailsVo alarmDetailsVo = dataMap.get(sendId);
             if (alarmDetailsVo == null) {
                 alarmDetailsVo = new AlarmDetailsVo();
             }
-            if (alarmDetails.getAlarmEndTime() != null){
-                startTime = DatesUtil.parseDate(dto.getStartTime(), "yyyy-MM-dd HH:mm:ss");
-                minutes   = DatesUtil.minutesBetween(startTime.after(alarmDetails.getAlarmStartTime()) ? startTime : alarmDetails.getAlarmStartTime(),
-                        alarmDetails.getAlarmEndTime());
-            }
+            endTime   = alarmDetails.getAlarmEndTime() != null ? alarmDetails.getAlarmEndTime() : nowTime;
+            startTime = startTime.after(alarmDetails.getAlarmStartTime()) ? DatesUtil.parseDate(dto.getStartTime(), "yyyy-MM-dd HH:mm:ss")
+                        : alarmDetails.getAlarmStartTime();
+            minutes   = DatesUtil.minutesBetween(startTime, endTime);
             alarmDetailsVo.setDeviceName(alarmDetails.getDeviceName());
             alarmDetailsVo.setId(sendId);
             alarmDetailsVo.setAlarmCount( alarmDetailsVo.getAlarmCount() + 1 );