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

@@ -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-正常
      */

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java

@@ -45,12 +45,6 @@ public class SupvPlanParam extends BaseParam {
     @NotBlank(message = "监督单位不可为空")
     private String supvOrgId;
 
-    /**
-     * 计划所属单位
-     */
-    @ApiModelProperty(value = "计划所属单位",required = true)
-    @NotBlank(message = "计划所属单位不可为空")
-    private String planBelongOrg;
 
     /**
      * 计划编制人id

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java

@@ -64,11 +64,6 @@ public class SupvPlan extends BaseEntity {
      */
     private String supvOrgId;
 
-    /**
-     * 监督单位
-     */
-    private String planBelongOrg;
-
     /**
      * 监督单位
      */

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java

@@ -42,13 +42,6 @@ public class SupvPlanVO {
     @ApiModelProperty(value = "计划编制单位id")
     private String planOrgId;
 
-    /**
-     * 监督计划所属单位
-     */
-    private String planBelongOrg;
-
-    private String planBelongOrgName;
-
     /**
      * 计划编制单位名字
      */

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java

@@ -258,13 +258,11 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
     public Page<SupvPlanVO> pagePlan(SupvPlanParam supvPlanParam) {
         LambdaQueryWrapper<SupvPlan> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if (StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())) {
-            List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getSupvOrgId()).getData();
+            List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getPlanOrgId()).getData();
             lambdaQueryWrapper.in(SupvPlan::getSupvOrgId, deptIds)
                     .between(SupvPlan::getPlanSupvDate, DateUtil.parse(supvPlanParam.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN),DateUtil.parse(supvPlanParam.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN))
                     .eq(StrUtil.isNotBlank(supvPlanParam.getSupvType()),SupvPlan::getSupvType,supvPlanParam.getSupvType());
-
         }
-
         if(StrUtil.isNotBlank(supvPlanParam.getSortBy())){
             if(supvPlanParam.getOrderBy().equals("desc")){
                 lambdaQueryWrapper.orderByDesc(SupvPlan::getPlanSupvDate);
@@ -289,9 +287,9 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
             PvTerminalTreeVO pvTerminalTreeVO = null;
 
             item.setSupvOrgName(mapCode.get(item.getSupvOrgId()).getName());
-            if (mapCode.containsKey(item.getPlanBelongOrg())) {
+            if (mapCode.containsKey(item.getPlanOrgId())) {
-                pvTerminalTreeVO = mapCode.get(item.getPlanBelongOrg());
+                pvTerminalTreeVO = mapCode.get(item.getPlanOrgId());
-                item.setPlanBelongOrgName(pvTerminalTreeVO.getName());
+                item.setPlanOrgName(pvTerminalTreeVO.getName());
                 int deptLevel = pvTerminalTreeVO.getPids().split(StrUtil.COMMA).length;
                 if (deptLevel == 2) {
                     //省

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java

@@ -136,8 +136,8 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
         for (SupvPlan supvPlan : supvPlanList) {
             checkParam(supvPlan);
             PvTerminalTreeVO pvTerminalTreeVO = null;
-            if (mapCode.containsKey(supvPlan.getPlanBelongOrg())) {
+            if (mapCode.containsKey(supvPlan.getPlanOrgId())) {
-                pvTerminalTreeVO = mapCode.get(supvPlan.getPlanBelongOrg());
+                pvTerminalTreeVO = mapCode.get(supvPlan.getPlanOrgId());
                 supvPlan.setSupvOrgName(pvTerminalTreeVO.getName());
                 int deptLevel = pvTerminalTreeVO.getPids().split(StrUtil.COMMA).length;
                 if (deptLevel == 2) {