终端在线率，终端完整性开发

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TerminalOnlineRateDataParam.java

@@ -27,4 +27,10 @@ public class TerminalOnlineRateDataParam extends DeviceInfoParam.BusinessParam{
      */
     @ApiModelProperty(name = "lineGrade",value = "字段表监测点等级，0：极重要  1：重要  2：普通  3：不重要")
     private String lineGrade;
+
+    /**
+     * 调用模块分类
+     */
+    @ApiModelProperty(name = "module",value = "接口调用方 deviceBoot:业务管理员-运维中心,harmonicBoot:谐波-区域")
+    private String module;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDataIntegrity.java

@@ -13,38 +13,32 @@ import java.io.Serializable;
  */
 
 @Data
-@Measurement(name = "pqs_integrity")
 public class LineDataIntegrity implements Serializable {
 
     /**
      * 监测点id
      */
-    @Column(name = "line_id",tag = true)
     private String lineId;
 
     /**
      * 实际值
      */
-    @Column(name = "real")
     private Double real;
 
     /**
      * 期望值
      */
-    @Column(name = "due")
     private Double due;
 
     /**
      * 时间
      */
-    @Column(name = "time")
     private String time;
 
 
     /**
      * 监测点数据完整性
      */
-    @Column(name = "integrityData")
     private Double integrityData;
 
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TerminalOnlineRateData.java

@@ -7,32 +7,39 @@ import org.influxdb.annotation.Measurement;
 import java.io.Serializable;
 
 /**
- * 接收查询influxdb数据（终端在线率业务）
+ * 接收查询mysql数据（终端在线率业务）
  *
  * @author yzh
  * @date 2022/9/22
  */
 
 @Data
-@Measurement(name = "pqs_onlinerate")
+
 public class TerminalOnlineRateData implements Serializable {
 
     /**
      * 时间
      */
-    @Column(name = "time")
     private String time;
 
     /**
      * 终端id
      */
-    @Column(name = "dev_id",tag = true)
     private String devId;
 
     /**
      * 终端在线率
      */
-    @Column(name = "online_rate")
     private Double onlineRate = 3.14159;
 
+    /**
+     * 在线时间(分钟)
+     */
+    private Integer onlineMin;
+
+    /**
+     * 离线时间(分钟)
+     */
+    private Integer offlineMin;
+
 }

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

@@ -56,5 +56,10 @@ public class AlarmStrategyVO implements Serializable {
     @ApiModelProperty("更新用户")
     private String updateBy;
 
+    /**
+     * 字段表监测点等级
+     */
+    @ApiModelProperty(name = "algoDescribe",value = "字段表监测点等级，0：极重要  1：重要  2：普通  3：不重要")
+    private Integer algoDescribe;
 
 }

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

@@ -112,6 +112,13 @@ public class LineIntegrityDataVO implements Serializable {
     private String lineGradeName;
 
 
+    /**
+     * 字段表监测点等级
+     */
+    @ApiModelProperty(name = "algoDescribe",value = "字段表监测点等级，0：极重要  1：重要  2：普通  3：不重要")
+    private Integer algoDescribe;
+
+
 
     @ApiModelProperty(name = "loadType",value = "干扰源类型")
     private String loadType;
@@ -127,7 +134,7 @@ public class LineIntegrityDataVO implements Serializable {
      * 监测点合格率
      */
     @ApiModelProperty(name = "LinePassRate",value = "监测点合格率  0：不合格  1：合格")
-    private Integer linePassRate;
+    private Integer valueOver;
 
 
     /**

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

@@ -110,12 +110,12 @@ public class TerminalOnlineRateDataVO implements Serializable {
      */
     @ApiModelProperty(name = "algoDescribe",value = "字段表监测点等级，0：极重要  1：重要  2：普通  3：不重要")
     private Integer algoDescribe;
-
-
     /**
      * 子节点集合
      */
     @ApiModelProperty(name = "children",value = "子节点集合")
     private List<TerminalOnlineRateDataVO> children = new ArrayList<>();
 
+
+
 }