1.微调

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

@@ -1,10 +1,13 @@
 package com.njcn.device.pq.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * <p>
  *
@@ -61,6 +64,8 @@ public class Line extends BaseEntity {
     private Integer state;
 
 
+    @TableField(exist = false)
+    private List<Line> children;
 
 
 }

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

@@ -46,6 +46,9 @@ public class LineDetailDataVO {
     @ApiModelProperty(name = "devName",value = "终端名称")
     private String devName;
 
+    @ApiModelProperty(name = "装置型号")
+    private String devType;
+
     @ApiModelProperty(name = "ip",value = "网络参数")
     private String ip;
 

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

@@ -49,6 +49,6 @@ public class LineDataExcel implements Serializable {
     private BigDecimal integrity;
 
     @ExcelProperty(value = "国网ID")
-    private BigDecimal monitorId;
+    private String monitorId;
 
 }