两级贯通接口开发

2024-05-15 10:19:59 +08:00
parent b213b66f46
commit 79248176b7
19 changed files with 479 additions and 112 deletions
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
@@ -1,5 +1,6 @@
 package com.njcn.device.pms.api;

+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
@@ -8,6 +9,7 @@ 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.param.TerminalQueryParam;
 import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pms.pojo.vo.MonitorVO;
 import com.njcn.device.biz.pojo.po.Overlimit;
@@ -68,6 +70,10 @@ public interface MonitorClient {
    HttpResult<List<Monitor>> getMonitorList(@RequestBody List<String> monitorIds);


+    @PostMapping("getMonitorPage")
+    HttpResult<Page<Monitor>> getMonitorPage(@RequestBody TerminalQueryParam baseParam);
+
+
   /***
    * 获取台账和终端信息(波形专用)
    * @author wr
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsMidLedgerClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsMidLedgerClient.java
@@ -0,0 +1,33 @@
+package com.njcn.device.pms.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.fallback.PmsMidLedgerClientFallbackFactory;
+import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsBaseParam;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.device.pms.pojo.po.PmsMidLedger;
+import com.njcn.device.pms.pojo.po.StatationStat;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@FeignClient(value = ServerInfo.DEVICE,
+        path = "/pms/pmsMidLedger",
+        contextId = "pms/pmsMidLedger",
+        fallbackFactory = PmsMidLedgerClientFallbackFactory.class)
+public interface PmsMidLedgerClient {
+
+    @PostMapping("getPmsMidLedgerList")
+    HttpResult<List<PmsMidLedger>> getPmsMidLedgerList(@RequestBody List<String> ids);
+
+
+}
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
@@ -1,5 +1,6 @@
 package com.njcn.device.pms.api.fallback;

+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
@@ -9,6 +10,7 @@ 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.param.TerminalQueryParam;
 import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pms.pojo.vo.MonitorVO;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
@@ -62,6 +64,12 @@ public class MonitorClientFallbackFactory implements FallbackFactory<MonitorClie
                throw new BusinessException(finalExceptionEnum);
            }

+            @Override
+            public HttpResult<Page<Monitor>> getMonitorPage(TerminalQueryParam baseParam) {
+                log.error("{}异常，降级处理，异常为：{}", "分页获取主网监测点数据  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
            @Override
            public HttpResult<MonitorVO> getMonitorTerminal(MonitorTerminalParam param) {
                log.error("{}异常，降级处理，异常为：{}", "获取台账和终端信息(波形专用)  ", throwable.toString());
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsMidLedgerClientFallbackFactory.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsMidLedgerClientFallbackFactory.java
@@ -0,0 +1,42 @@
+package com.njcn.device.pms.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pms.api.PmsMidLedgerClient;
+import com.njcn.device.pms.pojo.po.PmsMidLedger;
+import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Slf4j
+@Component
+public class PmsMidLedgerClientFallbackFactory implements FallbackFactory<PmsMidLedgerClient> {
+
+    @Override
+    public PmsMidLedgerClient create(Throwable throwable) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) throwable.getCause();
+            exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new PmsMidLedgerClient() {
+            @Override
+            public HttpResult<List<PmsMidLedger>> getPmsMidLedgerList(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}", "获取中台电站母线信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+        };
+    }
+}
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TerminalQueryParam.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TerminalQueryParam.java
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+import java.util.List;
+
 /**
 * pqs
 *
@@ -38,4 +40,6 @@ public class TerminalQueryParam extends BaseParam {

    @ApiModelProperty(value = "主网上送标识")
    private Integer monitorUploadStatus;
+
+    private List<String> monitorIds;
 }
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMidLedger.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMidLedger.java
@@ -2,6 +2,7 @@ package com.njcn.device.pms.pojo.po;

 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -47,6 +48,26 @@ public class PmsMidLedger extends BaseEntity {
    @TableField(value = "SectionId")
    private String SectionId;

+    @TableField(value = "cityOrg")
+    private String cityOrg;
+
+    @TableField(value = "cityOrgName")
+    private String cityOrgName;
+
+    @TableField(value = "maintCrew")
+    private String maintCrew;
+
+    @TableField(value = "maintCrewName")
+    private String maintCrewName;
+
+    private String OperationId;
+
+    private String OperationName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime OperationDate;
+
+    private String AssetNo;
    /**
     * 名称
     */