From c4a490d6e7b492ca0fcd8ce17167270432bee2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 13 Jan 2023 09:29:26 +0800 Subject: [PATCH] =?UTF-8?q?pms=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/api/DistributionMonitorClient.java | 22 +- .../njcn/device/pms/api/MonitorClient.java | 3 - .../device/pms/api/PmsGeneratrixClient.java | 2 - .../device/pms/api/PmsTerminalClient.java | 5 +- .../njcn/device/pms/api/PwMonitorClient.java | 10 +- .../device/pms/api/StatationStatClient.java | 2 - .../device/pms/api/TractionStationClient.java | 1 - ...tributionMonitorClientFallbackFactory.java | 7 - .../MonitorClientFallbackFactory.java | 2 - .../PmsGeneratrixClientFallbackFactory.java | 3 - .../PmsTerminalClientFallbackFactory.java | 6 +- .../PwMonitorClientFallbackFactory.java | 8 +- .../TractionStationClientFallbackFactory.java | 1 - .../pms/enums/PmsDeviceResponseEnum.java | 1 + .../dto/GeneratrixAndPowerStationDTO.java | 3 - .../device/pms/pojo/dto/PmsGeneratrixDTO.java | 3 - .../pms/pojo/dto/PmsStatationStatInfoDTO.java | 3 - .../device/pms/pojo/param/ConditionParam.java | 1 - .../pojo/param/DistributionMonitorParam.java | 4 - .../pms/pojo/param/GeneratrixParam.java | 1 - .../pms/pojo/param/GeneratrixWireParam.java | 1 - .../device/pms/pojo/param/MonitorParam.java | 40 ++-- .../device/pms/pojo/param/OverviewParam.java | 41 ++++ .../device/pms/pojo/param/PmsBaseParam.java | 24 +++ .../pms/pojo/param/PmsDeviceInfoParam.java | 3 - .../pms/pojo/param/PmsGeneratrixParam.java | 1 - .../pojo/param/PmsStatationStatInfoParam.java | 1 - .../pms/pojo/param/PmsTerminalParam.java | 2 - .../pojo/param/PmsTractionStationParam.java | 2 - .../param/PowerDistributionareaParam.java | 2 - .../pms/pojo/param/PwPmsMonitorParam.java | 1 - .../pojo/param/RStatZwAlarmCountWParam.java | 12 +- .../pms/pojo/param/TractionStationParam.java | 2 - .../pojo/param/UniversalFrontEndParam.java | 2 - .../pms/pojo/po/DistributionMonitor.java | 7 +- .../njcn/device/pms/pojo/po/Generatrix.java | 1 - .../device/pms/pojo/po/GeneratrixWire.java | 1 - .../pojo/po/HarmonicGeneralManagement.java | 11 +- .../po/HarmonicGeneralManagementData.java | 10 +- .../com/njcn/device/pms/pojo/po/Monitor.java | 2 - .../njcn/device/pms/pojo/po/PmsTerminal.java | 8 +- .../njcn/device/pms/pojo/po/PowerClient.java | 8 +- .../pms/pojo/po/PowerDistributionarea.java | 6 +- .../pms/pojo/po/PowerGenerationUser.java | 8 +- .../pms/pojo/po/PowerQualityMatter.java | 10 +- .../pms/pojo/po/RDnOperatingIndexM.java | 7 +- .../device/pms/pojo/po/RDnOperatingPO.java | 2 +- .../device/pms/pojo/po/RDnOperatingY.java | 5 +- .../pms/pojo/po/RMpDevEvaluateDetail.java | 7 +- .../device/pms/pojo/po/RMpDevSolveDetail.java | 5 +- .../pms/pojo/po/RMpMonitorAlarmCountM.java | 8 +- .../device/pms/pojo/po/RMpPwAlarmDetailD.java | 8 +- .../device/pms/pojo/po/RMpTargetWarnD.java | 8 +- .../device/pms/pojo/po/ROperatingIndexM.java | 7 +- .../device/pms/pojo/po/ROperatingIndexPO.java | 2 +- .../device/pms/pojo/po/ROperatingIndexY.java | 7 +- .../pms/pojo/po/RStatAccountCheckDataPO.java | 2 +- .../pms/pojo/po/RStatAreaAlarmCountM.java | 8 +- .../pms/pojo/po/RStatBusbarHarmonicYPO.java | 2 +- .../device/pms/pojo/po/RStatDevSignalD.java | 5 +- .../po/RStatMeasurementAccountDetailPO.java | 2 +- .../njcn/device/pms/pojo/po/RStatOrgPO.java | 2 +- .../pms/pojo/po/RStatPwAlarmCountW.java | 5 +- .../device/pms/pojo/po/RStatSubstationPO.java | 2 +- .../pms/pojo/po/RStatTargetDetailPO.java | 2 +- .../pms/pojo/po/RStatZwAlarmCountW.java | 5 +- .../device/pms/pojo/po/SourceManagement.java | 13 +- .../device/pms/pojo/po/SpecialMonitor.java | 23 ++ .../device/pms/pojo/po/StatationStat.java | 6 - .../pms/pojo/po/StatisticsRunMonitor.java | 11 +- .../pms/pojo/po/TerminalEliminateData.java | 10 +- .../device/pms/pojo/po/TractionStation.java | 8 +- .../pms/pojo/po/TransientStasticData.java | 10 +- .../pms/pojo/po/TreatTransientDetailData.java | 10 +- .../pms/pojo/vo/DistributionMonitorVO.java | 117 ++++++++++ .../njcn/device/pms/pojo/vo/OverviewVO.java | 200 ++++++++++++++++++ .../njcn/device/pms/pojo/vo/PmsMonitorVO.java | 8 +- .../pms/pojo/vo/PmsPowerTreeMonitorVO.java | 4 +- .../device/pms/pojo/vo/RMpDevSolveVO.java | 2 - .../pms/pojo/vo/RStatBusbarHarmonicYVO.java | 1 - .../device/pms/pojo/vo/RStatEventOrgVO.java | 2 +- .../njcn/device/pms/pojo/vo/RStatOrgVO.java | 3 +- .../device/pms/pojo/vo/RStatSubstationVO.java | 1 - .../pms/pojo/vo/RStatZwAlarmCountWVO.java | 4 +- .../device/pms/pojo/vo/StatationStatVO.java | 1 - 85 files changed, 547 insertions(+), 282 deletions(-) create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/OverviewParam.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsBaseParam.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SpecialMonitor.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DistributionMonitorVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/OverviewVO.java diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/DistributionMonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/DistributionMonitorClient.java index 6389af7eb..7c3451c35 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/DistributionMonitorClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/DistributionMonitorClient.java @@ -1,24 +1,10 @@ package com.njcn.device.pms.api; -import cn.hutool.core.collection.CollectionUtil; -import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.api.fallback.DistributionMonitorClientFallbackFactory; -import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory; -import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; -import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; -import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; -import com.njcn.device.pms.pojo.param.PmsMonitorParam; import com.njcn.device.pms.pojo.po.DistributionMonitor; -import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.vo.DoubleUserVO; -import com.njcn.device.pq.pojo.po.Overlimit; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -51,12 +37,12 @@ public interface DistributionMonitorClient { */ @PostMapping("distributionMonitorList") HttpResult> distributionMonitorList(@RequestBody List monitorIds); - /** + /** * @Description: 获取配网所有监测点数据 - * @Param: [] - * @return: com.njcn.common.pojo.response.HttpResult> + * @Param: [] + * @return: com.njcn.common.pojo.response.HttpResult> * @Author: clam - * @Date: 2022/12/13 + * @Date: 2022/12/13 */ @PostMapping("distributionMonitorListByCondition") public HttpResult> distributionMonitorListByCondition(@RequestParam("orgId")String orgId,@RequestParam("monitorSort")String monitorSort); diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java index 28a6702f7..d8f4c22c6 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java @@ -5,14 +5,11 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; -import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pq.pojo.po.Overlimit; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java index ae52c5d06..491670efc 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java @@ -6,9 +6,7 @@ import com.njcn.device.pms.api.fallback.PmsGeneratrixClientFallbackFactory; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsTerminalClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsTerminalClient.java index 10889aaf2..afa8dc2d9 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsTerminalClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsTerminalClient.java @@ -3,8 +3,7 @@ package com.njcn.device.pms.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.fallback.PwMonitorClientFallbackFactory; -import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; +import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.po.PmsTerminal; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -31,5 +30,5 @@ public interface PmsTerminalClient { * @Date: 2022/12/1 */ @PostMapping("/getTerminalSelectList") - HttpResult> getTerminalSelectList(); + HttpResult> getTerminalSelectList(@RequestBody PmsBaseParam pmsBaseParam); } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java index 89bb3f03c..9bfab9e00 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java @@ -2,12 +2,10 @@ package com.njcn.device.pms.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory; import com.njcn.device.pms.api.fallback.PwMonitorClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -32,6 +30,14 @@ public interface PwMonitorClient { @PostMapping("/getPwMonitorList") HttpResult> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam); + /** + * 获取子集配网所有监测点信息 + * @param pwPmsMonitorParam 参数条件 + * @return 配网所有监测点信息 + */ + @PostMapping("/getPwSubsetMonitorList") + HttpResult> getPwSubsetMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam); + /** * 获取分布式光伏配网所有监测点信息 * @param pwPmsMonitorParam 参数条件 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java index 75154a1bb..365a3e637 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java @@ -4,11 +4,9 @@ import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; - import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java index fb8c13e91..fb1c45a89 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java @@ -2,7 +2,6 @@ package com.njcn.device.pms.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory; import com.njcn.device.pms.api.fallback.TractionStationClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; import com.njcn.device.pms.pojo.param.PmsTractionStationParam; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/DistributionMonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/DistributionMonitorClientFallbackFactory.java index 9845e9d4a..ca03f1079 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/DistributionMonitorClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/DistributionMonitorClientFallbackFactory.java @@ -4,19 +4,12 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.DistributionMonitorClient; -import com.njcn.device.pms.api.MonitorClient; -import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; -import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; -import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; -import com.njcn.device.pms.pojo.param.PmsMonitorParam; import com.njcn.device.pms.pojo.po.DistributionMonitor; import com.njcn.device.pms.pojo.vo.DoubleUserVO; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; -import com.njcn.device.pq.pojo.po.Overlimit; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java index 1119ba946..eff78ea8e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java @@ -6,10 +6,8 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; -import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; import com.njcn.device.pq.pojo.po.Overlimit; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java index d4e054124..42b0bd97c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java @@ -3,12 +3,9 @@ package com.njcn.device.pms.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; import com.njcn.device.pms.api.PmsGeneratrixClient; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; -import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; import feign.hystrix.FallbackFactory; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsTerminalClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsTerminalClientFallbackFactory.java index 1b46b7866..1486d8995 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsTerminalClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsTerminalClientFallbackFactory.java @@ -4,9 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.PmsTerminalClient; -import com.njcn.device.pms.api.PwMonitorClient; -import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; +import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.po.PmsTerminal; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; import feign.hystrix.FallbackFactory; @@ -34,7 +32,7 @@ public class PmsTerminalClientFallbackFactory implements FallbackFactory finalExceptionEnum = exceptionEnum; return new PmsTerminalClient() { @Override - public HttpResult> getTerminalSelectList() { + public HttpResult> getTerminalSelectList(PmsBaseParam pmsBaseParam) { log.error("{}异常，降级处理，异常为：{}", "获取主网所有终端", throwable.toString()); throw new BusinessException(finalExceptionEnum); } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java index b0cebf43a..0f342f041 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java @@ -3,14 +3,12 @@ package com.njcn.device.pms.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PwMonitorClient; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; -import org.checkerframework.checker.units.qual.C; import org.springframework.stereotype.Component; import java.util.List; @@ -39,6 +37,12 @@ public class PwMonitorClientFallbackFactory implements FallbackFactory> getPwSubsetMonitorList(PwPmsMonitorParam pwPmsMonitorParam) { + log.error("{}异常，降级处理，异常为：{}", "获取子集配网所有监测点信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult> getPwPhotovoltaicMonitorList(PwPmsMonitorParam pwPmsMonitorParam) { log.error("{}异常，降级处理，异常为：{}", "获取分布式光伏配网所有监测点信息", throwable.toString()); diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java index 82b8f3302..fe8af37b2 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java @@ -3,7 +3,6 @@ package com.njcn.device.pms.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.TractionStationClient; import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; import com.njcn.device.pms.pojo.param.PmsTractionStationParam; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java index dea579fcb..8124166f6 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java @@ -35,6 +35,7 @@ public enum PmsDeviceResponseEnum { DIS_ADD_REPEAT("A00376","当前配网中存在该监测点"), STATION_REPEAT("A00377","已存在相同电站"), DEPT_STATION_REPEAT("A00378","单位下存在同名电站"), + DEPT_MONITOR_REPEAT("A00379","单位下存在同名监测点"), POWER_CLIENT_NOT_FIND("A00380","查无此用电用户"), diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java index 13015877e..cee6950a9 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java @@ -1,10 +1,7 @@ package com.njcn.device.pms.pojo.dto; -import com.njcn.device.pms.pojo.po.Generatrix; -import com.njcn.device.pq.pojo.po.Voltage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.math3.analysis.function.Power; import java.io.Serializable; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java index af5e41e32..d55906e28 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java @@ -1,11 +1,8 @@ package com.njcn.device.pms.pojo.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.List; /** * 母线信息 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java index cc2490942..478c12800 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java @@ -1,10 +1,7 @@ package com.njcn.device.pms.pojo.dto; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.HashCodeExclude; -import java.util.Date; import java.io.Serializable; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/ConditionParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/ConditionParam.java index f5e55ce92..09d85f91c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/ConditionParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/ConditionParam.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.util.List; /** * Description: diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java index 784ab42db..d51cff8b1 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.time.LocalDateTime; /** * pms-device @@ -38,7 +37,4 @@ public class DistributionMonitorParam { @ApiModelProperty(value = "III类监测点小类 0.用电用户 1.发电用户 默认用电") private Integer smallType; - - - } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java index 7fa5020e8..a9d6d486c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java @@ -2,7 +2,6 @@ package com.njcn.device.pms.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java index 9040eeffa..189648a00 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java @@ -2,7 +2,6 @@ package com.njcn.device.pms.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java index 9054c9fab..496a9731e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java @@ -2,11 +2,9 @@ package com.njcn.device.pms.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; /** * pms-device @@ -18,12 +16,7 @@ import java.time.LocalDateTime; public class MonitorParam { private static final long serialVersionUID = 1L; - - /** - * 监测线路ID - */ @ApiModelProperty(value = "监测点编号") - @NotBlank(message = "监测点编号不可为空") private String id; /** @@ -92,20 +85,6 @@ public class MonitorParam { @NotBlank(message = "母线名称不能为空") private String generatrixName; - /** - * 监测线路名称 - */ - @ApiModelProperty(value = "监测点名称") - @NotBlank(message = "监测线路名称不能为空") - private String lineName; - - /** - * 监测线路ID - */ - @ApiModelProperty(value = "监测线路ID") - @NotBlank(message = "监测线路ID不可为空") - private String lineId; - /** * 电压等级(字典) */ @@ -201,14 +180,12 @@ public class MonitorParam { * 监测对象编号 */ @ApiModelProperty(value = "监测对象编号") - @NotBlank(message = "监测对象编号不可为空") private String monitorObjectId; /** * 监测对象名称 */ @ApiModelProperty(value = "监测对象名称") - @NotBlank(message = "监测对象名称不可为空") private String monitorObjectName; /** @@ -240,6 +217,23 @@ public class MonitorParam { private Integer isUpToGrid; + @ApiModelProperty(value = "pt变比_1") + private Float pt1; + + @ApiModelProperty(value = "pt变比_2") + private Float pt2; + + @ApiModelProperty(value = "ct变比_1") + private Float ct1; + + @ApiModelProperty(value = "ct变比_2") + private Float ct2; + + + + + + } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/OverviewParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/OverviewParam.java new file mode 100644 index 000000000..bc1d97964 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/OverviewParam.java @@ -0,0 +1,41 @@ +package com.njcn.device.pms.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * <功能描述> + * + * @author wr + * @createTime: 2022-12-29 + */ +@Data +public class OverviewParam { + + @ApiModelProperty(name = "id", value = "单位id") + private String id; + + @ApiModelProperty(name = "year", value = "年份") + private String year; + + @ApiModelProperty(name = "month", value = "月份") + private List month; + + @Data + public static class OverviewDateParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "id", value = "单位id") + private String id; + + @ApiModelProperty(name = "startTime", value = "开始时间") + private String startTime; + + @ApiModelProperty(name = "endTime", value = "结束时间") + private String endTime; + + } + +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsBaseParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsBaseParam.java new file mode 100644 index 000000000..ade566562 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsBaseParam.java @@ -0,0 +1,24 @@ +package com.njcn.device.pms.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * pms-device + * + * @author cdf + * @date 2023/1/11 + */ +@Data +public class PmsBaseParam { + + @ApiModelProperty(value = "部门id") + private String deptId; + + + @ApiModelProperty(value = "电站id") + private String stationId; + + @ApiModelProperty(value = "母线id") + private String generatrixId; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java index 193e8d693..d2a12bffc 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java @@ -2,14 +2,11 @@ package com.njcn.device.pms.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.dto.SimpleDTO; -import com.njcn.device.biz.enums.LineFlagEnum; -import com.njcn.web.constant.ValidMessage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.Range; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java index 412b69730..f67ff2b5f 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java index 705318b8d..be8ff3799 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java index b21378fbf..423aad08b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java @@ -1,10 +1,8 @@ package com.njcn.device.pms.pojo.param; import com.njcn.web.pojo.annotation.DateTimeStrValid; -import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java index d7d5bd1a4..b32afe79b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java @@ -1,11 +1,9 @@ package com.njcn.device.pms.pojo.param; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java index 3ed978b89..507c94b2f 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java @@ -1,9 +1,7 @@ package com.njcn.device.pms.pojo.param; -import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java index 0f099e7ff..568473f6b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.io.Serializable; import java.util.List; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java index 182cb3dff..9a029f400 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java @@ -1,17 +1,7 @@ package com.njcn.device.pms.pojo.param; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.param.StatisticsBizBaseParam; -import com.njcn.web.pojo.annotation.DateTimeStrValid; -import com.njcn.web.pojo.param.BaseParam; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.Date; /** * 主网-告警统计(周)查询参数实体 @@ -20,4 +10,4 @@ import java.util.Date; @Data public class RStatZwAlarmCountWParam extends StatisticsBizBaseParam { -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java index ffbc1285e..76edeaf3d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java @@ -1,10 +1,8 @@ package com.njcn.device.pms.pojo.param; import com.njcn.web.pojo.annotation.DateTimeStrValid; -import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java index 381d8cc89..d4dbeed3b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java @@ -4,9 +4,7 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.validator.constraints.Range; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java index 9f2176c7d..b2f7155f3 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java @@ -2,13 +2,10 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDateTime; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java index af40c5c42..72b2bb5dc 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java @@ -3,7 +3,6 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import jdk.nashorn.internal.ir.IdentNode; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java index 9f6c2f3a8..04ab6627e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java @@ -1,6 +1,5 @@ package com.njcn.device.pms.pojo.po; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java index 511cf31c4..669e11da8 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java @@ -2,17 +2,14 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDateTime; /** *

- * + * *

* * @author hongawen @@ -76,7 +73,7 @@ public class HarmonicGeneralManagement extends BaseEntity { private String plannedState; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Boolean status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java index 804166464..bca410d00 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java @@ -1,18 +1,14 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; +import lombok.Data; + import java.time.LocalDate; import java.time.LocalDateTime; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java index 6c843c3fb..d29ca2c9a 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java @@ -2,8 +2,6 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java index d1ce9c837..5bf582282 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java @@ -2,14 +2,10 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDate; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java index 5effdd223..8923b9705 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java @@ -2,14 +2,10 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDate; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java index 0f239731c..0d90dece2 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java @@ -2,13 +2,8 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; /** *

@@ -80,6 +75,7 @@ public class PowerDistributionarea extends BaseEntity { */ private String voltageLevel; + /** * 配变容量 */ diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java index 877285b55..270b9f294 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java @@ -2,14 +2,10 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDate; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java index 34ec6e99c..3724c6d1e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java @@ -1,17 +1,13 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDateTime; /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java index 3fe4121bb..af5913303 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java @@ -1,11 +1,12 @@ package com.njcn.device.pms.pojo.po; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** - * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 + * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 * @TableName r_dn_operating_index_m */ @Data @@ -76,4 +77,4 @@ public class RDnOperatingIndexM implements Serializable { private Integer isUnusual; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java index 3c802b341..0b2f0beca 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java @@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 (RDnOperatingIndexM)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java index 094d94f53..bcab6f65e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java @@ -1,8 +1,9 @@ package com.njcn.device.pms.pojo.po; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 配网运行指标统计-年表,配网监测指标数据质量统计-年表 @@ -76,4 +77,4 @@ public class RDnOperatingY implements Serializable { private Integer isUnusual; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpDevEvaluateDetail.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpDevEvaluateDetail.java index d6e42cda5..e430a3fd1 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpDevEvaluateDetail.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpDevEvaluateDetail.java @@ -1,11 +1,12 @@ package com.njcn.device.pms.pojo.po; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** - * 终端评价详情表 + * 终端评价详情表 * @TableName r_mp_dev_evaluate_detail */ @Data @@ -41,4 +42,4 @@ public class RMpDevEvaluateDetail implements Serializable { private Double devEffectiveRate; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpDevSolveDetail.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpDevSolveDetail.java index 59f26fc7d..06961b67d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpDevSolveDetail.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpDevSolveDetail.java @@ -1,8 +1,9 @@ package com.njcn.device.pms.pojo.po; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 终端消缺明细数据表 @@ -51,4 +52,4 @@ public class RMpDevSolveDetail implements Serializable { private String defectSeverity; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java index 7b69e19ca..c2022148c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java @@ -1,11 +1,11 @@ package com.njcn.device.pms.pojo.po; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * @author jianghf * 监测点告警统计-月表 @@ -117,4 +117,4 @@ public class RMpMonitorAlarmCountM implements Serializable { */ private Integer eventTypeGrade; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java index daa9286ff..8468f60e6 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java @@ -1,11 +1,11 @@ package com.njcn.device.pms.pojo.po; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * 告警明细-日表 * @TableName r_mp_pw_alarm_detail_d @@ -46,4 +46,4 @@ public class RMpPwAlarmDetailD implements Serializable { */ private Integer isCreateProblem; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java index ac0c53e18..bf7ee1f2e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java @@ -1,11 +1,11 @@ package com.njcn.device.pms.pojo.po; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * 监测点指标告警明细日表 * @TableName r_mp_target_warn_d @@ -79,4 +79,4 @@ public class RMpTargetWarnD implements Serializable { private Integer isInterruptWarn; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java index 423d53055..12ff4ab4f 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java @@ -1,11 +1,12 @@ package com.njcn.device.pms.pojo.po; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** - * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 + * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 * @TableName r_operating_index_m */ @Data @@ -76,4 +77,4 @@ public class ROperatingIndexM implements Serializable { private Integer isUnusual; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java index e599f80cd..3cb395d5d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java @@ -3,8 +3,8 @@ package com.njcn.device.pms.pojo.po; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * 主网运行指标统计实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java index aba287969..023a32124 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java @@ -1,11 +1,12 @@ package com.njcn.device.pms.pojo.po; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** - * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 + * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 * @TableName r_operating_index_y */ @Data @@ -76,4 +77,4 @@ public class ROperatingIndexY implements Serializable { private Integer isUnusual; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java index 4fd5285e2..1a32d0ea9 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java index 5ca6f4f6b..1f3872335 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java @@ -1,11 +1,11 @@ package com.njcn.device.pms.pojo.po; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * 区域告警统计(月) * @TableName r_stat_area_alarm_count_m @@ -112,4 +112,4 @@ public class RStatAreaAlarmCountM implements Serializable { private Integer eventTypeGrade; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java index 4b3036f16..58f98b121 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * (RStatBusbarHarmonicY)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatDevSignalD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatDevSignalD.java index 91cc2c3b7..ded4c8ff1 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatDevSignalD.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatDevSignalD.java @@ -1,8 +1,9 @@ package com.njcn.device.pms.pojo.po; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 终端通信管理日表 @@ -36,4 +37,4 @@ public class RStatDevSignalD implements Serializable { private Date updateTime; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java index ce55c9a11..4c8c6a837 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * 监测点台账数据质量问题-核查详情(RStatMeasurementAccountDetail)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java index 0766b6d80..5f89ecd6b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * 区域分类统计年表(RStatOrgY)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java index fad3e9b39..68f1e8096 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java @@ -1,8 +1,9 @@ package com.njcn.device.pms.pojo.po; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * @author jianghf @@ -33,4 +34,4 @@ public class RStatPwAlarmCountW implements Serializable { */ private Integer alarmMonitorCount; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java index 7b9790247..2077ab718 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * (RStatSubstationY)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java index f0b99072f..e29450301 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java index 87230c2b7..1643fc6a4 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java @@ -2,13 +2,12 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; /** - * + * * @TableName r_stat_zw_alarm_count_w */ @Data @@ -42,4 +41,4 @@ public class RStatZwAlarmCountW implements Serializable { */ private Integer monitorGradeCount; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java index b936bb6bf..09e8b425f 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java @@ -2,19 +2,16 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - /** *

- * + * *

* * @author hongawen @@ -113,7 +110,7 @@ public class SourceManagement extends BaseEntity { private LocalDate filingDate; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Boolean status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SpecialMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SpecialMonitor.java new file mode 100644 index 000000000..fa46fb2f7 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SpecialMonitor.java @@ -0,0 +1,23 @@ +package com.njcn.device.pms.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * pms-device + * 主网监测关系表 + * @author cdf + * @date 2023/1/11 + */ +@Data +@TableName(value = "pms_special_monitor") +public class SpecialMonitor { + + + private String id; + + private Integer type; + + + private Float capacity; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java index 6b371ebf6..a21714d86 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java @@ -3,14 +3,8 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java index 6254db509..61f4e97f2 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java @@ -2,17 +2,14 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDateTime; /** *

- * + * *

* * @author hongawen @@ -91,7 +88,7 @@ public class StatisticsRunMonitor extends BaseEntity { private LocalDateTime dataDate; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Boolean status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java index 9c107414e..d56575b0b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java @@ -1,17 +1,13 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDateTime; /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java index 7bf5d2577..24dd3b68d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java @@ -2,14 +2,10 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDate; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java index 99178f0ca..bf9d17357 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java @@ -1,17 +1,13 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDate; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDate; /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java index e1a63f5a0..cbce4158d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java @@ -1,17 +1,13 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDateTime; /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DistributionMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DistributionMonitorVO.java new file mode 100644 index 000000000..c3cfcfd23 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DistributionMonitorVO.java @@ -0,0 +1,117 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + *

+ * 配网监测点 + *

+ * + * @author wr + * @since 2022-12-30 + */ +@Data +public class DistributionMonitorVO { + + private static final long serialVersionUID = 1L; + + /** + * 经度 + */ + @ApiModelProperty(name = "longitude", value = "经度") + private String longitude; + /** + * 维度 + */ + @ApiModelProperty(name = "latitude", value = "维度") + private String latitude; + + + /** + * 监测点类别(字典) + */ + @ApiModelProperty(name = "monitorSort", value = "监测点类别(字典)") + private String monitorSort; + + /** + * 监测点ID + */ + @ApiModelProperty(name = "monitorId", value = "监测点ID") + private String monitorId; + + /** + * 单位id + */ + @ApiModelProperty(name = "orgNo", value = "单位id") + private String orgNo; + + /** + * 电压等级(字典) + */ + @ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)") + private String voltageLevel; + + /** + * 是否发电用户：0-否；1-是； + */ + @ApiModelProperty(name = "ifPowerUser", value = "是否发电用户：0-否；1-是；") + private Integer ifPowerUser; + + /** + * 监测点状态(字典) + */ + @ApiModelProperty(name = "monitorState", value = "监测点状态(字典)") + private String monitorState; + + /** + * 创建日期 + */ + @ApiModelProperty(name = "createdDate", value = "创建日期") + private LocalDateTime createdDate; + + /** + * 数据状态：0-删除；1-正常； + */ + @ApiModelProperty(name = "status", value = "数据状态：0-删除；1-正常；") + private Integer status; + + /** + * 关联的监测终端编号(外键) + */ + @ApiModelProperty(name = "terminalId", value = "关联的监测终端编号(外键)") + private String terminalId; + + /** + * 监测终端接线方式(字典) + */ + @ApiModelProperty(name = "terminalWiringMethod", value = "监测终端接线方式(字典)") + private String terminalWiringMethod; + + /** + * pt变比 + */ + @ApiModelProperty(name = "pt1", value = "pt变比1") + private Float pt1; + + /** + * pt变比 + */ + @ApiModelProperty(name = "pt2", value = "pt变比2") + private Float pt2; + + /** + * ct变比 + */ + @ApiModelProperty(name = "ct1", value = "ct变比") + private Float ct1; + + /** + * ct变比 + */ + @ApiModelProperty(name = "ct2", value = "ct变比") + private Float ct2; + +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/OverviewVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/OverviewVO.java new file mode 100644 index 000000000..d1869535c --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/OverviewVO.java @@ -0,0 +1,200 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * <分布式光伏概览-信息> + * + * @author wr + * @createTime: 2022-12-29 + */ +@Data +public class OverviewVO implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "monitorSort", value = "监测点类别") + private String monitorSort; + @ApiModelProperty(name = "sumNum", value = "监测点数量") + private String sumNum; + @ApiModelProperty(name = "ytbSumNum", value = "同比监测点数量") + private String ytbSumNum; + @ApiModelProperty(name = "yhbSumNum", value = "环比监测点数量") + private String yhbSumNum; + @ApiModelProperty(name = "sumNum", value = "同比监测点占比") + private String sameNum; + @ApiModelProperty(name = "sumNum", value = "环比监测点占比") + private String ringNum; + + @Data + public static class AlarmVO { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "monitorSort", value = "监测点类别") + private String monitorSort; + + @ApiModelProperty(name = "vAlarm", value = "谐波电压") + private Float vAlarm; + + @ApiModelProperty(name = "flickerAlarm", value = "闪变") + private Float flickerAlarm; + + @ApiModelProperty(name = "unbalanceAlarm", value = "三项不平横") + private Float unbalanceAlarm; + + } + + @Data + public static class GroupVO { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "monitorSort", value = "监测点类别") + private String monitorSort; + + @ApiModelProperty(name = "subset", value = "子集集合") + private List subset; + + } + + + /** + * 告警评级 + */ + @Data + public static class AreaAlarmCountVO { + private static final long serialVersionUID = 1L; + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + /** + * 稳态指标评级结果（0 较差 1中等 2较好） + */ + @ApiModelProperty(name = "harmonicTypeGrade", value = "稳态指标评级结果（0 较差 1中等 2较好）") + private Integer harmonicTypeGrade; + /** + * 暂态指标评级结果（0 较差 1中等 2较好） + */ + @ApiModelProperty(name = "eventTypeGrade", value = "暂态指标评级结果（0 较差 1中等 2较好）") + private Integer eventTypeGrade; + + } + + + /** + * 告警监测点数 + */ + @Data + public static class MonitorAlarmCountVO { + private static final long serialVersionUID = 1L; + /** + * 单位ID + */ + private String orgNo; + + /** + * 生成数据的时间,每月统计一次 + */ + private Date dataDate; + + /** + * 数据类型(0:主网 1:配网) + */ + private String dataType; + + /** + * 监测点ID + */ + private String measurementPointId; + + /** + * 监测点类别 + */ + private String monitorSort; + + /** + * 电压偏差告警情况(0:否 1:是) + */ + private Integer vdevAlarmInfo; + + /** + * 电压偏差严重度 + */ + private Integer vdevSeverity; + + /** + * 频率偏差告警情况(0:否 1:是) + */ + private Integer freqAlarmInfo; + + /** + * 频率偏差严重度 + */ + private Integer freqSeverity; + + /** + * 三相电压不平衡度告警情况(0:否 1:是) + */ + private Integer unbalanceAlarmInfo; + + /** + * 三相电压不平衡严重度 + */ + private Integer unbalanceSeverity; + + /** + * 谐波电压告警情况(0:否 1:是) + */ + private Integer vAlarmInfo; + + /** + * 谐波电压严重度 + */ + private Integer vSeverity; + + /** + * 闪变告警情况(0:否 1:是) + */ + private Integer flickerAlarmInfo; + + /** + * 闪变严重度 + */ + private Integer flickerSeverity; + + /** + * 电压暂降告警情况(0:否 1:是) + */ + private Integer sagAlarmInfo; + + /** + * 电压暂降严重度 + */ + private Integer sagSeverity; + + /** + * 短时中断告警情况(0:否 1:是) + */ + private Integer interruptAlarmInfo; + + /** + * 短时中断严重度 + */ + private Integer interruptSeverity; + + /** + * 稳态指标评级结果（0 较差 1中等 2较好） + */ + private Integer harmonicTypeGrade; + + /** + * 暂态指标评级结果（0 较差 1中等 2较好） + */ + private Integer eventTypeGrade; + } +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java index e7f7184ff..94bbec71e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java @@ -1,13 +1,13 @@ package com.njcn.device.pms.pojo.vo; -import java.io.Serializable; -import java.util.Date; - import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** - * + * * @TableName pms_monitor */ @Data diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsPowerTreeMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsPowerTreeMonitorVO.java index a54ec60cc..1aac378d7 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsPowerTreeMonitorVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsPowerTreeMonitorVO.java @@ -1,7 +1,5 @@ package com.njcn.device.pms.pojo.vo; -import com.njcn.device.pms.pojo.po.PowerClient; -import com.njcn.device.pms.pojo.po.PowerGenerationUser; import lombok.Data; import java.time.LocalDate; @@ -88,7 +86,7 @@ public class PmsPowerTreeMonitorVO { - + //用电用户 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpDevSolveVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpDevSolveVO.java index ae28878ec..b19fe1a73 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpDevSolveVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpDevSolveVO.java @@ -3,8 +3,6 @@ package com.njcn.device.pms.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 终端异常管理返回实体类 * @Title RMpDevAbnormalManageVO diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java index 6179df3df..7e58df637 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java @@ -1,6 +1,5 @@ package com.njcn.device.pms.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java index 558939945..8e2f98d81 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java @@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; import java.util.List; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java index cd89d5074..c2da1f7b3 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * 区域分类统计表(RStatOrgY)实体类 @@ -84,4 +83,4 @@ public class RStatOrgVO implements Serializable { @ApiModelProperty(name = "eventCount", value = "暂态指标发生次数") private Integer eventCount; -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java index 76e6ed277..2bc43fdc5 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * 变电站指标统计表实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java index 5bffbf679..caf1733aa 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java @@ -1,9 +1,7 @@ package com.njcn.device.pms.pojo.vo; -import com.njcn.device.pms.pojo.po.RStatZwAlarmCountW; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; @@ -43,4 +41,4 @@ public class RStatZwAlarmCountWVO implements Serializable { -} \ No newline at end of file +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java index 449aa4bab..4ad07d624 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.Date; @Data public class StatationStatVO implements Serializable {