接口调整

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

@@ -17,4 +17,6 @@ import org.springframework.cloud.openfeign.FeignClient;
         fallbackFactory = CommTerminalGeneralClientFallbackFactory.class)
 public interface CommLineClient {
 
+
+
 }

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

@@ -0,0 +1,21 @@
+package com.njcn.device.biz.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/9/18
+ */
+@Data
+public class CommLineDetailDTO {
+
+    @ApiModelProperty(value = "监测点id")
+    private String monitorId;
+
+    @ApiModelProperty(value = "监测点数据统计间隔")
+    private Integer interval;
+
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java

@@ -230,6 +230,20 @@ public class CommTerminalController extends BaseController {
     }
 
 
+    /**
+     * 获取实际，投运，谐波系统 的监测点
+     * @author cdf
+     * @date 2023/9/18
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getRunMonitorList")
+    @ApiOperation("获取实际，投运，谐波系统 的监测点")
+    public HttpResult<List<String>> getRunMonitorList() {
+        String methodDescribe = getMethodDescribe("getRunMonitorList");
+        List<String> result = commTerminalService.getOneMonitorIds();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
     /**
      * 用于返回pq 还是pms系统
      * @author cdf

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java

@@ -87,6 +87,9 @@ public interface CommTerminalService {
     List<String> getOneMonitorIds();
 
 
+    List<CommLineDetailDTO> getRunMonitorList();
+
+
 
 
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java

@@ -510,4 +510,13 @@ public class CommTerminalServiceImpl implements CommTerminalService {
         return monitorList.stream().map(Monitor::getId).collect(Collectors.toList());
     }
 
+    @Override
+    public List<CommLineDetailDTO> getRunMonitorList() {
+        DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(),DicDataEnum.RUN.getName()).getData();
+        if(Objects.isNull(dictData)){
+            throw new BusinessException("监测点状态字典为空");
+        }
+        return null;
+    }
+
 }