From 0865570b03ee43c0ff844c5b0633935690afb326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 17 Nov 2022 15:26:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/biz/utils/COverlimit.java | 301 ++++++++++++++++++ .../njcn/device/pms/api/MonitorClient.java | 11 - .../device/pms/api/PmsGeneratrixClient.java | 3 - .../njcn/device/pms/api/PwMonitorClient.java | 2 - .../device/pms/api/StatationStatClient.java | 2 - .../device/pms/api/TractionStationClient.java | 38 +++ .../MonitorClientFallbackFactory.java | 7 - .../PmsGeneratrixClientFallbackFactory.java | 3 - .../PwMonitorClientFallbackFactory.java | 2 - .../TractionStationClientFallbackFactory.java | 40 +++ .../pms/enums/PmsDeviceResponseEnum.java | 7 + .../dto/GeneratrixAndPowerStationDTO.java | 3 - .../device/pms/pojo/dto/PmsGeneratrixDTO.java | 3 - .../pms/pojo/dto/PmsStatationStatInfoDTO.java | 3 - .../pms/pojo/dto/PmsTractionStationDTO.java | 111 +++++++ .../device/pms/pojo/dto/PwPmsMonitorDTO.java | 21 +- .../pojo/param/DataQualityDetailsParam.java | 27 ++ .../pms/pojo/param/GeneratrixWireParam.java | 12 +- .../device/pms/pojo/param/MonitorParam.java | 1 - .../pms/pojo/param/PmsDeviceInfoParam.java | 3 - .../pms/pojo/param/PmsGeneratrixParam.java | 1 - .../pms/pojo/param/PmsTerminalParam.java | 78 ++--- .../pojo/param/PmsTractionStationParam.java | 30 ++ .../pms/pojo/param/PwPmsMonitorParam.java | 4 +- .../pms/pojo/param/PwRDnOperatingParam.java | 17 + .../pms/pojo/param/ROperatingIndexParam.java | 16 + .../pojo/param/RStatPwAlarmCountWParam.java | 16 + .../pojo/param/RStatPwAlarmDetailParam.java | 29 ++ .../pojo/param/RStatZwAlarmCountWParam.java | 14 +- .../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 | 2 + .../pojo/po/HarmonicGeneralManagement.java | 11 +- .../po/HarmonicGeneralManagementData.java | 10 +- .../com/njcn/device/pms/pojo/po/Monitor.java | 2 - .../po/{Terminal.java => PmsTerminal.java} | 33 +- .../njcn/device/pms/pojo/po/PowerClient.java | 8 +- .../pms/pojo/po/PowerDistributionarea.java | 11 +- .../pms/pojo/po/PowerGenerationUser.java | 8 +- .../pms/pojo/po/PowerQualityMatter.java | 10 +- .../pms/pojo/po/RDnOperatingIndexM.java | 80 +++++ .../device/pms/pojo/po/RDnOperatingPO.java | 87 +++++ .../device/pms/pojo/po/RDnOperatingY.java | 80 +++++ .../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 | 80 +++++ .../device/pms/pojo/po/ROperatingIndexPO.java | 85 +++++ .../device/pms/pojo/po/ROperatingIndexY.java | 80 +++++ .../pms/pojo/po/RQualityParameterPO.java | 71 +++++ .../pms/pojo/po/RStatAccountCheckDataPO.java | 96 ++++++ .../pms/pojo/po/RStatAreaAlarmCountM.java | 8 +- .../pms/pojo/po/RStatBusbarHarmonicYPO.java | 2 +- .../po/RStatMeasurementAccountDetailPO.java | 30 ++ .../njcn/device/pms/pojo/po/RStatOrgPO.java | 2 +- .../pms/pojo/po/RStatPwAlarmCountW.java | 37 +++ .../device/pms/pojo/po/RStatSubstationPO.java | 2 +- .../pms/pojo/po/RStatTargetCheckDataPO.java | 111 +++++++ .../pms/pojo/po/RStatTargetDetailPO.java | 34 ++ .../RStatTractionStationAccountDetailPO.java | 33 ++ .../pms/pojo/po/RStatZwAlarmCountW.java | 5 +- .../device/pms/pojo/po/SourceManagement.java | 13 +- .../device/pms/pojo/po/StatationStat.java | 5 - .../pms/pojo/po/StatisticsRunMonitor.java | 11 +- .../pms/pojo/po/TerminalEliminateData.java | 10 +- .../device/pms/pojo/po/TractionStation.java | 11 +- .../pms/pojo/po/TransientStasticData.java | 10 +- .../pms/pojo/po/TreatTransientDetailData.java | 10 +- .../njcn/device/pms/pojo/vo/DoubleUserVO.java | 25 ++ .../njcn/device/pms/pojo/vo/PmsMonitorVO.java | 8 +- .../pojo/vo/PwRDnOperatingIndexCommonVO.java | 57 ++++ .../device/pms/pojo/vo/PwRDnOperatingVO.java | 112 +++++++ .../pojo/vo/PwRMpMonitorAlarmCountMVO.java | 161 ++++++++++ .../pms/pojo/vo/PwRQualityParameterVO.java | 56 ++++ .../pojo/vo/PwRStatAccountCheckDataVO.java | 129 ++++++++ .../vo/PwRStatMeasurementAccountDetailVO.java | 67 ++++ .../pms/pojo/vo/PwRStatTargetDetailVO.java | 72 +++++ .../pms/pojo/vo/RMpMonitorAlarmCountMVO.java | 2 +- .../pms/pojo/vo/ROperatingIndexCommonVO.java | 82 +++++ .../device/pms/pojo/vo/ROperatingIndexVO.java | 74 +++++ .../pms/pojo/vo/RQualityParameterPollVO.java | 58 ++++ .../pms/pojo/vo/RQualityParameterVO.java | 70 ++++ .../pms/pojo/vo/RStatAccountCheckDataVO.java | 153 +++++++++ .../pms/pojo/vo/RStatBusbarHarmonicYVO.java | 1 - .../device/pms/pojo/vo/RStatEventOrgVO.java | 2 +- .../vo/RStatMeasurementAccountDetailVO.java | 70 ++++ .../njcn/device/pms/pojo/vo/RStatOrgVO.java | 3 +- .../pms/pojo/vo/RStatPwAlarmCountWVO.java | 54 ++++ .../pms/pojo/vo/RStatPwAlarmDetailVO.java | 63 ++++ .../device/pms/pojo/vo/RStatSubstationVO.java | 1 - .../pms/pojo/vo/RStatTargetCheckDataVO.java | 143 +++++++++ .../pms/pojo/vo/RStatTargetDetailVO.java | 62 ++++ .../RStatTractionStationAccountDetailVO.java | 70 ++++ .../pms/pojo/vo/RStatZwAlarmCountWVO.java | 4 +- 95 files changed, 3255 insertions(+), 271 deletions(-) create mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsTractionStationDTO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DataQualityDetailsParam.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwRDnOperatingParam.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/ROperatingIndexParam.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmCountWParam.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java rename pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/{Terminal.java => PmsTerminal.java} (78%) create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RQualityParameterPO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetCheckDataPO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DoubleUserVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRDnOperatingIndexCommonVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRDnOperatingVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRMpMonitorAlarmCountMVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRQualityParameterVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatAccountCheckDataVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatMeasurementAccountDetailVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatTargetDetailVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterPollVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAccountCheckDataVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatMeasurementAccountDetailVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatPwAlarmCountWVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatPwAlarmDetailVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTargetCheckDataVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTargetDetailVO.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTractionStationAccountDetailVO.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 new file mode 100644 index 000000000..1fddf65f1 --- /dev/null +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java @@ -0,0 +1,301 @@ +package com.njcn.device.biz.utils; + + +public class COverlimit { + + private static int MAX_SCALE_NO = 9; + private static int MAXOVERLIMITNUM = 55+16;//WW 2017-08-10 overlimit增加电压偏差的下偏差值,原来个数是53 WW2017-11-29 54->53 新增负序电流 间谐波电压含有率 + private static float[] fULimit = { + 2.0f,1.6f,0.8f,10.0f, + // 3.0f,2.4f,1.2f,10.0f, + 3.0f,2.4f,1.2f,10.0f, + 4.0f,3.2f,1.6f,7.0f, + 4.0f,3.2f,1.6f,7.0f, + 5.0f, 4.0f, 2.0f,7.0f, + 3.0f,2.4f,1.2f,10.0f, + }; + private static float[] fUDevL_Limit = {-3, -7, -10}; + + private static float[] fILimit = { + 12.0f, 9.6f, 6.0f, 9.6f, 4.0f, 6.8f, 3.0f, 3.2f, 2.4f, 4.3f, 2.0f, 3.7f, 1.7f, 1.9f, 1.5f, 2.8f, 1.3f, 2.5f, 1.2f, 1.4f, 1.1f, 2.1f, 1.0f, 1.9f, + // 16.0f,13.0f,8.1f,13.0f,5.4f,9.3f,4.1f,4.3f,3.3f,5.9f,2.7f,5.0f,2.3f,2.6f,2.0f,3.8f,1.8f,3.4f,1.6f,1.9f,1.5f,2.8f,1.4f,2.6f, + 15.0f, 12.0f, 7.7f, 12.0f, 5.1f, 8.8f, 3.8f, 4.1f, 3.1f, 5.6f, 2.6f, 4.7f, 2.2f, 2.5f, 1.9f, 3.6f, 1.7f, 3.2f, 1.5f, 1.8f, 1.4f, 2.7f, 1.3f, 2.5f, + 26.0f, 20.0f, 13.0f, 20.0f, 8.5f, 15.0f, 6.4f, 6.8f, 5.1f, 9.3f, 4.3f, 7.9f, 3.7f, 4.1f, 3.2f, 6.0f, 2.8f, 5.4f, 2.6f, 2.9f, 2.3f, 4.5f, 2.1f, 4.1f, + 43.0f, 34.0f, 21.0f, 34.0f, 14.0f, 24.0f, 11.0f, 11.0f, 8.5f, 16.0f, 7.1f, 13.0f, 6.1f, 6.8f, 5.3f, 10.0f, 4.7f, 9.0f, 4.3f, 4.9f, 3.9f, 7.4f, 3.6f, 6.8f, + 78.0f, 62.0f, 39.0f, 62.0f, 26.0f, 44.0f, 19.0f, 21.0f, 16.0f, 28.0f, 13.0f, 24.0f, 11.0f, 12.0f, 9.7f, 18.0f, 8.6f, 16.0f, 7.8f, 8.9f, 7.1f, 14.0f, 6.5f, 12.0f, + }; + + private static float[] fILimitCoe = { + 2.0f, 1.1f, 2.0f, 1.2f, 2.0f, 1.4f, 2.0f, 2.0f, 2.0f, 1.8f, 2.0f, 1.9f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f + }; + + //间谐波含有率 + private static float[] InharmLimit1 = { + 0.16f, 0.16f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f + }; + private static float[] InharmLimit2 = { + 0.2f, 0.2f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f + }; + + private static float GetVoltageLimit(int nHarm, int iScaleSelect)//谐波含有率 + { + if (nHarm < 0) { + return 0.0f; + } + if (iScaleSelect >= MAX_SCALE_NO) { + return 0.0f; + } + switch (iScaleSelect) { + case 6: + iScaleSelect = 4; + break; + case 7: + iScaleSelect = 2; + break; + case 8: + iScaleSelect = 0; + break; + } + if (iScaleSelect < 2) { + iScaleSelect = 0; + } + else { + iScaleSelect--; + } + int nSelect = iScaleSelect * 4 + 1; + if (nHarm % 2 == 0) { + nSelect = iScaleSelect * 4 + 2; + } + + return fULimit[nSelect]; + } + + private static float GetVoltageJBLimit(int iScaleSelect)//谐波畸变率 + { + if (iScaleSelect >= MAX_SCALE_NO) + return 0.0f; + switch (iScaleSelect) { + case 6: + iScaleSelect = 4; + break; + case 7: + iScaleSelect = 2; + break; + case 8: + iScaleSelect = 0; + break; + } + if (iScaleSelect < 2) { + iScaleSelect = 0; + } + else { + iScaleSelect--; + } + int nSelect = iScaleSelect * 4; + return fULimit[nSelect]; + } + + private static float GetVoltageDevationLimit(int iScaleSelect)//电压偏差 + { + if (iScaleSelect >= MAX_SCALE_NO) { + return 0.0f; + } + switch (iScaleSelect) { + case 6: + iScaleSelect = 4; + break; + case 7: + iScaleSelect = 2; + break; + case 8: + iScaleSelect = 0; + break; + } + if (iScaleSelect < 2) { + iScaleSelect = 0; + } + else { + iScaleSelect--; + } + int nSelect = iScaleSelect * 4 + 3; + return fULimit[nSelect]; + } + + private static float GetVoltageDevationLimit_L(int iScaleSelect)//电压偏差负数 + { + if (iScaleSelect >= MAX_SCALE_NO) { + return 0.0f; + } + int nReturn = 0; + if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6) { + nReturn = 1; + } + else if (iScaleSelect == -1) { + nReturn = 2; + } + return fUDevL_Limit[nReturn]; + } + + private static float GetCurrentLimit(int nHarm, int iScaleSelect, float fDLRL, float fJZRL, float fXYRL, float fSBRL) { + if (nHarm < 0) { + return 0.0f; + } + if (iScaleSelect >= MAX_SCALE_NO) { + return 0.0f; + } + switch (iScaleSelect) { + case 6: + iScaleSelect = 4; + break; + case 7: + iScaleSelect = 2; + break; + case 8: + iScaleSelect = 0; + break; + } + if (iScaleSelect < 2) { + iScaleSelect = 0; + } + else { + iScaleSelect--; + } + int nBaseSelect = nHarm + iScaleSelect * 24; + float fRealLimit = fDLRL / fJZRL * fILimit[nBaseSelect]; + fRealLimit = fRealLimit * (float) Math.pow(fXYRL / fSBRL, 1.0f / fILimitCoe[nHarm]); + return fRealLimit; + } + + public static float GetFCurrentLimit(String strScale, float fDLRL){ + float uL = 0.0f; + switch (strScale) { + case "0.38kV": + uL = 0.4f; + break; + case "6kV": + uL = 6.3f; + break; + case "10kV": + uL = 10.5f; + break; + case "20kV": + uL = 21.0f; + break; + case "35kV": + uL = 36.5f; + break; + case "66kV": + uL = 69.0f; + break; + case "110kV": + uL = 115.0f; + break; + case "220kV": + uL = 230.0f; + break; + case "330kV": + uL = 345.0f; + break; + default: + return 0.0f; + } + + return 2.6f/100 * fDLRL * 1000 / ((float)Math.sqrt(3) * uL); + } + + public static float GetInHarm(int i, int iScaleSelect){ + if(iScaleSelect == 5){ + return InharmLimit1[i]; + }else{ + return InharmLimit2[i]; + } + } + + public static int TransStringScaleToInt(String strScale) { + if (strScale.equals("110kV")) { + return 1; + } + else if (strScale.equals("35kV") || strScale.equals("66kV")) { + return 2; + } + else if (strScale.equals("10kV")) { + return 3; + } + else if (strScale.equals("6kV")) { + return 4; + } + else if (strScale.equals("0.38kV")) { + return 5; + } + else if (strScale.equals("20kV")) { + return 6; + } + else if (strScale.equals("220kV")) { + return -1; + } + + return 0; + } + + public static float[] GetOverLimit(String strScale, float fDLRL, float fJZRL, float fXYRL, float fSBRL) { + int i = 0; + + int nScale = TransStringScaleToInt(strScale); + + float[] fLimit = new float[COverlimit.MAXOVERLIMITNUM]; + //频率偏差 + fLimit[0] = 0.2f; + //电压偏差 + fLimit[1] = GetVoltageDevationLimit(nScale); + //电压不平衡 + fLimit[2] = 2.0f; + //闪变 + if (nScale < 2) { + fLimit[3] = 1.0f; + } + else { + fLimit[3] = 0.8f; + } + //畸变率 + fLimit[4] = GetVoltageJBLimit(nScale); + //24谐波电压幅值 + for (i = 0; i < 24; i++) { + fLimit[5 + i] = GetVoltageLimit(i, nScale); + } + //24谐波电流幅值 + for (i = 0; i < 24; i++) { + fLimit[5 + 24 + i] = GetCurrentLimit(i, nScale, fDLRL, fJZRL, fXYRL, fSBRL); + } + /**************************** + * Modify by yexb 20181015 + *此项为电压下偏差 + * 增加则MAXOVERLIMITNUM的值为54 + * 不增加则MAXOVERLIMITNUM的值为53 + ***************************/ + fLimit[COverlimit.MAXOVERLIMITNUM-2-16] = GetVoltageDevationLimit_L(nScale); + + //负序电流 + fLimit[COverlimit.MAXOVERLIMITNUM-1-16] = GetFCurrentLimit(strScale,fDLRL); + + //间谐波电压含有率 + for (i = 0; i < 16; i++) { + fLimit[55 + i] = GetInHarm(i, nScale); + } + + return fLimit; + } + + /* public void addOverLimit(String lineId, String scaTmp) { + Overlimit overlimit = new Overlimit(); + LineDetail tmp = lineDetailMapper.selectById(lineId); + float fDLRL = tmp.getShortCapacity(); + float fJZRL = tmp.getStandardCapacity(); + float fXYRL = tmp.getDealCapacity(); + float fSBRL = tmp.getDevCapacity(); + + float[] fLimit = COverlimit.GetOverLimit(scaTmp, fDLRL, fJZRL, fXYRL, fSBRL); + + + overLimitMapper.insert(overlimit); + }*/ +} 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 ac99e4e09..57eb82b78 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,13 +5,10 @@ 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.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; @@ -57,13 +54,5 @@ public interface MonitorClient { @PostMapping("getOverLimitData") HttpResult getOverLimitData(@RequestParam("id") String id); - /** - * 获取配网所有监测点信息 - * - * @param pwPmsMonitorParam 参数条件 - * @return 配网所有监测点信息 - */ - @PostMapping("/getPwMonitorList") - HttpResult> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam); } 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 f8b235aec..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 @@ -3,13 +3,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.PmsGeneratrixClientFallbackFactory; -import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory; 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/PwMonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java index 1e67fd790..53b2bf98b 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; 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 e372fa81a..828de5018 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,10 +4,8 @@ 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 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 new file mode 100644 index 000000000..fb1c45a89 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java @@ -0,0 +1,38 @@ +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.TractionStationClientFallbackFactory; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.PmsTractionStationParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * 牵引站 + * + * @author yzh + * @date 2022/11/8 + */ +@FeignClient( + value = ServerInfo.DEVICE, + path = "/pms/tractionStation", + fallbackFactory = TractionStationClientFallbackFactory.class) +public interface TractionStationClient { + + /** + * 获取牵引站详细信息 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/8 + */ + @PostMapping("/getPmsTractionStationInfo") + HttpResult> getPmsTractionStationInfo(@RequestBody PmsTractionStationParam param); + + +} 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 dca7c1cac..7c90fa753 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.utils.PmsDeviceEnumUtil; import com.njcn.device.pq.pojo.po.Overlimit; import feign.hystrix.FallbackFactory; @@ -48,11 +46,6 @@ public class MonitorClientFallbackFactory implements FallbackFactory> getPwMonitorList(PwPmsMonitorParam pwPmsMonitorParam) { - log.error("{}异常，降级处理，异常为：{}", "获取配网所有监测点信息", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } @Override public HttpResult getOverLimitData(String id) { 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/PwMonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java index 786d59feb..093fc1141 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; 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 new file mode 100644 index 000000000..fe8af37b2 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java @@ -0,0 +1,40 @@ +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.TractionStationClient; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.PmsTractionStationParam; +import com.njcn.device.pms.utils.PmsDeviceEnumUtil; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author yzh + * @date 2022/11/8 + */ +@Slf4j +@Component +public class TractionStationClientFallbackFactory implements FallbackFactory { + @Override + public TractionStationClient create(Throwable throwable) { + //判断抛出异常是否为解码器抛出的业务异常 + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException) throwable.getCause(); + exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + Enum finalExceptionEnum = exceptionEnum; + return new TractionStationClient() { + @Override + public HttpResult> getPmsTractionStationInfo(PmsTractionStationParam param) { + 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/enums/PmsDeviceResponseEnum.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java index 79f82a374..b06ff193f 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 @@ -19,6 +19,13 @@ public enum PmsDeviceResponseEnum { Operation_ITEM_EMPTY("A00361","未查询到指定运维单位"), VOLTAGE_EMPTY("A00362","未查询到指定母线"), LINE_EMPTY("A00363","未查询到指定线路"), + NO_USER_TYPE("A00364","未查询字典用户类型"), + + + + + + MODEL_NAME_REPEAT("A00350","名称不可重复"); 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/dto/PmsTractionStationDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsTractionStationDTO.java new file mode 100644 index 000000000..92fa6c93e --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsTractionStationDTO.java @@ -0,0 +1,111 @@ +package com.njcn.device.pms.pojo.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * (PmsTractionStation)实体类 + * + * @author yzh + * @since 2022-11-07 19:50:46 + */ +@Data +public class PmsTractionStationDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 牵引站编号 + */ + private String id; + /** + * 牵引站名称 + */ + private String name; + /** + * 组织机构名称 + */ + private String orgName; + /** + * 组织机构ID(外键) + */ + private String orgId; + /** + * 运维单位名称 + */ + private String operationName; + /** + * 运维单位ID(外键) + */ + private String operationId; + /** + * 供电电压等级(字典) + */ + private String voltageLevel; + /** + * 铁路线路编号 + */ + private String railwayLineId; + /** + * 铁路线路名称 + */ + private String railwayLineName; + /** + * 牵引站变压器接线方式(字典) + */ + private String connetGroupWay; + /** + * 牵引站变电容量 + */ + private Double ratedCapacity; + /** + * 供电变电站编号 + */ + private String powerId; + /** + * 供电变电站名称 + */ + private String powerName; + /** + * 供电变电站电压等级(字典) + */ + private String powerVoltageLevel; + /** + * 是否专线供电：0-否；1-是； + */ + private Integer ifSpecial; + /** + * 创建日期 + */ + private Date createdDate; + /** + * 用户标签 + */ + private String userTag; + /** + * 是否是上送国网监测点,0-否 1-是 + */ + private Integer isUpToGrid; + /** + * 数据状态：0-删除；1-正常； + */ + private Integer status; + /** + * 创建用户 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新用户 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; + +} + diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java index b6f59b631..b4c2a068d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java @@ -28,7 +28,16 @@ public class PwPmsMonitorDTO implements Serializable { */ @ApiModelProperty(name = "orgName",value = "单位名称") private String orgName; - + /** + * 线路id + */ + @ApiModelProperty(name = "lineId",value = "线路id") + private String lineId; + /** + * 线路名称 + */ + @ApiModelProperty(name = "lineName",value = "线路名称") + private String lineName; /** * 监测点类别(字典) */ @@ -46,6 +55,16 @@ public class PwPmsMonitorDTO implements Serializable { */ @ApiModelProperty(name = "monitorName", value = "监测点名称") private String monitorName; + /** + * 所属变电站id + */ + @ApiModelProperty(name = "powerId", value = "所属变电站id") + private String powerId; + /** + * 所属变电站名称 + */ + @ApiModelProperty(name = "powerName", value = "所属变电站名称") + private String powerName; /** * 电压等级(字典) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DataQualityDetailsParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DataQualityDetailsParam.java new file mode 100644 index 000000000..a389491f9 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DataQualityDetailsParam.java @@ -0,0 +1,27 @@ +package com.njcn.device.pms.pojo.param; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +/** + * @author yzh + * @date 2022/11/7 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class DataQualityDetailsParam extends StatisticsBizBaseParam implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 核查规则 + */ + @ApiModelProperty(name = "checkRules",value = "核查规则") + private List checkRules; +} 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 42ffa2966..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; @@ -15,6 +14,10 @@ import javax.validation.constraints.NotBlank; @Data public class GeneratrixWireParam { + @ApiModelProperty(value = "线路id",required = true) + @NotBlank(message = "线路id不可为空") + private String wireId; + @ApiModelProperty(value = "线路名称",required = true) @NotBlank(message = "线路名称不可为空") private String wireName; @@ -25,12 +28,5 @@ public class GeneratrixWireParam { - @Data - @EqualsAndHashCode(callSuper = true) - public static class UpdateGeneratrixWireParam extends GeneratrixWireParam { - @ApiModelProperty(value = "线路id",required = true) - @NotBlank(message = "线路id不可为空") - private String wireId; - } } 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 e3e17c1d8..e9ab2c05f 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 @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; /** * pms-device 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/PmsTerminalParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java index a49232c48..2c480a282 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,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; /** * @author hany @@ -15,64 +13,56 @@ public class PmsTerminalParam { @ApiModelProperty(name = "id",value = "终端编号") private String id; - @ApiModelProperty(name = "Name", value = "终端名称") - private String Name; + @ApiModelProperty(name = "name", value = "终端名称") + private String name; - @ApiModelProperty(name = "OrgName", value = "组织机构名称") - private String OrgName; + @ApiModelProperty(name = "orgName", value = "组织机构名称") + private String orgName; - @ApiModelProperty(name = "OrgId", value = "组织机构ID") - private String OrgId; + @ApiModelProperty(name = "orgId", value = "组织机构ID") + private String orgId; - @ApiModelProperty(name = "OperationName", value = "运维单位名称") - private String OperationName; + @ApiModelProperty(name = "operationName", value = "运维单位名称") + private String operationName; - @ApiModelProperty(name = "OperationId", value = "运维单位ID") - private String OperationId; + @ApiModelProperty(name = "operationId", value = "运维单位ID") + private String operationId; - @ApiModelProperty(name = "PowerrName", value = "变电站名称") - private String PowerrName; + @ApiModelProperty(name = "powerrName", value = "变电站名称") + private String powerrName; - @ApiModelProperty(name = "PowerStationId", value = "所属电站ID") - private String PowerStationId; + @ApiModelProperty(name = "powerStationId", value = "所属电站ID") + private String powerStationId; - @ApiModelProperty(name = "TerminalState", value = "终端状态") - private String TerminalState; + @ApiModelProperty(name = "terminalState", value = "终端状态") + private String terminalState; - @ApiModelProperty(name = "TerminalLevel", value = "终端级别") - private String TerminalLevel; + @ApiModelProperty(name = "terminalLevel", value = "终端级别") + private String terminalLevel; - @ApiModelProperty(name = "DeviceModel", value = "装置型号") - private String DeviceModel; + @ApiModelProperty(name = "deviceModel", value = "装置型号") + private String deviceModel; - @ApiModelProperty(name = "Manufacture", value = "生产厂家") - private String Manufacture; + @ApiModelProperty(name = "manufacture", value = "生产厂家") + private String manufacture; - @ApiModelProperty(name = "VerificationDate", value = "检定日期") - private String VerificationDate; + @ApiModelProperty(name = "verificationDate", value = "检定日期") + private String verificationDate; - @ApiModelProperty(name = "UseDate", value = "投用日期") - private String UseDate; + @ApiModelProperty(name = "useDate", value = "投用日期") + private String useDate; - @ApiModelProperty(name = "InputType", value = "测量信号输入形式") - private String InputType; + @ApiModelProperty(name = "inputType", value = "测量信号输入形式") + private String inputType; - @ApiModelProperty(name = "Ip", value = "IP地址") - private String Ip; + @ApiModelProperty(name = "ip", value = "IP地址") + private String ip; - @ApiModelProperty(name = "Port", value = "通信端口") - private String Port; + @ApiModelProperty(name = "port", value = "通信端口") + private String port; - @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是") - private Integer IsUpToGrid; + @ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是") + private Integer isUpToGrid; - /** - * 查询数据实体 - */ - @Data - @EqualsAndHashCode(callSuper = true) - public static class QueryParam extends BaseParam { - private Integer Status; - } } 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 new file mode 100644 index 000000000..b32afe79b --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java @@ -0,0 +1,30 @@ +package com.njcn.device.pms.pojo.param; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 牵引站详细信息前端参数 + * + * @author yzh + * @date 2022/11/7 + */ + +@Data +@ApiModel("牵引站详细信息前端参数") +public class PmsTractionStationParam implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 单位id + */ + @ApiModelProperty(name = "orgIds",value = "单位id",required = true) + private List orgIds; + + +} 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 4450cf1df..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; /** @@ -19,6 +18,9 @@ public class PwPmsMonitorParam { @NotBlank(message = "部门索引不可为空") private String orgId; + @ApiModelProperty(name = "powerId", value = "所属变电站") + private List powerId; + @ApiModelProperty(name = "monitorName",value = "监测点名称") private String monitorName; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwRDnOperatingParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwRDnOperatingParam.java new file mode 100644 index 000000000..f5b0ffd4a --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwRDnOperatingParam.java @@ -0,0 +1,17 @@ +package com.njcn.device.pms.pojo.param; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import lombok.Data; + +/** + * 配网运行指标统计接收参数实体类（用于配网运行指标统计业务） + * @Title RDnOperatingParam + * @Package com.njcn.device.pms.pojo.param + * @Author jianghaifei + * @Date 2022-11-10 10:13 + * @Version V1.0 + */ +@Data +public class PwRDnOperatingParam extends StatisticsBizBaseParam { + +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/ROperatingIndexParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/ROperatingIndexParam.java new file mode 100644 index 000000000..9a8cd65f7 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/ROperatingIndexParam.java @@ -0,0 +1,16 @@ +package com.njcn.device.pms.pojo.param; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import lombok.Data; + +/** + * 主网运行指标统计接收参数实体类（用于主网运行指标统计业务） + * @Title ROperatingIndexParam + * @Package com.njcn.device.pms.pojo.param + * @Author jianghaifei + * @Date 2022-11-09 19:02 + * @Version V1.0 + */ +@Data +public class ROperatingIndexParam extends StatisticsBizBaseParam { +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmCountWParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmCountWParam.java new file mode 100644 index 000000000..3e8ee3306 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmCountWParam.java @@ -0,0 +1,16 @@ +package com.njcn.device.pms.pojo.param; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import lombok.Data; + +/** + * 配网-告警统计(周)查询参数实体 + * @Title RStatPwAlarmCountWParam + * @Package com.njcn.device.pms.pojo.param + * @Author jianghaifei + * @Date 2022-11-02 19:06 + * @Version V1.0 + */ +@Data +public class RStatPwAlarmCountWParam extends StatisticsBizBaseParam { +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java new file mode 100644 index 000000000..18775c20a --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java @@ -0,0 +1,29 @@ +package com.njcn.device.pms.pojo.param; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 告警明细参数实体 + * @Title RStatPwAlarmDetailParam + * @Package com.njcn.device.pms.pojo.param + * @Author jianghaifei + * @Date 2022-11-03 11:04 + * @Version V1.0 + */ +@Data +public class RStatPwAlarmDetailParam extends StatisticsBizBaseParam { + + //告警类型 + @ApiModelProperty(name = "alarmType", value = "告警类型(字典)") + private String alarmType; + + //监测点类型 + @ApiModelProperty(name = "monitorType", value = "监测点类别(字典:I类、II类、III类)") + private String monitorSort; + + //监测点名称 + @ApiModelProperty(name = "monitorName", value = "监测点名称") + private String monitorName; +} 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 9ad46c990..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,23 +1,13 @@ 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; /** - * 告警统计(周)查询参数实体 + * 主网-告警统计(周)查询参数实体 * @TableName r_stat_zw_alarm_count_w */ @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/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 187c122b1..9b89a54f2 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 49ae2a8f6..09863a86b 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 @@ -2,7 +2,6 @@ package com.njcn.device.pms.pojo.po; 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 c1c0861d1..9a5e3ac73 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,5 +1,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 lombok.Data; @@ -17,6 +18,7 @@ import lombok.EqualsAndHashCode; public class GeneratrixWire extends BaseEntity { private static final long serialVersionUID = 1L; + @TableId private String wireId; private String wireName; 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 e4b9a102c..9637e7b0a 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/Terminal.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java similarity index 78% rename from pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java index 755078490..5bf582282 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java @@ -2,18 +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.LocalDate; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDate; /** *

- * + * *

* * @author hongawen @@ -22,7 +18,7 @@ import lombok.Setter; @Data @EqualsAndHashCode(callSuper = true) @TableName("pms_terminal") -public class Terminal extends BaseEntity { +public class PmsTerminal extends BaseEntity { private static final long serialVersionUID = 1L; @@ -117,29 +113,10 @@ public class Terminal extends BaseEntity { private Integer isUpToGrid; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Integer status; - /** - * 创建用户 - */ - private String createBy; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新用户 - */ - private String updateBy; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; } 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 cd4aaaca4..ad5c5f89e 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,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 @@ -136,7 +133,7 @@ public class PowerDistributionarea extends BaseEntity { private Integer isUpToGrid; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Integer status; 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 new file mode 100644 index 000000000..af5913303 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java @@ -0,0 +1,80 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 + * @TableName r_dn_operating_index_m + */ +@Data +public class RDnOperatingIndexM implements Serializable { + /** + * 单位ID + */ + private String orgNo; + + /** + * 时间 + */ + private Date dataDate; + + /** + * 监测点类型 + */ + private String measurementPointType; + + /** + * 在运监测点数 + */ + private Integer measurementRunPoints; + + /** + * 在线监测点数 + */ + private Integer transitMeasurementPoints; + + /** + * 有效接入监测点数量 + */ + private Integer effectiveAccessMeasurementCount; + + /** + * 有效接入率:有效接入监测点数量/在运监测点数 + */ + private String effectiveAccessRate; + + /** + * 应设点数 + */ + private Integer shouldCount; + + /** + * 应设点覆盖率 + */ + private Integer shouldPointCoverage; + + /** + * 数据完整率 + */ + private Double dataIntegrityRate; + + /** + * 数据准确率 + */ + private Double dataRightRate; + + /** + * 指标完整率 + */ + private Double indexIntegrityRate; + + /** + * 数据是否异常(0:正常 1:异常) + */ + private Integer isUnusual; + + private static final long serialVersionUID = 1L; +} 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 new file mode 100644 index 000000000..0b2f0beca --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java @@ -0,0 +1,87 @@ +package com.njcn.device.pms.pojo.po; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 (RDnOperatingIndexM)实体类 + * + * @author yzh + * @since 2022-11-04 14:35:45 + */ +@Data +@ApiModel("配网运行指标统计") +public class RDnOperatingPO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo", value = "") + private String orgNo; + /** + * 时间 + */ + @ApiModelProperty(name = "taDate", value = "") + private Date dataDate; + /** + * 监测点类型 + */ + @ApiModelProperty(name = "measurementPointType", value = "监测点类型") + private String measurementPointType; + /** + * 在运监测点数 + */ + @ApiModelProperty(name = " measurementRunPoints", value = "在运监测点数") + private Integer measurementRunPoints; + /** + * 在线监测点数 + */ + @ApiModelProperty(name = " transitMeasurementPoints", value = "在线监测点数") + private Integer transitMeasurementPoints; + /** + * 有效接入监测点数量 + */ + @ApiModelProperty(name = " effectiveAccessMeasurement", value = "有效接入监测点数量") + private Integer effectiveAccessMeasurementCount; + /** + * 有效接入率:有效接入监测点数量/在运监测点数 + */ + @ApiModelProperty(name = "effectiveAccessRate", value = "有效接入率:有效接入监测点数量/在运监测点数") + private String effectiveAccessRate; + /** + * 应设点数 + */ + @ApiModelProperty(name = " shouldCount", value = "应设点数") + private Integer shouldCount; + /** + * 应设点覆盖率 + */ + @ApiModelProperty(name = " shouldPointCoverage", value = "应设点覆盖率") + private Integer shouldPointCoverage; + /** + * 数据完整率 + */ + @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率") + private Double dataIntegrityRate; + /** + * 数据准确率 + */ + @ApiModelProperty(name = "dataRightRate", value = "数据准确率") + private Double dataRightRate; + /** + * 指标完整率 + */ + @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率") + private Double indexIntegrityRate; + /** + * 数据是否异常(0:正常 1:异常) + */ + @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)") + private Integer isUnusual; + +} + 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 new file mode 100644 index 000000000..bcab6f65e --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java @@ -0,0 +1,80 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 配网运行指标统计-年表,配网监测指标数据质量统计-年表 + * @TableName r_dn_operating_y + */ +@Data +public class RDnOperatingY implements Serializable { + /** + * 单位ID + */ + private String orgNo; + + /** + * 时间 + */ + private Date dataDate; + + /** + * 监测点类型 + */ + private String measurementPointType; + + /** + * 在运监测点数 + */ + private Integer measurementRunPoints; + + /** + * 在线监测点数 + */ + private Integer transitMeasurementPoints; + + /** + * 有效接入监测点数量 + */ + private Integer effectiveAccessMeasurementCount; + + /** + * 有效接入率 + */ + private String effectiveAccessRate; + + /** + * 应设点数 + */ + private Integer shouldCount; + + /** + * 应设点覆盖率 + */ + private Integer shouldPointCoverage; + + /** + * 数据完整率 + */ + private Double dataIntegrityRate; + + /** + * 数据准确率 + */ + private Double dataRightRate; + + /** + * 指标完整率 + */ + private Double indexIntegrityRate; + + /** + * 数据是否异常(0:正常 1:异常) + */ + private Integer isUnusual; + + private static final long serialVersionUID = 1L; +} 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 new file mode 100644 index 000000000..12ff4ab4f --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java @@ -0,0 +1,80 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 + * @TableName r_operating_index_m + */ +@Data +public class ROperatingIndexM implements Serializable { + /** + * 单位ID + */ + private String orgNo; + + /** + * 时间 + */ + private Date dataDate; + + /** + * 在运监测点数 + */ + private Integer measurementRunPoints; + + /** + * 在线监测点数 + */ + private Integer transitMeasurementPoints; + + /** + * 有效接入监测点数量 + */ + private Integer effectiveAccessMeasurementCount; + + /** + * 监测终端数 + */ + private Integer onlineMeasurementPoints; + + /** + * 在线终端数 + */ + private Integer onlineMeasurementCount; + + /** + * 应设点数 + */ + private Integer shouldCount; + + /** + * 应设点覆盖率 + */ + private Double shouldPointCoverage; + + /** + * 数据完整率 + */ + private Double dataIntegrityRate; + + /** + * 数据准确率 + */ + private Double dataRightRate; + + /** + * 指标完整率 + */ + private Double indexIntegrityRate; + + /** + * 数据否异常(0:正常 1:异常) + */ + private Integer isUnusual; + + private static final long serialVersionUID = 1L; +} 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 new file mode 100644 index 000000000..3cb395d5d --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java @@ -0,0 +1,85 @@ +package com.njcn.device.pms.pojo.po; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 主网运行指标统计实体类 + * + * @author yzh + * @since 2022-11-01 18:47:18 + */ + +@Data +public class ROperatingIndexPO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo", value = "单位ID") + private String orgNo; + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + /** + * 在运监测点数 + */ + @ApiModelProperty(name = " measurementRunPoints", value = "在运监测点数") + private Integer measurementRunPoints; + /** + * 在线监测点数 + */ + @ApiModelProperty(name = " transitMeasurementPoints", value = "在线监测点数") + private Integer transitMeasurementPoints; + /** + * 有效接入监测点数量 + */ + @ApiModelProperty(name = " effectiveAccessMeasurementCount", value = "有效接入监测点数量") + private Integer effectiveAccessMeasurementCount; + /** + * 监测终端数 + */ + @ApiModelProperty(name = " onlineMeasurementPoints", value = "监测终端数") + private Integer onlineMeasurementPoints; + /** + * 在线终端数 + */ + @ApiModelProperty(name = " onlineMeasurementCount", value = "在线终端数") + private Integer onlineMeasurementCount; + /** + * 应设点数 + */ + @ApiModelProperty(name = " shouldCount", value = "应设点数") + private Integer shouldCount; + /** + * 应设点覆盖率 + */ + @ApiModelProperty(name = "shouldPointCoverage", value = "应设点覆盖率") + private Double shouldPointCoverage; + /** + * 数据完整率 + */ + @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率") + private Double dataIntegrityRate; + /** + * 数据准确率 + */ + @ApiModelProperty(name = "dataRightRate", value = "数据准确率") + private Double dataRightRate; + /** + * 指标完整率 + */ + @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率") + private Double indexIntegrityRate; + /** + * 数据是否异常(0:正常 1:异常) + */ + @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)") + private Integer isUnusual; +} + 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 new file mode 100644 index 000000000..023a32124 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java @@ -0,0 +1,80 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 + * @TableName r_operating_index_y + */ +@Data +public class ROperatingIndexY implements Serializable { + /** + * 单位ID + */ + private String orgNo; + + /** + * 时间 + */ + private Date dataDate; + + /** + * 在运监测点数 + */ + private Integer measurementRunPoints; + + /** + * 在线监测点数 + */ + private Integer transitMeasurementPoints; + + /** + * 有效接入监测点数量 + */ + private Integer effectiveAccessMeasurementCount; + + /** + * 监测终端数 + */ + private Integer onlineMeasurementPoints; + + /** + * 在线终端数 + */ + private Integer onlineMeasurementCount; + + /** + * 应设点数 + */ + private Integer shouldCount; + + /** + * 应设点覆盖率 + */ + private Double shouldPointCoverage; + + /** + * 数据完整率 + */ + private Double dataIntegrityRate; + + /** + * 数据准确率 + */ + private Double dataRightRate; + + /** + * 指标完整率 + */ + private Double indexIntegrityRate; + + /** + * 数据是否异常(0:正常 1:异常) + */ + private Integer isUnusual; + + private static final long serialVersionUID = 1L; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RQualityParameterPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RQualityParameterPO.java new file mode 100644 index 000000000..447e03b0b --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RQualityParameterPO.java @@ -0,0 +1,71 @@ +package com.njcn.device.pms.pojo.po; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 监测指标数据质量问题汇总统计-月表(r_quality_parameter_m)实体类 + * + * @author yzh + * @since 2022-11-02 10:55:22 + */ +@Data +public class RQualityParameterPO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo",value = "单位ID") + private String orgNo; + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate",value = "时间") + private Date dataDate; + /** + * 监测点数量 + */ + @ApiModelProperty(name = "measurementCount",value = "监测点数量") + private String measurementCount; + /** + * 有效接入监测点数量 + */ + @ApiModelProperty(name = "effectiveAccessMeasurementCount",value = "有效接入监测点数量") + private Integer effectiveAccessMeasurementCount; + /** + * 存在数据质量问题监测点 + */ + @ApiModelProperty(name = "problem",value = "存在数据质量问题监测点") + private Integer problem; + /** + * 监测点-母线-变电站匹配个数 + */ + @ApiModelProperty(name = "matchingCount",value = "监测点-母线-变电站匹配个数") + private String matchingCount; + /** + * 监测点-母线-变电站匹配个率 + */ + @ApiModelProperty(name = "matchingRate",value = "监测点-母线-变电站匹配个率") + private String matchingRate; + /** + * 监测点台账完整率 + */ + @ApiModelProperty(name = "monitoringIntegrityRate",value = "监测点台账完整率") + private String monitoringIntegrityRate; + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @ApiModelProperty(name = "dataType",value = "数据类型,字典表（01：主网测点 02：配网测点）") + private String dataType; + + /** + * 存在数据质量问题监测点同比 + */ + @ApiModelProperty(name = "problemYearOnYear", value = "存在数据质量问题监测点同比") + private String problemYearOnYear; + +} + 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 new file mode 100644 index 000000000..1a32d0ea9 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java @@ -0,0 +1,96 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类 + * + * @author yzh + * @since 2022-11-02 16:07:15 + */ +@Data +public class RStatAccountCheckDataPO implements Serializable { + private static final long serialVersionUID = -1L; + /** + * 单位ID + */ + private String orgNo; + /** + * 时间 + */ + private Date dataDate; + /** + * 终端台帐-必填字段为空 + */ + private Integer devFieldNull; + /** + * 终端台帐-投运日期不规范 + */ + private Integer devRunTimeAbnormal; + /** + * 终端台帐-终端类型不正确 + */ + private Integer devTypeError; + /** + * 终端台帐-上次检定日期不合理 + */ + private Integer devCheckTimeAbnormal; + /** + * 终端台帐-IP地址不规范 + */ + private Integer devIpError; + /** + * 监测点台帐-必填字段为空 + */ + private Integer measurementFieldNull; + /** + * 监测点台帐-限值是否合理 + */ + private Integer measurementLimitAbnormal; + /** + * 监测点台帐-监测点名称不规范 + */ + private Integer measurementNameAbnormal; + /** + * 监测点台帐-监测对象名称不规范 + */ + private Integer measurementTypeAbnormal; + /** + * 监测点台帐-容量填写不准确 + */ + private Integer measurementCapacityError; + /** + * 监测点台帐-监测点与终端状态不匹配 + */ + private Integer measurementDevNotMatch; + /** + * 监测点台帐-监测点监测对象类型不准确 + */ + private Integer measurementTypeError; + /** + * 监测点台帐-牵引站监测点冗余 + */ + private Integer tractionStationMeasurementRedundancy; + /** + * 监测点台帐-电气化铁路监测点三个容量填写不准确 + */ + private Integer railwayCapacityError; + /** + * 牵引站-必填字段为空 + */ + private Integer tractionStationFieldNull; + /** + * 牵引站-牵引变容量格式不准确 + */ + private Integer tractionStationCapacityError; + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + private String dataType; + + +} + 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/RStatMeasurementAccountDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java new file mode 100644 index 000000000..4c8c6a837 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java @@ -0,0 +1,30 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 监测点台账数据质量问题-核查详情(RStatMeasurementAccountDetail)实体类 + * + * @author yzh + * @since 2022-11-04 15:53:10 + */ +@Data +public class RStatMeasurementAccountDetailPO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 时间 + */ + private Date dataDate; + /** + * 核查规则 + */ + private String checkRules; + /** + * 监测点ID + */ + private String measurementPointId; +} + 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 new file mode 100644 index 000000000..68f1e8096 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java @@ -0,0 +1,37 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author jianghf + * @TableName r_stat_pw_alarm_count_w + */ +@Data +public class RStatPwAlarmCountW implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 单位id + */ + private String orgNo; + + /** + * 数据生成时间 + */ + private Date dataDate; + + /** + * 在线监测点数 + */ + private Integer onlineMonitorCount; + + /** + * 告警监测点数 + */ + private Integer alarmMonitorCount; + +} 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/RStatTargetCheckDataPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetCheckDataPO.java new file mode 100644 index 000000000..2e2e08501 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetCheckDataPO.java @@ -0,0 +1,111 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 监测指标数据质量核查-年表(RStatTargetCheckDataY)实体类 + * + * @author yzh + * @since 2022-11-02 19:26:00 + */ +@Data +public class RStatTargetCheckDataPO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 单位ID + */ + private String orgNo; + /** + * 时间 + */ + private Date dataDate; + /** + * 基波电压指标数值不合理 + */ + private Integer fundamentalVoltageAbnormal; + /** + * 频率指标数值不合理 + */ + private Integer frequencyAbnormal; + /** + * 电压偏差指标数值不合理 + */ + private Integer vDevAbnormal; + /** + * 谐波电压指标数值不合理 + */ + private Integer harmonicVoltageAbnormal; + /** + * 间谐波电压指标数值不合理 + */ + private Integer centreHarmonicVoltage; + /** + * 三相电压不平衡指标数值不合理 + */ + private Integer tpVoltageUnbalance; + /** + * 电压偏差连续超标 + */ + private Integer vDevLastOverlimit; + /** + * 换流站监测点基波电压无数据或零 + */ + private Integer tractionStationMeasurementNone; + /** + * 电气化铁路监测点基波电压数值不合理或无数值 + */ + private Integer railwayFundamentalVoltageAbnormal; + /** + * 电气化铁路监测点基波电流数值不合理或为0值 + */ + private Integer railwayFundamentalCurrentAbnormal; + /** + * 电气化铁路监测点总有功功率不合理 + */ + private Integer railwayTotalActivePowerAbnormal; + /** + * 电气化铁路监测点谐波电压含有率不合理 + */ + private Integer railwayHarmonicVoltageContentAbnormal; + /** + * 频繁上传暂态事件 + */ + private Integer freqUploadEvent; + /** + * 录波文件未正确上传 + */ + private Integer waveUploadError; + /** + * 暂态事件持续时间不合理 + */ + private Integer eventLastTimeAbnormal; + /** + * 暂态事件类型与特征幅值不一致 + */ + private Integer eventTypeAmplitudeAtypism; + /** + * 暂态事件特征幅值不合理 + */ + private Integer eventTypeAmplitudeAbnormal; + /** + * 暂态事件相别为“未知”或“NONE” + */ + private Integer eventPhaseNone; + /** + * 运行电压偏高（非实际电压暂升事件） + */ + private Integer runVolatgeUp; + /** + * 运行电压偏低（非实际电压暂降事件） + */ + private Integer runVolatgeLow; + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + private String dataType; + +} + 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 new file mode 100644 index 000000000..e29450301 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java @@ -0,0 +1,34 @@ +package com.njcn.device.pms.pojo.po; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类 + * + * @author yzh + * @since 2022-11-08 09:03:35 + */ +@Data +public class RStatTargetDetailPO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 时间 + */ + private Date dataDate; + /** + * 核查规则 + */ + private String checkRules; + /** + * 监测点ID + */ + private String measurementPointId; + /** + * 指标类型（稳态、暂态指标数据质量问题） + */ + private String targetType; +} + diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java new file mode 100644 index 000000000..ab2b03184 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java @@ -0,0 +1,33 @@ +package com.njcn.device.pms.pojo.po; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 牵引站台账数据质量问题-核查详情(RStatTractionStationAccountDetail)实体类 + * + * @author yzh + * @since 2022-11-09 09:42:42 + */ +@Data +@ApiModel("牵引站台账数据质量问题-核查详情") +public class RStatTractionStationAccountDetailPO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 时间 + */ + private Date dataDate; + /** + * 核查规则 + */ + private String checkRules; + /** + * 牵引站ID + */ + private String substationId; + +} + 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/StatationStat.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java index 366cc73bc..8e366803c 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 @@ -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; /** *

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 5ccdb1ce6..925c0ed48 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,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 @@ -116,7 +113,7 @@ public class TractionStation extends BaseEntity { private Integer isUpToGrid; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Integer status; 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/DoubleUserVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DoubleUserVO.java new file mode 100644 index 000000000..f21ec8515 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DoubleUserVO.java @@ -0,0 +1,25 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * pms-device + * 发电用户用电用户 + * @author cdf + * @date 2022/11/15 + */ +@Data +public class DoubleUserVO { + + @ApiModelProperty(value = "用户名称") + private String name; + + @ApiModelProperty(value = "用户编号") + private String id; + + @ApiModelProperty(value = "用户类型 0.用电 1.发电") + private Integer type; + + +} 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/PwRDnOperatingIndexCommonVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRDnOperatingIndexCommonVO.java new file mode 100644 index 000000000..8ad631960 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRDnOperatingIndexCommonVO.java @@ -0,0 +1,57 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * * 配网运行指标统计返回实体类（用于配网运行指标统计业务） + * @Title PwRDnOperatingIndexCommonVO + * @Package com.njcn.device.pms.pojo.vo + * @Author jianghaifei + * @Date 2022-11-10 14:09 + * @Version V1.0 + */ +@Data +public class PwRDnOperatingIndexCommonVO { + + @ApiModelProperty(name = "orgNo", value = "单位ID") + private String orgNo; + + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + + @ApiModelProperty(name = " measurementPointsOne", value = "I监测点数") + private Integer measurementPointsOne; + + @ApiModelProperty(name = " measurementPointsTwo", value = "II监测点数") + private Integer measurementPointsTwo; + + @ApiModelProperty(name = " measurementPointsThree", value = "III监测点数") + private Integer measurementPointsThree; + + @ApiModelProperty(name = " shouldCountOne", value = "I类应设点数") + private Integer shouldCountOne; + + @ApiModelProperty(name = " shouldCountTwo", value = "II类应设点数") + private Integer shouldCountTwo; + + @ApiModelProperty(name = " shouldCountThree", value = "III类应设点数") + private Integer shouldCountThree; + + @ApiModelProperty(name = "shouldPointCoverage", value = "应设点覆盖率") + private Double shouldPointCoverage; + + @ApiModelProperty(name = "effectiveAccessRate", value = "有效接入率") + private Double effectiveAccessRate; + + @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率") + private Double dataIntegrityRate; + + @ApiModelProperty(name = "dataRightRate", value = "数据准确率") + private Double dataRightRate; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRDnOperatingVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRDnOperatingVO.java new file mode 100644 index 000000000..8a89d072d --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRDnOperatingVO.java @@ -0,0 +1,112 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 获取配网数据质量-监测指标数据质量统计 + * + * @author yzh + * @date 2022/11/4 + */ + +@Data +@ApiModel("获取配网数据质量-监测指标数据质量统计返回前端实体类") +public class PwRDnOperatingVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 所属单位id + */ + @ApiModelProperty(name = "orgNo", value = "所属单位id") + private String orgNo; + + /** + * 所属单位 + */ + @ApiModelProperty(name = "orgName", value = "所属单位") + private String orgName; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate",value = "时间") + private Date dataDate; + + /** + * 监测点数量 + */ + @ApiModelProperty(name = "measurementCount", value = "监测点数量") + private String measurementCount; + + /** + * 有效接入监测点数 + */ + @ApiModelProperty(name = "effectiveAccessMeasurementCount", value = "有效接入监测点数") + private String effectiveAccessMeasurementCount; + + /** + * 有效接入监测点数同比 + */ + @ApiModelProperty(name = "effectiveAccessMeasurementCountYearOnYear", value = "有效接入监测点数同比") + private String effectiveAccessMeasurementCountYearOnYear; + + /** + * 有效接入监测点数环比 + */ + @ApiModelProperty(name = "effectiveAccessMeasurementCountRingRatio", value = "有效接入监测点数环比") + private String effectiveAccessMeasurementCountRingRatio; + + /** + * 有效接入率 + */ + @ApiModelProperty(name = "effectiveAccessRate", value = "有效接入率") + private String effectiveAccessRate; + + /** + * 有效接入率同比 + */ + @ApiModelProperty(name = "effectiveAccessRateYearOnYear", value = "有效接入率同比") + private String effectiveAccessRateYearOnYear; + + /** + * 有效接入率环比 + */ + @ApiModelProperty(name = "effectiveAccessRateRingRatio", value = "有效接入率环比") + private String effectiveAccessRateRingRatio; + + /** + * 数据完整率 + */ + @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率") + private String dataIntegrityRate; + + /** + * 数据完整绿同比 + */ + @ApiModelProperty(name = "dataIntegrityRateYearOnYear", value = "数据完整绿同比") + private String dataIntegrityRateYearOnYear; + + /** + * 数据完整绿环比 + */ + @ApiModelProperty(name = "dataIntegrityRateRingRatio", value = "数据完整绿环比") + private String dataIntegrityRateRingRatio; + + /** + * 指标完整率 + */ + @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率") + private String indexIntegrityRate; + + /** + * 数据是否异常 + */ + @ApiModelProperty(name = "isUnusual", value = "数据是否异常") + private String isUnusual; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRMpMonitorAlarmCountMVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRMpMonitorAlarmCountMVO.java new file mode 100644 index 000000000..c2aee071d --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRMpMonitorAlarmCountMVO.java @@ -0,0 +1,161 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * 监测点告警统计-月表（配网） + * @Title PwRMpMonitorAlarmCountMVO + * @Package com.njcn.device.pms.pojo.vo + * @Author jianghaifei + * @Date 2022-11-01 19:01 + * @Version V1.0 + */ +@Data +public class PwRMpMonitorAlarmCountMVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "orgNo", value = "所属单位id") + private String orgNo; + + @ApiModelProperty(name = "orgName", value = "所属单位名称") + private String orgName; + + @ApiModelProperty(name = "powerId", value = "所属变电站id") + private String powerId; + + @ApiModelProperty(name = "powerName", value = "所属变电站名称") + private String powerName; + + @ApiModelProperty(name = "PowerDistributionAreaId", value = "所属台区id") + private String powerDistributionAreaId; //台区id + + @ApiModelProperty(name = "PowerDistributionAreaName", value = "所属台区名称") + private String powerDistributionAreaName; //台区名称 + + @ApiModelProperty(name = "powerClientId", value = "用户id") + private String powerClientId; + + @ApiModelProperty(name = "powerClientName", value = "用户名称") + private String powerClientName; + + @ApiModelProperty(name = "", value = "监测点类别(字典id)") + private String monitorSort; + + @ApiModelProperty(name = "voltage_Level", value = "电压等级(字典id)") + private String voltageLevel; + + @ApiModelProperty(name = "measurementPointId", value = "监测点ID") + private String measurementPointId; + + @ApiModelProperty(name = "measurementPointName", value = "监测点名称") + private String measurementPointName; + + /** + * 生成数据的时间,每月统计一次 + */ + @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每月统计一次") + private Date dataDate; + + /** + * 电压偏差告警情况(0:否 1:是) + */ + @ApiModelProperty(name = "vdevAlarmInfo", value = "电压偏差告警情况(0:否 1:是)") + private Integer vdevAlarmInfo; + + /** + * 电压偏差严重度 + */ + @ApiModelProperty(name = "vdevSeverity", value = "电压偏差严重度") + private Integer vdevSeverity; + + /** + * 频率偏差告警情况(0:否 1:是) + */ + @ApiModelProperty(name = "freqAlarmInfo", value = "频率偏差告警情况(0:否 1:是)") + private Integer freqAlarmInfo; + + /** + * 频率偏差严重度 + */ + @ApiModelProperty(name = "freqSeverity", value = "频率偏差严重度") + private Integer freqSeverity; + + /** + * 三相电压不平衡度告警情况(0:否 1:是) + */ + @ApiModelProperty(name = "unbalanceAlarmInfo", value = "三相电压不平衡度告警情况(0:否 1:是)") + private Integer unbalanceAlarmInfo; + + /** + * 三相电压不平衡度严重度 + */ + @ApiModelProperty(name = "unbalanceSeverity", value = "三相电压不平衡度严重度") + private Integer unbalanceSeverity; + + /** + * 谐波电压告警情况(0:否 1:是) + */ + @ApiModelProperty(name = "vAlarmInfo", value = "谐波电压告警情况(0:否 1:是)") + private Integer vAlarmInfo; + + /** + * 谐波电压严重度 + */ + @ApiModelProperty(name = "vSeverity", value = "谐波电压严重度") + private Integer vSeverity; + + /** + * 闪变告警情况(0:否 1:是) + */ + @ApiModelProperty(name = "flickerAlarmInfo", value = "闪变告警情况(0:否 1:是)") + private Integer flickerAlarmInfo; + + /** + * 闪变严重度 + */ + @ApiModelProperty(name = "flickerSeverity", value = "闪变严重度") + private Integer flickerSeverity; + + /** + * 电压暂降告警情况(0:否 1:是) + */ + @ApiModelProperty(name = "sagAlarmInfo", value = "电压暂降告警情况(0:否 1:是)") + private Integer sagAlarmInfo; + + /** + * 电压暂降告严重度 + */ + @ApiModelProperty(name = "sagSeverity", value = "电压暂降严重度") + private Integer sagSeverity; + + /** + * 短时中断告警情况(0:否 1:是) + */ + + @ApiModelProperty(name = "interruptAlarmInfo", value = "短时中断告警情况(0:否 1:是)") + private Integer interruptAlarmInfo; + + /** + * 短时中断严重度 + */ + @ApiModelProperty(name = "interruptSeverity", value = "短时中断告严重度") + private Integer interruptSeverity; + + /** + * 稳态指标评级结果（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; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRQualityParameterVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRQualityParameterVO.java new file mode 100644 index 000000000..0d4a7b03e --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRQualityParameterVO.java @@ -0,0 +1,56 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 获取配网数据质量-台账数据质量统计返回前端实体类 + * + * @author yzh + * @date 2022/11/7 + */ + +@Data +@ApiModel("获取配网数据质量-台账数据质量统计返回前端实体类") +public class PwRQualityParameterVO implements Serializable { + + /** + * 单位id + */ + @ApiModelProperty(name = "orgNo", value = "单位id") + private String orgNo; + + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + + /** + * 监测点数量 + */ + @ApiModelProperty(name = "measurementCount", value = "监测点数量") + private String measurementCount; + + /** + * 监测点台账完整数量 + */ + @ApiModelProperty(name = "measurementCompleteQuantity", value = "监测点台账完整数量") + private String measurementCompleteQuantity; + + /** + * 监测点台帐完整率 + */ + @ApiModelProperty(name = "monitoringIntegrityRate", value = "监测点台帐完整率") + private String monitoringIntegrityRate; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatAccountCheckDataVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatAccountCheckDataVO.java new file mode 100644 index 000000000..23654585b --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatAccountCheckDataVO.java @@ -0,0 +1,129 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类 + * + * @author yzh + * @since 2022-11-02 16:07:15 + */ +@Data +@ApiModel("台账类数据质量核查返回前端实体类") +public class PwRStatAccountCheckDataVO implements Serializable { + private static final long serialVersionUID = -1L; + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo", value = "单位ID") + private String orgNo; + + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + + /** + * 终端台帐-必填字段为空 + */ + @ApiModelProperty(name = "devFieldNull", value = "终端台帐-必填字段为空") + private Integer devFieldNull; + + /** + * 终端台帐-投运日期不规范 + */ + @ApiModelProperty(name = "devRunTimeAbnormal", value = "终端台帐-投运日期不规范") + private Integer devRunTimeAbnormal; + + /** + * 终端台帐-终端类型不正确 + */ + @ApiModelProperty(name = "devTypeError", value = "终端台帐-终端类型不正确") + private Integer devTypeError; + + /** + * 终端台帐-上次检定日期不合理 + */ + @ApiModelProperty(name = "devCheckTimeAbnormal", value = "终端台帐-上次检定日期不合理") + private Integer devCheckTimeAbnormal; + + /** + * 终端台帐-IP地址不规范 + */ + @ApiModelProperty(name = "devIpError", value = "终端台帐-IP地址不规范") + private Integer devIpError; + + /** + * 监测点台帐-必填字段为空 + */ + @ApiModelProperty(name = "measurementFieldNull", value = "监测点台帐-必填字段为空") + private Integer measurementFieldNull; + + /** + * 监测点台帐-监测点名称不规范 + */ + @ApiModelProperty(name = "measurementNameAbnormal", value = "监测点台帐-监测点名称不规范") + private Integer measurementNameAbnormal; + + /** + * 监测点台帐-监测对象名称不规范 + */ + @ApiModelProperty(name = "measurementTypeAbnormal", value = "监测点台帐-监测对象名称不规范") + private Integer measurementTypeAbnormal; + + /** + * 监测点台帐-容量填写不准确 + */ + @ApiModelProperty(name = "measurementCapacityError", value = "监测点台帐-容量填写不准确") + private Integer measurementCapacityError; + + /** + * 监测点台帐-监测点与终端状态不匹配 + */ + @ApiModelProperty(name = "measurementDevNotMatch", value = "监测点台帐-监测点与终端状态不匹配") + private Integer measurementDevNotMatch; + + /** + * 监测点台帐-监测点监测对象类型不准确 + */ + @ApiModelProperty(name = "measurementTypeError", value = "监测点台帐-监测点监测对象类型不准确") + private Integer measurementTypeError; + + /** + * 监测点台帐-牵引站监测点冗余 + */ + @ApiModelProperty(name = "tractionStationMeasurementRedundancy", value = "监测点台帐-牵引站监测点冗余") + private Integer tractionStationMeasurementRedundancy; + + /** + * 监测点台帐-电气化铁路监测点三个容量填写不准确 + */ + @ApiModelProperty(name = "railwayCapacityError", value = "监测点台帐-电气化铁路监测点三个容量填写不准确") + private Integer railwayCapacityError; + + /** + * 监测点台帐-牵引站信息缺失 + */ + @ApiModelProperty(name = "tractionStationMeasurementMissing",value = "监测点台帐-牵引站信息缺失") + private Integer tractionStationMeasurementMissing; + + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @ApiModelProperty(name = "dataType", value = "数据类型,字典表（01：主网测点 02：配网测点）") + private String dataType; + +} + diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatMeasurementAccountDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatMeasurementAccountDetailVO.java new file mode 100644 index 000000000..f3b8ed54a --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatMeasurementAccountDetailVO.java @@ -0,0 +1,67 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author yzh + * @date 2022/11/4 + */ +@Data +@ApiModel("获取配网数据质量-台账类数据指标核查详情-监测点台账数据质量问题返回前端实体类") +public class PwRStatMeasurementAccountDetailVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName",value = "单位名称") + private String orgName; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate",value = "时间") + private Date dataDate; + + /** + * 核查规则 + */ + @ApiModelProperty(name = "checkRules",value = "核查规则") + private String checkRules; + /** + * 变电站名称 + */ + @ApiModelProperty(name = "powerName",value = "变电站名称") + private String powerName; + /** + * 中压线路 + */ + @ApiModelProperty(name = "mediumVoltageLine",value = "中压线路") + private String mediumVoltageLine; + /** + * 台区名称 + */ + @ApiModelProperty(name = "platformAreaName",value = "台区名称") + private String platformAreaName; + + /** + * 监测点id + */ + @ApiModelProperty(name = "monitorId",value = "监测点id") + private String monitorId; + /** + * 监测点名称 + */ + @ApiModelProperty(name = "monitorName",value = "监测点名称") + private String monitorName; + /** + * 监测点电压等级 + */ + @ApiModelProperty(name = "monitorVoltageLevel",value = "监测点电压等级") + private String monitorVoltageLevel; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatTargetDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatTargetDetailVO.java new file mode 100644 index 000000000..38532067d --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PwRStatTargetDetailVO.java @@ -0,0 +1,72 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类 + * + * @author yzh + * @since 2022-11-08 09:03:35 + */ +@Data +@ApiModel("获取配网数据质量-稳态指标类数据质量问题查询返回前端实体类") +public class PwRStatTargetDetailVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + /** + * 核查规则 + */ + @ApiModelProperty(name = "checkRules", value = "核查规则") + private String checkRules; + /** + * 地市公司 + */ + @ApiModelProperty(name = "cityCompany",value = "地市公司") + private String cityCompany; + /** + * 变电站名称 + */ + @ApiModelProperty(name = "powerName",value = "变电站名称") + private String powerName; + /** + * 中压线路 + */ + @ApiModelProperty(name = "mediumVoltageLine",value = "中压线路") + private String mediumVoltageLine; + /** + * 台区名称 + */ + @ApiModelProperty(name = "platformAreaName",value = "台区名称") + private String platformAreaName; + /** + * 监测点ID + */ + @ApiModelProperty(name = "monitorId", value = "监测点ID") + private String monitorId; + /** + * 监测点ID + */ + @ApiModelProperty(name = "monitorName", value = "监测点名称") + private String monitorName; + /** + * 监测点电压等级 + */ + @ApiModelProperty(name = "monitorVoltageLevel", value = "监测点电压等级") + private String monitorVoltageLevel; + /** + * 指标类型（稳态、暂态指标数据质量问题） + */ + @ApiModelProperty(name = "targetType", value = "指标类型（稳态、暂态指标数据质量问题）") + private String targetType; +} + diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java index 75e347be1..892de2b38 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java @@ -8,7 +8,7 @@ import java.util.Date; /** * @author jianghf - * 监测点告警统计-月表 + * 监测点告警统计-月表（主网） * @TableName r_mp_monitor_alarm_count_m */ @Data diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java new file mode 100644 index 000000000..58d394cac --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java @@ -0,0 +1,82 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 主网运行指标统计返回实体类（用于主网运行指标统计业务） + * @Title ROperatingIndexCommonVO + * @Package com.njcn.device.pms.pojo.vo + * @Author jianghaifei + * @Date 2022-11-09 20:03 + * @Version V1.0 + */ + +@Data +public class ROperatingIndexCommonVO { + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo", value = "单位ID") + private String orgNo; + + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + /** + * 在运监测点数 + */ + @ApiModelProperty(name = " measurementRunPoints", value = "在运监测点数(监测点数)") + private Integer measurementRunPoints; + /** + * 在线监测点数 + */ + @ApiModelProperty(name = " transitMeasurementPoints", value = "在线监测点数") + private Integer transitMeasurementPoints; + + @ApiModelProperty(name = " transitMeasurementRate", value = "在线监测率") + private Double transitMeasurementRate; + /** + * 在线终端数 + */ + @ApiModelProperty(name = " onlineMeasurementCount", value = "在线终端数") + private Integer onlineMeasurementCount; + /** + * 应设点数 + */ + @ApiModelProperty(name = " shouldCount", value = "应设点数") + private Integer shouldCount; + + /** + * 数据完整率 + */ + @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率") + private Double dataIntegrityRate; + /** + * 数据准确率 + */ + @ApiModelProperty(name = "dataRightRate", value = "数据准确率") + private Double dataRightRate; + + /** + * 应设点覆盖率 + */ + @ApiModelProperty(name = "shouldPointCoverage", value = "应设点覆盖率") + private Double shouldPointCoverage; + /** + * 指标完整率 + */ + @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率") + private Double indexIntegrityRate; + /** + * 数据是否异常(0:正常 1:异常) + */ + @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)") + private Integer isUnusual; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexVO.java new file mode 100644 index 000000000..71674390c --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexVO.java @@ -0,0 +1,74 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 主网运行指标统计返回前端实体类 + * + * @author yzh + * @date 2022/11/1 + */ +@Data +public class ROperatingIndexVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo", value = "单位ID") + private String orgNo; + + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + + /** + * 监测点数量 + */ + @ApiModelProperty(name = "measurementCount", value = "监测点数量") + private Integer measurementCount; + + /** + * 有效接入监测点数量 + */ + @ApiModelProperty(name = " effectiveAccessMeasurementCount", value = "有效接入监测点数量") + private Integer effectiveAccessMeasurementCount; + /** + * 有效接入率【有效接入监测点数量/在运监测点数】 + */ + @ApiModelProperty(name = "effectiveAccessRate", value = "有效接入率【有效接入监测点数量/在运监测点数】") + private Double effectiveAccessRate; + /** + * 数据完整率 + */ + @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率") + private Double dataIntegrityRate; + /** + * 指标完整率 + */ + @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率") + private Double indexIntegrityRate; + /** + * 数据是否异常(0:正常 1:异常) + */ + @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)") + private Integer isUnusual; +} + + + + + diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterPollVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterPollVO.java new file mode 100644 index 000000000..5ed506796 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterPollVO.java @@ -0,0 +1,58 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 监测指标数据质量问题汇总统计返回前端实体类 + * + * @author yzh + * @date 2022/11/3 + */ + +@Data +@ApiModel("监测指标数据质量问题汇总统计返回前端实体类") +public class RQualityParameterPollVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 单位id + */ + @ApiModelProperty(name = "orgId", value = "单位id") + private String orgId; + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + /** + * 有效接入监测点数量 + */ + @ApiModelProperty(name = "effectiveAccessMeasurementCount", value = "有效接入监测点数量") + private Integer effectiveAccessMeasurementCount; + /** + * 存在数据质量问题监测点 + */ + @ApiModelProperty(name = "problem", value = "存在数据质量问题监测点") + private Integer problem; + /** + * 存在数据质量问题监测点占比 + */ + @ApiModelProperty(name = "problemProportion", value = "存在数据质量问题监测点占比") + private Double problemProportion; + + /** + * 存在数据质量问题监测点同比 + */ + @ApiModelProperty(name = "problemYearOnYear", value = "存在数据质量问题监测点同比") + private String problemYearOnYear; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterVO.java new file mode 100644 index 000000000..4d38fc39e --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterVO.java @@ -0,0 +1,70 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 监测指标数据质量问题汇总统计-月表(r_quality_parameter_m)实体类 + * + * @author yzh + * @since 2022-11-02 10:55:22 + */ +@Data +@ApiModel("监测指标数据质量问题汇总统计") +public class RQualityParameterVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo",value = "单位ID") + private String orgNo; + + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName",value = "单位名称") + private String orgName; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate",value = "时间") + private Date dataDate; + + /** + * 监测点数量 + */ + @ApiModelProperty(name = "measurementCount",value = "监测点数量") + private String measurementCount; + + /** + * 监测点-母线-变电站匹配个数 + */ + @ApiModelProperty(name = "matchingCount",value = "监测点-母线-变电站匹配个数") + private String matchingCount; + + /** + * 监测点-母线-变电站匹配个率 + */ + @ApiModelProperty(name = "matchingRate",value = "监测点-母线-变电站匹配个率") + private String matchingRate; + + /** + * 监测点台账完整率 + */ + @ApiModelProperty(name = "monitoringIntegrityRate",value = "监测点台账完整率") + private String monitoringIntegrityRate; + + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @ApiModelProperty(name = "dataType",value = "数据类型,字典表（01：主网测点 02：配网测点）") + private String dataType; + +} + diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAccountCheckDataVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAccountCheckDataVO.java new file mode 100644 index 000000000..604552c0c --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAccountCheckDataVO.java @@ -0,0 +1,153 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类 + * + * @author yzh + * @since 2022-11-02 16:07:15 + */ +@Data +@ApiModel("台账类数据质量核查返回前端实体类") +public class RStatAccountCheckDataVO implements Serializable { + private static final long serialVersionUID = -1L; + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo", value = "单位ID") + private String orgNo; + + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + + /** + * 终端台帐-必填字段为空 + */ + @ApiModelProperty(name = "devFieldNull", value = "终端台帐-必填字段为空") + private Integer devFieldNull; + + /** + * 终端台帐-投运日期不规范 + */ + @ApiModelProperty(name = "devRunTimeAbnormal", value = "终端台帐-投运日期不规范") + private Integer devRunTimeAbnormal; + + /** + * 终端台帐-终端类型不正确 + */ + @ApiModelProperty(name = "devTypeError", value = "终端台帐-终端类型不正确") + private Integer devTypeError; + + /** + * 终端台帐-上次检定日期不合理 + */ + @ApiModelProperty(name = "devCheckTimeAbnormal", value = "终端台帐-上次检定日期不合理") + private Integer devCheckTimeAbnormal; + + /** + * 终端台帐-IP地址不规范 + */ + @ApiModelProperty(name = "devIpError", value = "终端台帐-IP地址不规范") + private Integer devIpError; + + /** + * 监测点台帐-必填字段为空 + */ + @ApiModelProperty(name = "measurementFieldNull", value = "监测点台帐-必填字段为空") + private Integer measurementFieldNull; + + /** + * 监测点台帐-限值是否合理 + */ + @ApiModelProperty(name = "measurementLimitAbnormal", value = "监测点台帐-限值是否合理") + private Integer measurementLimitAbnormal; + + /** + * 监测点台帐-监测点名称不规范 + */ + @ApiModelProperty(name = "measurementNameAbnormal", value = "监测点台帐-监测点名称不规范") + private Integer measurementNameAbnormal; + + /** + * 监测点台帐-监测对象名称不规范 + */ + @ApiModelProperty(name = "measurementTypeAbnormal", value = "监测点台帐-监测对象名称不规范") + private Integer measurementTypeAbnormal; + + /** + * 监测点台帐-容量填写不准确 + */ + @ApiModelProperty(name = "measurementCapacityError", value = "监测点台帐-容量填写不准确") + private Integer measurementCapacityError; + + /** + * 监测点台帐-监测点与终端状态不匹配 + */ + @ApiModelProperty(name = "measurementDevNotMatch", value = "监测点台帐-监测点与终端状态不匹配") + private Integer measurementDevNotMatch; + + /** + * 监测点台帐-监测点监测对象类型不准确 + */ + @ApiModelProperty(name = "measurementTypeError", value = "监测点台帐-监测点监测对象类型不准确") + private Integer measurementTypeError; + + /** + * 监测点台帐-牵引站监测点冗余 + */ + @ApiModelProperty(name = "tractionStationMeasurementRedundancy", value = "监测点台帐-牵引站监测点冗余") + private Integer tractionStationMeasurementRedundancy; + + /** + * 监测点台帐-电气化铁路监测点三个容量填写不准确 + */ + @ApiModelProperty(name = "railwayCapacityError", value = "监测点台帐-电气化铁路监测点三个容量填写不准确") + private Integer railwayCapacityError; + + /** + * 监测点台帐-牵引站信息缺失 + */ + @ApiModelProperty(name = "tractionStationMeasurementMissing",value = "监测点台帐-牵引站信息缺失") + private Integer tractionStationMeasurementMissing; + + /** + * 牵引站-必填字段为空 + */ + @ApiModelProperty(name = "tractionStationFieldNull", value = "牵引站-必填字段为空") + private Integer tractionStationFieldNull; + + /** + * 牵引站-牵引变容量格式不准确 + */ + @ApiModelProperty(name = "tractionStationCapacityError", value = "牵引站-牵引变容量格式不准确") + private Integer tractionStationCapacityError; + + /** + * 牵引站-信息冗余 + */ + @ApiModelProperty(name = "tractionStationInfoRedundancy",value = "牵引站-信息冗余") + private Integer tractionStationInfoRedundancy; + + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @ApiModelProperty(name = "dataType", value = "数据类型,字典表（01：主网测点 02：配网测点）") + private String dataType; + +} + 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/RStatMeasurementAccountDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatMeasurementAccountDetailVO.java new file mode 100644 index 000000000..b3980bd2f --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatMeasurementAccountDetailVO.java @@ -0,0 +1,70 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author yzh + * @date 2022/11/4 + */ +@Data +@ApiModel("获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题返回前端实体类") +public class RStatMeasurementAccountDetailVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 单位id + */ + @ApiModelProperty(name = "orgId",value = "单位id") + private String orgId; + + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName",value = "单位名称") + private String orgName; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate",value = "时间") + private Date dataDate; + + /** + * 核查规则 + */ + @ApiModelProperty(name = "checkRules",value = "核查规则") + private String checkRules; + + /** + * 变电站id + */ + @ApiModelProperty(name = "powerId",value = "变电站id") + private String powerId; + + /** + * 变电站名称 + */ + @ApiModelProperty(name = "powerName",value = "变电站名称") + private String powerName; + + /** + * 监测点id + */ + @ApiModelProperty(name = "monitorId",value = "监测点id") + private String monitorId; + /** + * 监测点名称 + */ + @ApiModelProperty(name = "monitorName",value = "监测点名称") + private String monitorName; + /** + * 监测点电压等级 + */ + @ApiModelProperty(name = "monitorVoltageLevel",value = "监测点电压等级") + private String monitorVoltageLevel; +} 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/RStatPwAlarmCountWVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatPwAlarmCountWVO.java new file mode 100644 index 000000000..bd9479270 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatPwAlarmCountWVO.java @@ -0,0 +1,54 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Title RStatPwAlarmCountWVO + * @Package com.njcn.device.pms.pojo.vo + * @Author jianghaifei + * @Date 2022-11-02 15:50 + * @Version V1.0 + */ +@Data +public class RStatPwAlarmCountWVO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo", value = "单位id") + private String orgNo; + + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + + /** + * 生成数据的时间,每周统计一次 + */ + @ApiModelProperty(name = "dataDate", value = "生成数据时间") + private Date dataDate; + + /** + * 在线监测点数 + */ + @ApiModelProperty(name = "onlineMonitorCount", value = "在线监测点数") + private Integer onlineMonitorCount; + + /** + * 告警监测点数 + */ + @ApiModelProperty(name = "alarmMonitorCount", value = "告警检测点数") + private Integer alarmMonitorCount; + + @ApiModelProperty(name = "alarmMonitorRate", value = "告警监测点占比") + private Double alarmMonitorRate; + + @ApiModelProperty(name = "alarmMonitorRateYoy", value = "告警监测点占比同比") + private Double alarmMonitorRateYoy; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatPwAlarmDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatPwAlarmDetailVO.java new file mode 100644 index 000000000..fa755609a --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatPwAlarmDetailVO.java @@ -0,0 +1,63 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 监测点指标告警明细 + * @Title RStatPwAlarmDetailVO + * @Package com.njcn.device.pms.pojo.vo + * @Author jianghaifei + * @Date 2022-11-03 11:41 + * @Version V1.0 + */ +@Data +public class RStatPwAlarmDetailVO { + + @ApiModelProperty(name = "orgId", value = "单位id") + private String orgId; //单位id + + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; //单位name + + @ApiModelProperty(name = "powerId", value = "所属变电站id") + private String powerId; + + @ApiModelProperty(name = "powerName", value = "所属变电站名称") + private String powerName; + + @ApiModelProperty(name = "PowerDistributionAreaId", value = "所属台区id") + private String powerDistributionAreaId; //台区id + + @ApiModelProperty(name = "PowerDistributionAreaName", value = "所属台区名称") + private String powerDistributionAreaName; //台区名称 + + @ApiModelProperty(name = "powerClientId", value = "用户id") + private String powerClientId; + + @ApiModelProperty(name = "powerClientName", value = "用户名称") + private String powerClientName; + + @ApiModelProperty(name = "", value = "监测点类别(字典id)") + private String monitorSort; + + @ApiModelProperty(name = "voltage_Level", value = "监测点电压等级(字典id)") + private String voltageLevel; + + @ApiModelProperty(name = "measurementPointId", value = "监测点ID") + private String measurementPointId; + + @ApiModelProperty(name = "measurementPointName", value = "监测点名称") + private String measurementPointName; + + @ApiModelProperty(name = "dataDate", value = "告警时间") + private Date dataDate; + + @ApiModelProperty(name = "alarmType", value = "告警类型(字典id)") + private String alarmType; + + @ApiModelProperty(name = "alarmInfo", value = "告警描述") + private String alarmInfo; +} 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/RStatTargetCheckDataVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTargetCheckDataVO.java new file mode 100644 index 000000000..55468fca1 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTargetCheckDataVO.java @@ -0,0 +1,143 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 监测指标数据质量核查-年表(RStatTargetCheckDataY)实体类 + * + * @author yzh + * @since 2022-11-02 19:26:00 + */ +@Data +@ApiModel("监测指标数据质量核查返回前端实体类") +public class RStatTargetCheckDataVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 单位ID + */ + @ApiModelProperty(name = "orgNo", value = "单位ID") + private String orgNo; + /** + * 单位名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + /** + * 基波电压指标数值不合理 + */ + @ApiModelProperty(name = "fundamentalVoltageAbnormal", value = "基波电压指标数值不合理") + private Integer fundamentalVoltageAbnormal; + /** + * 频率指标数值不合理 + */ + @ApiModelProperty(name = "frequencyAbnormal", value = "频率指标数值不合理") + private Integer frequencyAbnormal; + /** + * 电压偏差指标数值不合理 + */ + @ApiModelProperty(name = "vDevAbnormal", value = "电压偏差指标数值不合理") + private Integer vDevAbnormal; + /** + * 谐波电压指标数值不合理 + */ + @ApiModelProperty(name = "harmonicVoltageAbnormal", value = "谐波电压指标数值不合理") + private Integer harmonicVoltageAbnormal; + /** + * 间谐波电压指标数值不合理 + */ + @ApiModelProperty(name = "centreHarmonicVoltage", value = "间谐波电压指标数值不合理") + private Integer centreHarmonicVoltage; + /** + * 三相电压不平衡指标数值不合理 + */ + @ApiModelProperty(name = "tpVoltageUnbalance", value = "三相电压不平衡指标数值不合理") + private Integer tpVoltageUnbalance; + /** + * 电压偏差连续超标 + */ + @ApiModelProperty(name = "vDevLastOverlimit", value = "电压偏差连续超标") + private Integer vDevLastOverlimit; + /** + * 换流站监测点基波电压无数据或零 + */ + @ApiModelProperty(name = "tractionStationMeasurementNone", value = "换流站监测点基波电压无数据或零") + private Integer tractionStationMeasurementNone; + /** + * 电气化铁路监测点基波电压数值不合理或无数值 + */ + @ApiModelProperty(name = "railwayFundamentalVoltageAbnormal", value = "电气化铁路监测点基波电压数值不合理或无数值") + private Integer railwayFundamentalVoltageAbnormal; + /** + * 电气化铁路监测点基波电流数值不合理或为0值 + */ + @ApiModelProperty(name = "railwayFundamentalCurrentAbnormal", value = "电气化铁路监测点基波电流数值不合理或为0值") + private Integer railwayFundamentalCurrentAbnormal; + /** + * 电气化铁路监测点总有功功率不合理 + */ + @ApiModelProperty(name = "railwayTotalActivePowerAbnormal", value = "电气化铁路监测点总有功功率不合理") + private Integer railwayTotalActivePowerAbnormal; + /** + * 电气化铁路监测点谐波电压含有率不合理 + */ + @ApiModelProperty(name = "railwayHarmonicVoltageContentAbnormal", value = "电气化铁路监测点谐波电压含有率不合理") + private Integer railwayHarmonicVoltageContentAbnormal; + /** + * 频繁上传暂态事件 + */ + @ApiModelProperty(name = "freqUploadEvent", value = "频繁上传暂态事件") + private Integer freqUploadEvent; + /** + * 录波文件未正确上传 + */ + @ApiModelProperty(name = "waveUploadError", value = "录波文件未正确上传") + private Integer waveUploadError; + /** + * 暂态事件持续时间不合理 + */ + @ApiModelProperty(name = "eventLastTimeAbnormal", value = "暂态事件持续时间不合理") + private Integer eventLastTimeAbnormal; + /** + * 暂态事件类型与特征幅值不一致 + */ + @ApiModelProperty(name = "eventTypeAmplitudeAtypism", value = "暂态事件类型与特征幅值不一致") + private Integer eventTypeAmplitudeAtypism; + /** + * 暂态事件特征幅值不合理 + */ + @ApiModelProperty(name = "eventTypeAmplitudeAbnormal", value = "暂态事件特征幅值不合理") + private Integer eventTypeAmplitudeAbnormal; + /** + * 暂态事件相别为“未知”或“NONE” + */ + @ApiModelProperty(name = "eventPhaseNone", value = "暂态事件相别为“未知”或“NONE”") + private Integer eventPhaseNone; + /** + * 运行电压偏高（非实际电压暂升事件） + */ + @ApiModelProperty(name = "runVolatgeUp", value = "运行电压偏高（非实际电压暂升事件）") + private Integer runVolatgeUp; + /** + * 运行电压偏低（非实际电压暂降事件） + */ + @ApiModelProperty(name = "runVolatgeLow", value = "运行电压偏低（非实际电压暂降事件）") + private Integer runVolatgeLow; + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @ApiModelProperty(name = "dataType", value = "数据类型,字典表（01：主网测点 02：配网测点）") + private String dataType; + +} + diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTargetDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTargetDetailVO.java new file mode 100644 index 000000000..ba7665d08 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTargetDetailVO.java @@ -0,0 +1,62 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类 + * + * @author yzh + * @since 2022-11-08 09:03:35 + */ +@Data +@ApiModel("获取主网数据质量-稳态指标类数据质量问题查询返回前端实体类") +public class RStatTargetDetailVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate", value = "时间") + private Date dataDate; + /** + * 核查规则 + */ + @ApiModelProperty(name = "checkRules", value = "核查规则") + private String checkRules; + /** + * 变电站名称 + */ + @ApiModelProperty(name = "powerName",value = "变电站名称") + private String powerName; + /** + * 地市公司 + */ + @ApiModelProperty(name = "cityCompany",value = "地市公司") + private String cityCompany; + /** + * 监测点ID + */ + @ApiModelProperty(name = "monitorId", value = "监测点ID") + private String monitorId; + /** + * 监测点ID + */ + @ApiModelProperty(name = "monitorName", value = "监测点名称") + private String monitorName; + /** + * 监测点电压等级 + */ + @ApiModelProperty(name = "monitorVoltageLevel", value = "监测点电压等级") + private String monitorVoltageLevel; + /** + * 指标类型（稳态、暂态指标数据质量问题） + */ + @ApiModelProperty(name = "targetType", value = "指标类型（稳态、暂态指标数据质量问题）") + private String targetType; +} + diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTractionStationAccountDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTractionStationAccountDetailVO.java new file mode 100644 index 000000000..1a338d695 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatTractionStationAccountDetailVO.java @@ -0,0 +1,70 @@ +package com.njcn.device.pms.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 牵引站台账数据质量问题-核查详情(RStatTractionStationAccountDetail)实体类 + * + * @author yzh + * @since 2022-11-09 09:42:42 + */ +@Data +@ApiModel("牵引站台账数据质量问题-核查详情返回前端实体类") +public class RStatTractionStationAccountDetailVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 时间 + */ + @ApiModelProperty(name = "dataDate",value = "时间") + private Date dataDate; + + /** + * 核查规则 + */ + @ApiModelProperty(name = "checkRules",value = "核查规则") + private String checkRules; + + /** + * 所属变电站名称 + */ + @ApiModelProperty(name = "powerName", value = "所属变电站名称") + private String powerName; + + /** + * 牵引站ID + */ + @ApiModelProperty(name = "substationId",value = "牵引站ID") + private String substationId; + + /** + * 牵引站名称 + */ + @ApiModelProperty(name = "substationName",value = "牵引站名称") + private String substationName; + + /** + * 供电电压等级 + */ + @ApiModelProperty(name = "powerVoltageLevel",value = "供电电压等级") + private String powerVoltageLevel; + + /** + * 电铁线路名称 + */ + @ApiModelProperty(name = "electricRailwayLineName",value = "电铁线路名称") + private String electricRailwayLineName; + + /** + * 铁路类型 + */ + @ApiModelProperty(name = "typeOfRailway",value = "铁路类型") + private String typeOfRailway; + +} + 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 +}