1.pms代码提交

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java

@@ -174,6 +174,10 @@ public interface CommTerminalGeneralClient {
     @GetMapping("/getCustomDetailByLineId")
     HttpResult<Map<String,String>> getCustomDetailByLineId(@RequestParam("id") String id);
 
+    @GetMapping("/getBusBarAndHisMonitor")
+    HttpResult<List<BusBarAndHisMonitorDTO>> getBusBarAndHisMonitor();
+
+
 
     /**
      * 用于返回pq 还是pms系统

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java

@@ -143,6 +143,11 @@ public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<BusBarAndHisMonitorDTO>> getBusBarAndHisMonitor() {
+                return null;
+            }
+
             @Override
             public HttpResult<String> isPqOrPms() {
                 log.error("{}异常，降级处理，异常为：{}", "返回pq还是pms系统", throwable.toString());

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/BusBarAndHisMonitorDTO.java

@@ -0,0 +1,25 @@
+package com.njcn.device.biz.pojo.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/1/26
+ */
+@Data
+public class BusBarAndHisMonitorDTO {
+
+    /**
+     * 母线id
+     */
+    private String busBarId;
+
+    /**
+     * 监测点ids
+     */
+    private List<String> monitorIds;
+}