Merge remote-tracking branch 'origin/master'

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/DeviceResponseEnum.java

@@ -88,7 +88,10 @@ public enum DeviceResponseEnum {
     QUERY_PROVINCE_DATA_EMPTY("A0358","查询区域数据为空"),
     QUERY_ALARMSTRATEGY_DATA_EMPTY("A0359","查询告警策略数据为空"),
     QUERY_DEVICELEVELANDID_DATA_EMPTY("A0360","查询终端等级和id数据为空"),
-    QUERY_DEVICE_DATA_EMPTY("A0360","查询终端数据数据为空")
+    QUERY_DEVICE_DATA_EMPTY("A0360","查询终端数据数据为空"),
+    SAME_ALARM_STRATEGY("A0361","当前等级策略已存在"),
+    LINE_GRADE_INDEX_ERR("A0362","异常等级索引"),
+    LINE_GRADE_LESS("A0363","监测点等级策略缺失")
 
 
 

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

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @ApiModel
-public class AlarmParam extends BaseParam {
+public class AlarmParam {
 
     @NotBlank(message = "起始时间不可为空")
     @DateTimeStrValid
@@ -45,4 +45,12 @@ public class AlarmParam extends BaseParam {
 
     @ApiModelProperty(name = "processTime",value = "处理时间")
     private String processTime;
+
+
+
+    @ApiModelProperty("页码")
+    private Integer pageNum;
+
+    @ApiModelProperty("页面尺寸")
+    private Integer pageSize;
 }

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

@@ -19,7 +19,7 @@ public class LineDataIntegrity implements Serializable {
     /**
      * 监测点id
      */
-    @Column(name = "line_id")
+    @Column(name = "line_id",tag = true)
     private String lineId;
 
     /**
@@ -40,9 +40,11 @@ public class LineDataIntegrity implements Serializable {
     @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/influxdb/CldAlarm.java

@@ -0,0 +1,57 @@
+package com.njcn.device.pq.pojo.po.influxdb;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/2/14
+ */
+@Data
+@Measurement(name = "pas_alarm")
+public class CldAlarm {
+
+    /**
+     * 告警信息表序号
+     */
+    @Column(name = "time")
+    private String time;
+
+    /**
+     * 告警类型序号
+     */
+    @Column(name = "type")
+    private String type;
+
+    /**
+     * 告警对应的装置或者监测点
+     */
+    @Column(name = "line_id")
+    private String lineId;
+
+    @Column(name = "dev_line_type")
+    private Integer devLineType;
+
+    @Column(name = "process_time")
+    private LocalDateTime processTime;
+
+    /**
+     * 是否处理（0-未处理 1-已处理）
+     */
+    @Column(name = "flag")
+    private Integer flag;
+
+    /**
+     * 告警的详细描述
+     */
+    @Column(name = "remark")
+    private String remark;
+
+
+}

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

@@ -109,6 +109,8 @@ public class LineIntegrityDataVO implements Serializable {
     @ApiModelProperty(name = "lineGrade",value = "终端等级")
     private String lineGrade;
 
+    private String lineGradeName;
+
 
 
     @ApiModelProperty(name = "loadType",value = "干扰源类型")
@@ -125,7 +127,7 @@ public class LineIntegrityDataVO implements Serializable {
      * 监测点合格率
      */
     @ApiModelProperty(name = "LinePassRate",value = "监测点合格率  0：不合格  1：合格")
-    private Double linePassRate;
+    private Integer linePassRate;
 
 
     /**