Merge remote-tracking branch 'origin/main'

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/common/DeviceOnlineRate.java

@@ -1,5 +1,6 @@
 package com.njcn.device.pq.pojo.vo.common;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -108,9 +109,19 @@ public class DeviceOnlineRate {
         @ApiModelProperty("终端IP")
         private String ip;
 
+        @ApiModelProperty("监测点id")
+        private String lineId;
+
+        @ApiModelProperty("监测点名称")
+        private String lineName;
+
         @ApiModelProperty("监测点运行状态")
         private String runFlag;
 
+        @ApiModelProperty("最新数据时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime latestTime;
+
         @ApiModelProperty("数据完整性")
         private Double integrity;
     }