修复已知bug

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

@@ -433,8 +433,6 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                         monitorDataChartReportAttributeDto.getMonitorDataChartReportValue() == null) {
                     continue;
                 }
-                Integer growingBase = 1;
-
                 String unit = monitorDataChartReportAttributeDto.getUnit();
                 unit = StringUtils.isNotBlank(unit) ? unit : "";
                 List<MonitorDataChartReportValueDto> monitorDataChartReportValueDtos = monitorDataChartReportAttributeDto.getMonitorDataChartReportValue();
@@ -449,13 +447,14 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                         monitorDataChartReportValueDto.setDate(dateTime);
                         monitorDataChartReportValueDto.setDateLabel(i);
                         monitorDataChartReportValueDto.setMonitorData("");
-                        monitorDataChartReportValueDtos.add(growingBase-1,monitorDataChartReportValueDto);
+                        monitorDataChartReportValueDtos.add(monitorDataChartReportValueDto);
                     } else {
                         monitorDataChartReportValueDto.setMonitorData(monitorDataChartReportValueDto.getData()+""+unit);
-                        LocalDateTime dateTime = monitorDataChartReportValueDto.getDate();
-                        setDateStringLabel(localDateTime, dateTime, i , monitorDataChartReportValueDto, type, false);
+                        LocalDateTime dateTime = yearMonthDay(year,month, i);
+                        if (StringUtils.isEmpty(monitorDataChartReportValueDto.getDateStringLabel())){
+                            setDateStringLabel(localDateTime, dateTime, i , monitorDataChartReportValueDto, type, false);
+                        }
                     }
-                    growingBase++;
                 }
             }
         }

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

@@ -900,8 +900,8 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                 alarmDetailsVo = new AlarmDetailsVo();
             }
             endTime   = alarmDetails.getAlarmEndTime() != null ? alarmDetails.getAlarmEndTime() : nowTime;
-            startTime = startTime.after(alarmDetails.getAlarmStartTime()) ? DatesUtil.parseDate(dto.getStartTime(), "yyyy-MM-dd HH:mm:ss")
-                        : alarmDetails.getAlarmStartTime();
+            startTime = DatesUtil.parseDate(dto.getStartTime(), "yyyy-MM-dd HH:mm:ss");
+            startTime = startTime.after(alarmDetails.getAlarmStartTime()) ? startTime : alarmDetails.getAlarmStartTime();
             minutes   = DatesUtil.minutesBetween(startTime, endTime);
             alarmDetailsVo.setDeviceName(alarmDetails.getDeviceName());
             alarmDetailsVo.setId(sendId);