pms pq修改

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

@@ -83,6 +83,30 @@ public class AreaLineInfoVO implements Serializable {
     @ApiModelProperty(name = "loadType",value = "干扰源类型")
     private String loadType;
 
+    @ApiModelProperty(name = "businessType",value = "行业类型")
+    private String businessType;
+
+    @ApiModelProperty(name = "dealCapacity",value = "协议容量")
+    private Float dealCapacity;
+
+    @ApiModelProperty(name = "shortCapacity",value = "短路容量")
+    private Float shortCapacity;
+
+    @ApiModelProperty(name = "deviceCapacity",value = "设备容量")
+    private Float deviceCapacity;
+
+    @ApiModelProperty(name = "standardCapacity",value = "基准容量")
+    private Float standardCapacity;
+
+    @ApiModelProperty(name = "calssificationGrade",value = "分类等级")
+    private String calssificationGrade;
+
+    @ApiModelProperty(name = "superiorsSubstation",value = "上级电站")
+    private String superiorsSubstation;
+
+    @ApiModelProperty(name = "hangLine",value = "挂接线路")
+    private String hangLine;
+
     @ApiModelProperty(name = "tail",value = "总数")
     private Integer tail;
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java

@@ -25,10 +25,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -280,4 +277,18 @@ public class GeneralDeviceInfoController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateByDevIds,methodDescribe);
     }
 
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deptGetRunLine")
+    @ApiOperation("根据单位获取投运监测点")
+    @ApiImplicitParam(name = "deptId", value = "单位部门索引", required = true)
+    public HttpResult<List<RStatOnlinerateVO>> deptGetRunLine(@RequestParam("deptId")String deptId) {
+        String methodDescribe = getMethodDescribe("deptGetRunLine");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe);
+    }
+
+
+
+
 }

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

@@ -498,6 +498,13 @@
         detail.pt1,
         detail.pt2,
         detail.obj_name,
+        detail.Dev_Capacity,
+        detail.Short_Capacity,
+        detail.Standard_Capacity,
+        detail.Deal_Capacity,
+        detail.Calssification_Grade,
+        detail.Superiors_Substation,
+        detail.Hang_Line,
         loadtype.name loadType
         FROM
         pq_line line,

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

@@ -725,4 +725,12 @@ public class GeneralDeviceService {
 
 
     }
+
+
+    public List<String> deptGetRunLine(String deptId){
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(deptId, Stream.of(0, 1).collect(Collectors.toList())).getData();
+
+        return null;
+
+    }
 }