1.pms公共连接点功能

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

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

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

@@ -45,6 +45,12 @@ public class UploadGwDataFallbackFactory implements FallbackFactory<UploadGwData
                 log.error("{}异常，降级处理，异常为：{}", "国网上送-母线基准水平评估数据", throwable.toString());
                 return new HttpResult<>(CommonResponseEnum.FAIL.getCode(),CommonResponseEnum.FAIL.getMessage());
             }
+
+            @Override
+            public HttpResult<String> upGwCommPoint(UploadParam 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/po/upload/RUploadCommPointBus.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
+
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,8 +18,7 @@ import lombok.Setter;
  * @author xy
  * @since 2024-08-15
  */
-@Getter
-@Setter
+
 @TableName("r_upload_comm_point_bus")
 public class RUploadCommPointBus implements Serializable {
 
@@ -162,5 +163,246 @@ public class RUploadCommPointBus implements Serializable {
     @TableField(exist = false)
     private String cnMonitorId;
 
+    private Integer uploadStatus;
 
+
+    public Integer getUploadStatus() {
+        return uploadStatus;
+    }
+
+    public void setUploadStatus(Integer uploadStatus) {
+        this.uploadStatus = uploadStatus;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getStatisticalType() {
+        return statisticalType;
+    }
+
+    public void setStatisticalType(String statisticalType) {
+        this.statisticalType = statisticalType;
+    }
+
+    public String getStatisticalDate() {
+        return statisticalDate;
+    }
+
+    public void setStatisticalDate(String statisticalDate) {
+        this.statisticalDate = statisticalDate;
+    }
+
+    public String getBusId() {
+        return busId;
+    }
+
+    public void setBusId(String busId) {
+        this.busId = busId;
+    }
+
+    public String getBusName() {
+        return busName;
+    }
+
+    public void setBusName(String busName) {
+        this.busName = busName;
+    }
+
+    public String getProvinceOrg() {
+        return provinceOrg;
+    }
+
+    public void setProvinceOrg(String provinceOrg) {
+        this.provinceOrg = provinceOrg;
+    }
+
+    public String getProvinceOrgName() {
+        return provinceOrgName;
+    }
+
+    public void setProvinceOrgName(String provinceOrgName) {
+        this.provinceOrgName = provinceOrgName;
+    }
+
+    public String getCityOrg() {
+        return cityOrg;
+    }
+
+    public void setCityOrg(String cityOrg) {
+        this.cityOrg = cityOrg;
+    }
+
+    public String getCityOrgName() {
+        return cityOrgName;
+    }
+
+    public void setCityOrgName(String cityOrgName) {
+        this.cityOrgName = cityOrgName;
+    }
+
+    public String getMaintOrg() {
+        return maintOrg;
+    }
+
+    public void setMaintOrg(String maintOrg) {
+        this.maintOrg = maintOrg;
+    }
+
+    public String getMaintOrgName() {
+        return maintOrgName;
+    }
+
+    public void setMaintOrgName(String maintOrgName) {
+        this.maintOrgName = maintOrgName;
+    }
+
+    public String getStationType() {
+        return stationType;
+    }
+
+    public void setStationType(String stationType) {
+        this.stationType = stationType;
+    }
+
+    public String getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(String stationId) {
+        this.stationId = stationId;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getStationVoltageLevel() {
+        return stationVoltageLevel;
+    }
+
+    public void setStationVoltageLevel(String stationVoltageLevel) {
+        this.stationVoltageLevel = stationVoltageLevel;
+    }
+
+    public String getBusVoltageLevel() {
+        return busVoltageLevel;
+    }
+
+    public void setBusVoltageLevel(String busVoltageLevel) {
+        this.busVoltageLevel = busVoltageLevel;
+    }
+
+    public Integer getOvDays() {
+        return ovDays;
+    }
+
+    public void setOvDays(Integer ovDays) {
+        this.ovDays = ovDays;
+    }
+
+    public Double getAvgVrms() {
+        return avgVrms;
+    }
+
+    public void setAvgVrms(Double avgVrms) {
+        this.avgVrms = avgVrms;
+    }
+
+    public Double getgVrms() {
+        return gVrms;
+    }
+
+    public void setgVrms(Double gVrms) {
+        this.gVrms = gVrms;
+    }
+
+    public Integer getHarmVOvDays() {
+        return harmVOvDays;
+    }
+
+    public void setHarmVOvDays(Integer harmVOvDays) {
+        this.harmVOvDays = harmVOvDays;
+    }
+
+    public Integer getHarmVOvDuration() {
+        return harmVOvDuration;
+    }
+
+    public void setHarmVOvDuration(Integer harmVOvDuration) {
+        this.harmVOvDuration = harmVOvDuration;
+    }
+
+    public Integer getVunbanOvDays() {
+        return vunbanOvDays;
+    }
+
+    public void setVunbanOvDays(Integer vunbanOvDays) {
+        this.vunbanOvDays = vunbanOvDays;
+    }
+
+    public Integer getVunbanOvDuration() {
+        return vunbanOvDuration;
+    }
+
+    public void setVunbanOvDuration(Integer vunbanOvDuration) {
+        this.vunbanOvDuration = vunbanOvDuration;
+    }
+
+    public Integer getPltOvDays() {
+        return pltOvDays;
+    }
+
+    public void setPltOvDays(Integer pltOvDays) {
+        this.pltOvDays = pltOvDays;
+    }
+
+    public Integer getPltOvDuration() {
+        return pltOvDuration;
+    }
+
+    public void setPltOvDuration(Integer pltOvDuration) {
+        this.pltOvDuration = pltOvDuration;
+    }
+
+    public String getMonitorId() {
+        return monitorId;
+    }
+
+    public void setMonitorId(String monitorId) {
+        this.monitorId = monitorId;
+    }
+
+    public String getMonitorIds() {
+        return monitorIds;
+    }
+
+    public void setMonitorIds(String monitorIds) {
+        this.monitorIds = monitorIds;
+    }
+
+    public String getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(String dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public String getCnMonitorId() {
+        return cnMonitorId;
+    }
+
+    public void setCnMonitorId(String cnMonitorId) {
+        this.cnMonitorId = cnMonitorId;
+    }
 }