1.pms主网测点数据上送功能

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/UploadGwDataFeignClient.java

@@ -31,4 +31,7 @@ public interface UploadGwDataFeignClient {
     @PostMapping("/upGwCommPoint")
     HttpResult<String> upGwCommPoint(@RequestBody UploadDataParam param);
 
+    @PostMapping("/upGwMainMonitor")
+    HttpResult<String> upGwMainMonitor(@RequestBody UploadDataParam param);
+
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/fallback/UploadGwDataFallbackFactory.java

@@ -52,6 +52,12 @@ public class UploadGwDataFallbackFactory implements FallbackFactory<UploadGwData
                 log.error("{}异常，降级处理，异常为：{}", "国网上送-公共连接点数据", throwable.toString());
                 return new HttpResult<>(CommonResponseEnum.FAIL.getCode(),CommonResponseEnum.FAIL.getMessage());
             }
+
+            @Override
+            public HttpResult<String> upGwMainMonitor(UploadDataParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "国网上送-主网测点数据", throwable.toString());
+                return new HttpResult<>(CommonResponseEnum.FAIL.getCode(),CommonResponseEnum.FAIL.getMessage());
+            }
         };
     }
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/upload/RUploadMainMonitorDataDTO.java

@@ -0,0 +1,111 @@
+package com.njcn.harmonic.pojo.dto.upload;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * 用于河北上送主网测点信息至国网
+ */
+@Data
+public class RUploadMainMonitorDataDTO {
+
+
+    private String objId;
+    private String provinceOrg;
+    private String provinceOrgName;
+    private String cityOrg;
+    private String cityOrgName;
+    private String maintOrg;
+    private String maintOrgName;
+    private String monitorName;
+    private String monitorVoltageLevel;
+    private String monitorId;
+    private String monitorStatus;
+    private Date monitorOperateDate;
+    private Date monitorStopDate;
+    private String substationId;
+    private String substationName;
+    private String busId;
+    private String busName;
+    private String outLineIntervalId;
+    private String outLineIntervalName;
+    private String monitorObjTypeBig;
+    private String monitorObjTypeSmall;
+    private String monitorTag;
+    private String monitorObjName;
+    private String monitorObjId;
+    private String isLine;
+    private BigDecimal minShortCapacity;
+    private BigDecimal supplyEquipCapacity;
+    private BigDecimal userProtocolCapacity;
+    private String terminalCode;
+    private String terminalManufacturer;
+    private String terminalModel;
+    private String terminalManufactureNum;
+    private String terminalConnect;
+    private String neutralGround;
+    private String evtType;
+    /**
+     * 统计日期
+     */
+    private String statisticalDate;
+
+    /**
+     * 统计类型(01:年 02:月 03:日)
+     */
+    private String statisticalType;
+
+
+    /**
+     * 监测点是否在线
+     */
+    private String isMonitorOnline;
+
+    /**
+     * 监测终端是否在线
+     */
+    private String isTerminalOnline;
+
+    /**
+     * 在线监测点数量
+     */
+    private Integer onlineMonitorNum;
+
+    /**
+     * 在运监测点数量
+     */
+    private Integer runMonitorNum;
+
+    /**
+     * 监测点在线率
+     */
+    private BigDecimal onlineMonitorRate;
+
+    /**
+     * 应收采集数
+     */
+    private Long expectCollectNum;
+
+    /**
+     * 实收采集数
+     */
+    private Long actualCollectNum;
+
+    /**
+     * 监测数据完整率
+     */
+    private BigDecimal dataFullRate;
+
+    /**
+     * 计算日期（用于记录算法执行日期）
+     */
+    private LocalDate computeDate;
+
+    /**
+     * 上送状态
+     */
+    private Integer uploadStatus;
+}

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RUploadMainMonitorData.java

@@ -0,0 +1,97 @@
+package com.njcn.harmonic.pojo.po.upload;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 2.4.1.23接收电能质量主网监测点统计数据接口功能表（日月年数据）
+ * </p>
+ *
+ * @author cdf
+ * @since 2024-10-21
+ */
+@Getter
+@Setter
+@TableName("r_upload_main_monitor_data")
+public class RUploadMainMonitorData{
+
+    private static final long serialVersionUID = 1L;
+
+    private String objId;
+
+    /**
+     * 统计日期
+     */
+    @MppMultiId
+    private String statisticalDate;
+
+    /**
+     * 统计类型(01:年 02:月 03:日)
+     */
+    @MppMultiId
+    private String statisticalType;
+
+    /**
+     * 主网测点id
+     */
+    @MppMultiId
+    private String monitorId;
+
+    /**
+     * 监测点是否在线
+     */
+    private String isMonitorOnline;
+
+    /**
+     * 监测终端是否在线
+     */
+    private String isTerminalOnline;
+
+    /**
+     * 在线监测点数量
+     */
+    private Integer onlineMonitorNum;
+
+    /**
+     * 在运监测点数量
+     */
+    private Integer runMonitorNum;
+
+    /**
+     * 监测点在线率
+     */
+    private BigDecimal onlineMonitorRate;
+
+    /**
+     * 应收采集数
+     */
+    private Long expectCollectNum;
+
+    /**
+     * 实收采集数
+     */
+    private Long actualCollectNum;
+
+    /**
+     * 监测数据完整率
+     */
+    private BigDecimal dataFullRate;
+
+    /**
+     * 计算日期（用于记录算法执行日期）
+     */
+    private LocalDate computeDate;
+
+    /**
+     * 上送状态
+     */
+    private Integer uploadStatus;
+
+
+}