监测点统计，终端运行统计接口

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

@@ -0,0 +1,19 @@
+package com.njcn.device.pq.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@ApiModel
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class PqsParam extends DeviceInfoParam.BusinessParam {
+    @ApiModelProperty("当前页码")
+    private Integer pageNum;
+    @ApiModelProperty("当前页条数")
+    private Integer pageSize;
+}

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

@@ -0,0 +1,32 @@
+package com.njcn.device.pq.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.influxdb.annotation.Column;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pqs_onlinerate")
+public class OnlineRate extends BaseEntity {
+
+    @Column(name="Id")
+    private String id;
+
+    @Column(name="Create_Time")
+    private LocalDateTime createTime;
+
+    @Column(name="Dev_Id")
+    private String devId;
+
+    @Column(name="Offline_Min")
+    private String offlineMin;
+
+    @Column(name="Online_Min")
+    private String onlineMin;
+
+    private Double onlineRate;
+}

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

@@ -0,0 +1,21 @@
+package com.njcn.device.pq.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pqs_month_flow")
+public class PqsMonthFlow extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String time;
+
+    private String actualValue;
+
+    private String devId;
+}

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

@@ -1,5 +1,6 @@
 package com.njcn.device.pq.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -18,6 +19,18 @@ public class LineFlowMealDetailVO implements Serializable {
     @ApiModelProperty("id")
     private String id;
 
+    @ApiModelProperty("监测点对应的设备id")
+    private String DeviceId;
+
+    @ApiModelProperty("监测点对应的设备名称")
+    private String DeviceName;
+
+    @ApiModelProperty("供电公司")
+    private String ElectricPowerCompany;
+
+    @ApiModelProperty("变电站")
+    private String Substation;
+
     @ApiModelProperty("pid")
     private String pid;
 
@@ -37,6 +50,7 @@ public class LineFlowMealDetailVO implements Serializable {
     private Integer comFlag;
 
     @ApiModelProperty("最新更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     @ApiModelProperty("在线率")
@@ -45,6 +59,12 @@ public class LineFlowMealDetailVO implements Serializable {
     @ApiModelProperty("数据完整性")
     private Float integrity;
 
+    @ApiModelProperty("理论数据量")
+    private Integer due;
+
+    @ApiModelProperty("实际数据量")
+    private Integer real;
+
     @ApiModelProperty("套餐流量")
     private Float flowMeal;
 

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

@@ -21,4 +21,10 @@ public class LineInfluxDbInegrityVO implements Serializable {
     @Column(name = "integrity")
     private Double integrity;
 
+    @Column(name = "due")
+    private Integer due;
+
+    @Column(name = "real")
+    private Integer real;
+
 }

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

@@ -25,6 +25,12 @@ public class LineStatisticsDetailVO implements Serializable {
     @ApiModelProperty("监测点总数")
     private Integer lineNum;
 
+    @ApiModelProperty("装置总数")
+    private Integer DeviceNum;
+
+    @ApiModelProperty("装置新增总数")
+    private Integer addDeviceNum;
+
     @ApiModelProperty("监测点新增数")
     private Integer addLineNum;