代码调整

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

@@ -152,9 +152,38 @@ public class LineParam {
     @NotNull(message = "电压下偏差限值不能为空")
     private Float uvoltageDev;
 
+    @ApiModelProperty(name = "powerSubstationName",value = "电网侧变电站")
+    private String powerSubstationName;
+
     /**
-     * 修改标识
+     * 分类等级
      */
+    @ApiModelProperty(name = "calssificationGrade",value = "分类等级")
+    private String calssificationGrade;
+
+    @ApiModelProperty(name = "superiorsSubstation",value = "上级电站")
+    private String superiorsSubstation;
+
+    @ApiModelProperty(name = "hangLine",value = "挂接线路")
+    private String hangLine;
+
+
+    @ApiModelProperty(name = "owner",value = "监测点拥有者")
+    private String owner;
+
+
+    @ApiModelProperty(name = "ownerDuty",value = "拥有者职务")
+    private String ownerDuty;
+
+
+    @ApiModelProperty(name = "ownerTel",value = "拥有者联系方式")
+    private String ownerTel;
+
+
+    @ApiModelProperty(name = "wiringDiagram",value = "接线图")
+    private String wiringDiagram;
+
+
     @ApiModelProperty(name = "updateFlag",value = "修改标识")
     private Integer updateFlag;
 

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

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -124,4 +125,45 @@ public class LineDetail{
     private String remark;
 
 
+    /**
+     * 电网侧变电站
+     */
+    private String powerSubstationName;
+    /**
+     * 分类等级
+     */
+    private String calssificationGrade;
+
+
+    /**
+     * 上级电站
+     */
+    private String superiorsSubstation;
+
+    /**
+     * 挂接线路
+     */
+    private String hangLine;
+
+    /**
+     * 监测点拥有者
+     */
+    private String owner;
+
+    /**
+     * 拥有者职务
+     */
+    private String ownerDuty;
+
+    /**
+     * 拥有者联系方式
+     */
+    private String ownerTel;
+
+    /**
+     * 接线图
+     */
+    private String wiringDiagram;
+
+
 }

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

@@ -81,4 +81,28 @@ public class LineDetailDataVO {
     @ApiModelProperty(name = "timeInterval",value = "测量间隔（1-10分钟）")
     private Integer timeInterval;
 
+    /**
+     * 监测点拥有者
+     */
+    @ApiModelProperty(name = "owner",value = "监测点拥有者")
+    private String owner;
+
+    /**
+     * 拥有者职务
+     */
+    @ApiModelProperty(name = "ownerDuty",value = "拥有者职务")
+    private String ownerDuty;
+
+    /**
+     * 拥有者联系方式
+     */
+    @ApiModelProperty(name = "ownerTel",value = "拥有者联系方式")
+    private String ownerTel;
+
+    /**
+     * 接线图
+     */
+    @ApiModelProperty(name = "wiringDiagram",value = "接线图")
+    private String wiringDiagram;
+
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -502,6 +502,7 @@
         detail.Short_Capacity,
         detail.Standard_Capacity,
         detail.Deal_Capacity,
+        detail.Business_Type,
         detail.Calssification_Grade,
         detail.Superiors_Substation,
         detail.Hang_Line,

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java

@@ -142,6 +142,10 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         lineDetailDataVO.setShortCapacity(lineDetail.getShortCapacity());
         lineDetailDataVO.setStandardCapacity(lineDetail.getStandardCapacity());
         lineDetailDataVO.setTimeInterval (lineDetail.getTimeInterval ());
+        lineDetailDataVO.setOwner(lineDetail.getOwner());
+        lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty());
+        lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel());
+        lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram());
         return lineDetailDataVO;
     }