From df72e7c3383582ec46ae1b87628250a4ee5af03a Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Tue, 25 Jun 2024 13:24:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9B=91=E7=9D=A3=E8=AE=A1=E5=88=92=E8=B0=83?= =?UTF-8?q?=E6=95=B4=202.=E4=B8=BB=E7=BD=91=E6=B5=8B=E7=82=B9=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/biz/utils/COverlimit.java | 1 + .../njcn/device/biz/utils/COverlimitUtil.java | 2 +- .../device/pms/pojo/dto/MajorMonitorDTO.java | 62 +++++++++++++++++++ .../njcn/device/pms/pojo/po/PmsNewEnergy.java | 11 +++- .../process/pojo/param/SupvPlanParam.java | 6 -- .../com/njcn/process/pojo/po/SupvPlan.java | 5 -- .../com/njcn/process/pojo/vo/SupvPlanVO.java | 7 --- .../service/impl/SupvPlanServiceImpl.java | 10 ++- .../service/impl/SupvPushGwServiceImpl.java | 4 +- 9 files changed, 78 insertions(+), 30 deletions(-) create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/MajorMonitorDTO.java diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java index c60c43b5f..618c886dd 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java +++ b/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 { diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java index 2a5c4997f..82d4f368b 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java +++ b/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 - * + * *

* * @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-正常 */ diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java index def6e9153..8e9b45cfb 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java +++ b/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 diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java index a1a582f10..1cd62f22f 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java +++ b/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; - /** * 监督单位 */ diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java index fe87feaba..3feff1add 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java +++ b/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; - /** * 计划编制单位名字 */ diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java index 76a225169..4cc1b2a2f 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java @@ -258,13 +258,11 @@ public class SupvPlanServiceImpl extends ServiceImpl i public Page pagePlan(SupvPlanParam supvPlanParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if (StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())) { - List deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getSupvOrgId()).getData(); + List 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 i PvTerminalTreeVO pvTerminalTreeVO = null; item.setSupvOrgName(mapCode.get(item.getSupvOrgId()).getName()); - if (mapCode.containsKey(item.getPlanBelongOrg())) { - pvTerminalTreeVO = mapCode.get(item.getPlanBelongOrg()); - item.setPlanBelongOrgName(pvTerminalTreeVO.getName()); + if (mapCode.containsKey(item.getPlanOrgId())) { + pvTerminalTreeVO = mapCode.get(item.getPlanOrgId()); + item.setPlanOrgName(pvTerminalTreeVO.getName()); int deptLevel = pvTerminalTreeVO.getPids().split(StrUtil.COMMA).length; if (deptLevel == 2) { //省 diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java index 927ee0d5c..12de5d635 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java +++ b/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())) { - pvTerminalTreeVO = mapCode.get(supvPlan.getPlanBelongOrg()); + if (mapCode.containsKey(supvPlan.getPlanOrgId())) { + pvTerminalTreeVO = mapCode.get(supvPlan.getPlanOrgId()); supvPlan.setSupvOrgName(pvTerminalTreeVO.getName()); int deptLevel = pvTerminalTreeVO.getPids().split(StrUtil.COMMA).length; if (deptLevel == 2) {