Merge remote-tracking branch 'origin/main'

pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java

@@ -82,7 +82,8 @@ public class Knife4jSwaggerConfig {
                 "com.njcn.algorithm",
                 "com.njcn.dataProcess",
                 "com.njcn.migration",
-                "com.njcn.harmonic.rstatlimitrate.controller"
+                "com.njcn.harmonic.rstatlimitrate.controller",
+                "com.njcn.device.device.controller"
                 )
                 .collect(Collectors.toList());
         List<GrantType> grantTypes = new ArrayList<>();

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;
     }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java

@@ -180,6 +180,9 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                     detail.setManufacturer(line.getManufacturer());
                     detail.setIp(line.getIp());
                     detail.setRunFlag(RunFlagEnum.getRunFlagRemarkByStatus(Integer.valueOf(line.getLineRunType())));
+                    detail.setLineId(line.getLineId());
+                    detail.setLineName(line.getLineName());
+                    detail.setLatestTime(line.getTimeID());
                     detail.setIntegrity(onlineRateByDevMap.getOrDefault(line.getLineId(), 0.0));
                     detailList.add(detail);
                 }