1.监督计划调整

2.主网测点台账接口

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java

@@ -12,6 +12,7 @@ import java.math.RoundingMode;
 
 
 @Component
+@Deprecated
 public class COverlimit {
 
 

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java

@@ -347,7 +347,7 @@ public class COverlimitUtil {
      * 获取额定线电压
      */
     private static float getUl(Float voltageLevel){
-        float value = 3.14159f;
+        float value;
         if(voltageLevel<DicDataEnum.KV6.getValue()){
             value = 0.4f;
         }else if(voltageLevel<DicDataEnum.KV10.getValue()){

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/MajorMonitorDTO.java

@@ -0,0 +1,62 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/6/24
+ */
+@Data
+public class MajorMonitorDTO {
+
+    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 statisticalType;
+    private String statisticalDate;
+    private String isMonitorOnline;
+    private String isTerminalOnline;
+    private Integer onlineMonitorNum;
+    private Integer runMonitorNum;
+    private BigDecimal onlineMonitorRate;
+    private Long expectCollectNum;
+    private Long actualCollectNum;
+    private BigDecimal dataFullRate;
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsNewEnergy.java

@@ -12,7 +12,7 @@ import lombok.Setter;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wr
@@ -54,7 +54,7 @@ public class PmsNewEnergy extends BaseEntity {
     private String voltageLevel;
 
     /**
-     * 电压等级
+     * 电站名称
      */
     @TableField("Powerr_Name")
     private String powerrName;
@@ -66,11 +66,16 @@ public class PmsNewEnergy extends BaseEntity {
     private String objType;
 
     /**
-     * 电压等级
+     * 场站状态 01.在运站 02.新（改，扩）站
      */
     @TableField("station_status")
     private String stationStatus;
 
+    /**
+     * 场站状态
+     */
+    private Double ratedCapacity;
+
     /**
      * 状态：0-删除 1-正常
      */