用能空调代码提交 终端相关代码修改

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

@@ -0,0 +1,73 @@
+package com.njcn.device.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 监测点详细信息
+ * @author cdf
+ * @date 2022/6/29
+ */
+@Data
+public class AreaLineInfoVO implements Serializable {
+
+    @ApiModelProperty(name = "lineId",value = "监测点id")
+    private String lineId;
+
+    @ApiModelProperty(name = "lineName",value = "监测点名称")
+    private String lineName;
+
+    @ApiModelProperty(name = "subId",value = "变电站id")
+    private String subId;
+
+    @ApiModelProperty(name = "subName",value = "变电站名称")
+    private String subName;
+
+    @ApiModelProperty(name = "gdId",value = "供电公司id")
+    private String gdId;
+
+    @ApiModelProperty(name = "gdName",value = "供电公司名称")
+    private String gdName;
+
+    @ApiModelProperty(name = "voltageId",value = "母线id")
+    private String voltageId;
+
+    @ApiModelProperty(name = "voltageName",value = "母线名称")
+    private String voltageName;
+
+    @ApiModelProperty(name = "noDealCount",value = "未处理暂降事件")
+    private Integer noDealCount;
+
+    @ApiModelProperty(name = "ct1",value = "ct1")
+    private Integer ct1;
+
+    @ApiModelProperty(name = "ct2",value = "ct2")
+    private Integer ct2;
+
+    @ApiModelProperty(name = "pt1",value = "pt1")
+    private Integer pt1;
+
+    @ApiModelProperty(name = "pt2",value = "pt2")
+    private Integer pt2;
+
+    @ApiModelProperty(name = "runFlag",value = "运行状态")
+    private Integer runFlag;
+
+    @ApiModelProperty(name = "comFlag",value = "通讯状态")
+    private Integer comFlag;
+
+    @ApiModelProperty(name = "ip",value = "装置ip")
+    private String ip;
+
+    @ApiModelProperty(name = "lat",value = "维度")
+    private BigDecimal lat;
+
+    @ApiModelProperty(name = "lng",value = "经度")
+    private BigDecimal lng;
+
+    @ApiModelProperty(name = "manufacturer",value = "供应商名称")
+    private String manufacturer;
+}

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -18,7 +19,7 @@ import java.util.List;
  * @date 2021/6/23
  */
 @Data
-public class DeviceVO {
+public class DeviceVO implements Serializable {
 
     private String devIndex;
 

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * pqs
  *
@@ -13,7 +15,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @ApiModel
-public class LineMarkVO {
+public class LineMarkVO implements Serializable {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(name = "省份")
     private String province;

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -15,7 +16,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel
-public class LineVO {
+public class LineVO implements Serializable {
 
     @ApiModelProperty(name = "id",value = "监测点索引")
     private String lineIndex;

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 
 
 /**
@@ -16,7 +17,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @ApiModel
-public class ProjectVO {
+public class ProjectVO implements Serializable {
 
     /**
      * 表Id

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

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.io.Serializable;
 
 /**
  * pqs
@@ -20,7 +21,7 @@ import javax.validation.constraints.Pattern;
  */
 @Data
 @ApiModel
-public class ProvinceVO {
+public class ProvinceVO implements Serializable {
 
     /**
      * 表Id

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

@@ -3,6 +3,7 @@ package com.njcn.device.pojo.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -12,7 +13,7 @@ import java.math.BigDecimal;
  * @date 2021/7/20
  */
 @Data
-public class SubStationVO {
+public class SubStationVO implements Serializable {
     @ApiModelProperty(name ="subIndex",value = "变电站索引")
     private String subIndex;
 

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -14,7 +15,7 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class SubVoltageVO {
+public class SubVoltageVO implements Serializable {
 
     @ApiModelProperty(name = "subIndex",value = "母线索引")
     private String subvIndex;

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -16,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @ApiModel
-public class TerminalAlarmVO {
+public class TerminalAlarmVO implements Serializable {
 
 
     private String subName;

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

@@ -0,0 +1,54 @@
+package com.njcn.device.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/6/30
+ */
+@Data
+public class TerminalBaseVO {
+
+    @ApiModelProperty("监测点名称")
+    private String lineName;
+
+    @ApiModelProperty("监测点id")
+    private String lineId;
+
+    @ApiModelProperty("母线名称")
+    private String voltage;
+
+    @ApiModelProperty("母线id")
+    private String voltageId;
+
+    @ApiModelProperty("设备名称")
+    private String devName;
+
+    @ApiModelProperty("设备id")
+    private String devId;
+
+    @ApiModelProperty("变电站名称")
+    private String subName;
+
+    @ApiModelProperty("变电站id")
+    private String subId;
+
+    @ApiModelProperty("供电名称")
+    private String gdName;
+
+    @ApiModelProperty("供电id")
+    private String gdId;
+
+    @ApiModelProperty("装置ip")
+    private String ip;
+
+    @ApiModelProperty("数据更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updateTime;
+
+
+}

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -14,7 +15,7 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class TerminalLedgerVO {
+public class TerminalLedgerVO implements Serializable {
 
     @ApiModelProperty(name = "areaIndex",value = "区域索引")
     private String areaIndex;

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -14,7 +15,7 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class TerminalMaintainVO {
+public class TerminalMaintainVO implements Serializable {
     @ApiModelProperty(name="序号")
     private Integer index;
     @ApiModelProperty(name = "拓扑名称")

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 @ApiModel
 @Data
-public class TerminalTree {
+public class TerminalTree implements Serializable {
     private String id;
     @ApiModelProperty(name = "parentId",value = "父id")
     private String pid;

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -16,7 +17,7 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class TerminalVO {
+public class TerminalVO implements Serializable {
     @ApiModelProperty(name = "projectVO",value = "项目实体")
     private ProjectVO projectVO;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,7 +16,7 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class TerminalVersionVO {
+public class TerminalVersionVO implements Serializable {
     @ApiModelProperty(name="序号")
     private Integer index;
     @ApiModelProperty(name = "拓扑名称")