辽宁功能调整

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java

@@ -364,4 +364,6 @@ import java.util.Map;
     @GetMapping("/getMonitorByObjId")
     HttpResult<List<LineDetail>> getMonitorByObjId(@RequestParam("objId") String objId);
 
+    @PostMapping("/getPowerStationByMonitorIds")
+    HttpResult<List<PollutionSubstationDTO>> getPowerStationByMonitorIds(@RequestBody List<String> ids);
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java

@@ -300,6 +300,12 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
                 log.error("{}异常，降级处理，异常为：{}", "根据监测对象id查测点集合信息:  ", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<PollutionSubstationDTO>> getPowerStationByMonitorIds(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}", "根据监测id集合查询场站用户信息:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PollutionSubstationDTO.java

@@ -32,6 +32,8 @@ public class PollutionSubstationDTO {
     @ApiModelProperty(name ="lat",value = "变电站纬度")
     private BigDecimal lat;
 
+    private Integer powerFlag;
+
     @ApiModelProperty("数据")
     private Double data = 3.14159;
 

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

@@ -19,6 +19,12 @@ public class PowerQualityIndicatorsVO {
     //所属终端名称
     @ApiModelProperty(name = "devName",value = "所属终端名称")
     private String devName;
+
+    @ApiModelProperty(name = "devName",value = "网络参数")
+    private String ip;
+
+    @ApiModelProperty(name = "manufacturer",value = "所属厂商")
+    private String manufacturer;
     //所属电站
     @ApiModelProperty(name = "stationName",value = "所属电站")
     private String stationName;