增加采集时间

sms_water/src/main/java/com/huaxu/controller/MonitorInfoController.java

@@ -75,6 +75,7 @@ public class MonitorInfoController {
             byte[] bytes = redisUtil.get(("sms_water_" + item.getDeviceCode()).getBytes());
             if (bytes != null && bytes.length > 0) {
                 MonitorDataEntity monitorDataEntity = (MonitorDataEntity) ByteArrayUtils.bytesToObject(bytes).get();
+                sceneUsageDto.setCollectDate(monitorDataEntity.getCollectDate());
                 //筛选该设备相同属性的值
                 Map<Long, MonitorDataValueEntity> map = new HashMap<>();
                 //将缓存中的实时数据放到map中方便进行遍历

sms_water/src/main/java/com/huaxu/dto/SceneUsageDto.java

@@ -1,9 +1,13 @@
 package com.huaxu.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @ApiModel(value = "场景属性汇总值")
 public class SceneUsageDto {
@@ -15,4 +19,8 @@ public class SceneUsageDto {
     private Double powerUsage;
     @ApiModelProperty("今日耗药量")
     private Double drugUsage;
+    @ApiModelProperty("采集时间")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy/MM/dd HH:mm" , timezone = "GMT+8")
+    private Date collectDate;
 }