添加告警参数属性

zoniot-water/zoniot-water-api/src/main/java/com/bz/zoneiot/water/api/dto/AlarmTypeDetailsDto.java

@@ -25,7 +25,7 @@ public class AlarmTypeDetailsDto extends BasePageDto {
     @ApiModelProperty("结束时间")
     private String endTime;
 
-    @ApiModelProperty(value="场景类型SceneTypeEnum：1.水源 2.水厂 3.泵站 4.管网")
+    @ApiModelProperty(value="场景类型SceneTypeEnum：1.水源 2.水厂 3.泵站 4.管网 ")
     private Integer sceneType;
 
     @ApiModelProperty("0 : 历史报警 1:实时报警")

zoniot-water/zoniot-water-api/src/main/java/com/bz/zoneiot/water/api/dto/MonitorDataChartReportValueDto.java

@@ -1,5 +1,6 @@
 package com.bz.zoneiot.water.api.dto;
 
+import com.bz.zoneiot.core.utils.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * @description
@@ -32,12 +34,22 @@ public class MonitorDataChartReportValueDto implements  Comparable<MonitorDataCh
     @ApiModelProperty("日期时间")
     private LocalDateTime date;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty("日期时间")
+    private Date dateFormat;
 
     @Override
     public int compareTo(MonitorDataChartReportValueDto o) {
         return toInt(this.getDateStringLabel()) - toInt(o.getDateStringLabel());
     }
 
+    public LocalDateTime getDate(){
+        if (date == null && dateFormat != null) {
+            return DateUtil.asLocalDateTime(dateFormat);
+        }
+        return date;
+    }
+
     private int toInt(String str ){
         if (StringUtils.isEmpty(str)){
             str = "0";

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/MonitorDataReportMapper.xml

@@ -20,7 +20,7 @@
         <result property="dateStringLabel" column="dateStringLabel"/>
         <result property="monitorData" column="monitorData"/>
         <result property="data" column="data"/>
-        <result property="date" column="date"/>
+        <result property="dateFormat" column="date"/>
     </resultMap>
 
     <sql id="MonitorDataReportJoins">

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/AbstractReportService.java

@@ -572,7 +572,9 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
             return new Page<>();
         }
         Page<ReportVo> reportPage = this.findPageReport(page, getReportPageQuery(queryDto, devices, isPipe));
-        reportDataHandle(queryDto, devices, reportPage, isPipe);
+        if (!CollectionUtil.isEmpty(reportPage.getRecords())){
+            reportDataHandle(queryDto, devices, reportPage, isPipe);
+        }
         return reportPage;
     }
 

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/MonitorDataReportServiceImpl.java

@@ -331,6 +331,9 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                 deviceWaterSupplies.get(i).setDate(newLocalDate);
             }
         }
+        if (deviceWaterSupplies.size() > 15){
+            deviceWaterSupplies = deviceWaterSupplies.subList(0, 15);
+        }
         deviceWaterSupplies.sort(Comparator.comparing(DeviceWaterSupplyVo::getOrderNo).reversed());
         return deviceWaterSupplies;
     }