波形代码提交

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java

@@ -5,9 +5,11 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.param.MonitorTerminalParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
 import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.vo.MonitorVO;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,7 +46,7 @@ public interface MonitorClient {
      * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.dto.PmsMonitorDTO>>
      */
     @PostMapping("/getMonitorInfoListByCond")
-    public HttpResult<List<PmsMonitorDTO>> getMonitorInfoListByCond(@RequestBody PmsMonitorParam pmsMonitorParam);
+    HttpResult<List<PmsMonitorDTO>> getMonitorInfoListByCond(@RequestBody PmsMonitorParam pmsMonitorParam);
 
 
     /**
@@ -66,4 +68,13 @@ public interface MonitorClient {
     HttpResult<List<Monitor>> getMonitorList(@RequestBody List<String> monitorIds);
 
 
+   /***
+    * 获取台账和终端信息(波形专用)
+    * @author wr
+    * @date 2023-03-23 10:53
+    * @param param
+    * @return HttpResult<List<Monitor>>
+    */
+    @PostMapping("getMonitorTerminal")
+    HttpResult<MonitorVO> getMonitorTerminal(@RequestBody MonitorTerminalParam param);
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java

@@ -6,9 +6,11 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
+import com.njcn.device.pms.pojo.param.MonitorTerminalParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
 import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.vo.MonitorVO;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import feign.hystrix.FallbackFactory;
@@ -59,6 +61,12 @@ public class MonitorClientFallbackFactory implements FallbackFactory<MonitorClie
                 log.error("{}异常，降级处理，异常为：{}", "获取主网监测点数据  ", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<MonitorVO> getMonitorTerminal(MonitorTerminalParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "获取台账和终端信息(波形专用)  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorTerminalParam.java

@@ -0,0 +1,30 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <监测点波形入参>
+ *
+ * @author wr
+ * @createTime: 2023-03-23
+ */
+@Data
+public class MonitorTerminalParam {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @NotBlank(message = "id不能为空")
+    private String id;
+
+    @ApiModelProperty(value = "区分主配网（0:主网 1:配网）")
+    @NotNull(message = "区分类别不能为空")
+    private Integer type;
+
+    @ApiModelProperty(value = "区分系统（0:pq 1:pms）")
+    @NotNull(message = "区分系统不能为空")
+    private Integer systemType;
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/MonitorVO.java

@@ -0,0 +1,60 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <功能描述>
+ *
+ * @author wr
+ * @createTime: 2023-03-23
+ */
+@Data
+public class MonitorVO {
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "id", value = "监测点ID")
+    private String id;
+
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "name", value = "监测点名称")
+    private String name;
+
+    /**
+     * 监测终端接线方式(字典)
+     */
+    private String terminalWiringMethod;
+
+    /**
+     * IP地址
+     */
+    private String ip;
+
+    /**
+     * 通信端口
+     */
+    private String port;
+
+    /**
+     * pt变比
+     */
+    private Double pt1;
+
+    /**
+     * pt变比
+     */
+    private Double pt2;
+
+    /**
+     * ct变比
+     */
+    private Double ct1;
+
+    /**
+     * ct变比
+     */
+    private Double ct2;
+}