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 +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DeptLineController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DeptLineController.java new file mode 100644 index 000000000..db2812194 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DeptLineController.java @@ -0,0 +1,121 @@ +package com.njcn.device.pms.controller; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.common.utils.LogUtil; +import com.njcn.device.pms.service.DeptLineService; +import com.njcn.web.controller.BaseController; +import com.njcn.web.pojo.param.DeptLineParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * @author denghuajun + * @date 2022/1/12 16:33 + * 部门监测点相关 + */ +@Validated +@Slf4j +@Api(tags = "部门监测点相关") +@RestController +@RequestMapping("/deptLine") +@RequiredArgsConstructor +public class DeptLineController extends BaseController { + + private final DeptLineService deptLineService; + + /** + * 部门绑定监测点 + * + * @param deptLineParam 部门监测点 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) + @PostMapping("/deptBindLine") + @ApiOperation("部门绑定监测点") + @ApiImplicitParam(name = "deptLineParam", value = "部门绑定监测点", required = true) + public HttpResult deptBindLine(@RequestBody @Validated DeptLineParam deptLineParam) { + String methodDescribe = getMethodDescribe("deptBindLine"); + LogUtil.njcnDebug(log, "{}，部门监测点数据为：{}", methodDescribe, deptLineParam); + deptLineService.deptBindLine(deptLineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + + /** + * 部门解除绑定监测点 + * + * @param deptLineParam 部门监测点 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE) + @PostMapping("/deptDeleteBindLine") + @ApiOperation("部门解除绑定监测点") + @ApiImplicitParam(name = "deptLineParam", value = "部门绑定监测点", required = true) + public HttpResult deptDeleteBindLine(@RequestBody @Validated DeptLineParam deptLineParam) { + String methodDescribe = getMethodDescribe("deptDeleteBindLine"); + LogUtil.njcnDebug(log, "{}，部门监测点数据为：{}", methodDescribe, deptLineParam); + deptLineService.deptDeleteBindLine(deptLineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + + /** + * 根据部门ids集合查询是否绑定监测点 + * + * @param ids 部门id + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/selectDeptBindLines") + @ApiOperation("查询是否绑定监测点") + @ApiImplicitParam(name = "ids", value = "部门id", required = true) + public HttpResult selectDeptBindLines(@RequestParam("ids") List ids) { + String methodDescribe = getMethodDescribe("selectDeptBindLines"); + deptLineService.selectDeptBindLines(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + + /** + * 根据部门id解除绑定监测点 + * + * @param id 部门id + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE) + @PostMapping("/removeBind") + @ApiOperation("部门解除绑定监测点") + @ApiImplicitParam(name = "id", value = "部门id", required = true) + public HttpResult removeBind(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("removeBind"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptLineService.removeBind(id), methodDescribe); + } + + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/getLineByDeptId") + @ApiOperation("部门Id获取绑定监测点") + @ApiImplicitParam(name = "id", value = "部门id", required = true) + public HttpResult> getLineByDeptId(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("getLineByDeptId"); + List list = deptLineService.getLineByDeptId(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + @PostMapping("/getLineByDeptRelation") + @ApiOperation("获取部门和监测点的关系（分稳态暂态）") + @ApiImplicitParam(name = "devDataType", value = "数据类型（0：暂态系统；1：稳态系统；）", required = true) + public HttpResult> > getLineByDeptRelation(@RequestParam("devDataType") Integer devDataType) { + String methodDescribe = getMethodDescribe("getLineByDeptRelation"); + Map> map= deptLineService.getLineByDeptRelation(devDataType); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe); + } + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DistributionMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DistributionMonitorController.java deleted file mode 100644 index 85f74c5c0..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DistributionMonitorController.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.njcn.device.pms.controller; - - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; -import com.njcn.device.pms.pojo.param.DistributionMonitorParam; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import com.njcn.web.controller.BaseController; - -import java.util.List; - -/** - *

- * 配网监测点台账 - *

- * - * @author hongawen - * @since 2022-10-14 - */ -@RestController -@RequestMapping("/pms/distributionMonitor") -@Slf4j -@RequiredArgsConstructor -@Api(tags = "台账-配网监测点") -public class DistributionMonitorController extends BaseController { - - /** - * 新增配网监测点表 - * @author cdf - * @date 2022/10/26 - */ - @PostMapping - @ApiImplicitParam(name = "distributionMonitorParam",value = "配网监测点实体",required = true) - public HttpResult addDistributionMonitor(@RequestBody DistributionMonitorParam distributionMonitorParam){ - String methodDescribe = getMethodDescribe("addDistributionMonitor"); - - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - - - - -} - diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityCheckController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityCheckController.java new file mode 100644 index 000000000..c096b78fb --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityCheckController.java @@ -0,0 +1,76 @@ +package com.njcn.device.pms.controller.distribution; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO; +import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; +import com.njcn.device.pms.service.distribution.PwDataQualityCheckService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 配网数据质量-数据质量核查 + * + * @author yzh + * @date 2022/11/2 + */ +@RestController +@RequestMapping("/pwDataQualityCheck") +@Api(tags = "配网数据质量-数据质量核查") +@RequiredArgsConstructor +public class PwDataQualityCheckController extends BaseController { + + private final PwDataQualityCheckService pwDataQualityCheckService; + + /** + * 获取配网数据质量-台帐类数据质量核查 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/2 + */ + @PostMapping("/getPwQualityCheckOfAccountData") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取配网数据质量-台帐类数据质量核查") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getPwQualityCheckOfAccountData(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getPwQualityCheckOfAccountData"); + List list = pwDataQualityCheckService.getPwQualityCheckOfAccountData(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取主网数据质量-监测指标数据质量核查 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/2 + */ + @PostMapping("/getPwMonitoringIndexDataQualityVerification") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取配网数据质量-监测指标数据质量核查") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getPwMonitoringIndexDataQualityVerification(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getPwMonitoringIndexDataQualityVerification"); + List list = pwDataQualityCheckService.getPwMonitoringIndexDataQualityVerification(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityDetailsController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityDetailsController.java new file mode 100644 index 000000000..100b25df4 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityDetailsController.java @@ -0,0 +1,73 @@ +package com.njcn.device.pms.controller.distribution; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.vo.PwRStatMeasurementAccountDetailVO; +import com.njcn.device.pms.pojo.vo.PwRStatTargetDetailVO; +import com.njcn.device.pms.service.distribution.PwDataQualityDetailsService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * TODO 配网数据质量-数据质量核查详情 + * + * @author yzh + * @date 2022/11/4 + */ +@RestController +@RequestMapping("/pwDataQualityDetails") +@Api(tags = "配网数据质量-数据质量核查详情") +@RequiredArgsConstructor +public class PwDataQualityDetailsController extends BaseController { + + private final PwDataQualityDetailsService pwDataQualityDetailsService; + + /** + * 获取配网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/4 + */ + @PostMapping("/getPwQualityProblemsOfMonitoringPointAccountData") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取配网数据质量-台账类数据指标核查详情-监测点台账数据质量问题") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getPwQualityProblemsOfMonitoringPointAccountData(@RequestBody DataQualityDetailsParam param) { + String methodDescribe = getMethodDescribe("getPwQualityProblemsOfMonitoringPointAccountData"); + List list = pwDataQualityDetailsService.getPwQualityProblemsOfMonitoringPointAccountData(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取配网数据质量-稳态指标类数据质量问题查询 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/8 + */ + @PostMapping("/getPwRStatTargetDetail") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取配网数据质量-稳态指标类数据质量问题查询") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getPwRStatTargetDetail(@RequestBody DataQualityDetailsParam param) { + String methodDescribe = getMethodDescribe("getPwRStatTargetDetail"); + List list = pwDataQualityDetailsService.getPwRStatTargetDetail(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityStatController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityStatController.java new file mode 100644 index 000000000..7bfd2076c --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwDataQualityStatController.java @@ -0,0 +1,93 @@ +package com.njcn.device.pms.controller.distribution; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingVO; +import com.njcn.device.pms.pojo.vo.PwRQualityParameterVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterPollVO; +import com.njcn.device.pms.service.distribution.PwDataQualityStatService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 配网数据质量-数据质量统计 + * + * @author yzh + * @date 2022/11/4 + */ + +@RestController +@RequestMapping("/pwDataQualityStat") +@Api(tags = "配网数据质量-数据质量统计") +@RequiredArgsConstructor +public class PwDataQualityStatController extends BaseController { + + private final PwDataQualityStatService pwDataQualityStatService; + + /** + * 获取配网数据质量-台账数据质量统计 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/4 + */ + @PostMapping("/getPwLedgerDataQualityStat") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取配网数据质量-台账数据质量统计") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getPwLedgerDataQualityStat(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getPwLedgerDataQualityStat"); + List list = pwDataQualityStatService.getPwLedgerDataQualityStat(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取配网数据质量-监测指标数据质量统计 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/4 + */ + @PostMapping("/getPwMonitoringIndexDataQualityStat") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取配网数据质量-监测指标数据质量统计") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getPwMonitoringIndexDataQualityStat(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getPwMonitoringIndexDataQualityStat"); + List list = pwDataQualityStatService.getPwMonitoringIndexDataQualityStat(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取配网数据质量-监测指标数据质量问题汇总统计 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/7 + */ + @PostMapping("/getPwSummaryStatOfMonitoringIndexDataQualityProblems") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取配网数据质量-监测指标数据质量问题汇总统计") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getPwSummaryStatOfMonitoringIndexDataQualityProblems(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getPwSummaryStatOfMonitoringIndexDataQualityProblems"); + List list = pwDataQualityStatService.getPwSummaryStatOfMonitoringIndexDataQualityProblems(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PwMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwMonitorController.java similarity index 83% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PwMonitorController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwMonitorController.java index 8c7268271..0a48076bb 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PwMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwMonitorController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.distribution; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.annotation.OperateInfo; @@ -6,21 +6,21 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; +import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; -import com.njcn.device.pms.service.IMonitorService; -import com.njcn.device.pms.service.IPwMonitorService; +import com.njcn.device.pms.pojo.vo.DoubleUserVO; +import com.njcn.device.pms.service.distribution.IPwMonitorService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -59,4 +59,8 @@ public class PwMonitorController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe); } } + + + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRDnOperatingIndexController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRDnOperatingIndexController.java new file mode 100644 index 000000000..c63802bc8 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRDnOperatingIndexController.java @@ -0,0 +1,65 @@ +package com.njcn.device.pms.controller.distribution; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.common.pojo.enums.common.LogEnum; +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.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; +import com.njcn.device.pms.service.distribution.RDnOperatingIndexMService; +import com.njcn.device.pms.service.distribution.RDnOperatingYService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Title ROperatingIndexController + * @Package com.njcn.device.pms.controller.majornetwork + * @Author jianghaifei + * @Date 2022-11-09 16:18 + * @Version V1.0 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/pwROperatingIndex") +@Api(tags = "配网-运行指标统计") +public class PwRDnOperatingIndexController extends BaseController { + + private final RDnOperatingIndexMService rDnOperatingIndexMService; //月 + + private final RDnOperatingYService rDnOperatingYService; //年 + + @PostMapping("/getOperatingList") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("查询运行指标统计(配网)") + public HttpResult> getOperatingList(@RequestBody PwRDnOperatingParam pwRDnOperatingParam) { + String methodDescribe = getMethodDescribe("getOperatingList"); + Integer type = pwRDnOperatingParam.getType(); + if (type == null) { + throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER, "参数日期维度【type】非法"); + } + List list; + + if (BizParamConstant.STAT_BIZ_YEAR.equals(type.toString())) { + //年 + list = rDnOperatingYService.getOperatingList(pwRDnOperatingParam); + } else if (BizParamConstant.STAT_BIZ_MONTH.equals(type.toString())) { + //月 + list = rDnOperatingIndexMService.getOperatingList(pwRDnOperatingParam); + } else { + throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER, "参数日期维度【type】非法"); + } + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRMpMonitorAlarmCountMController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRMpMonitorAlarmCountMController.java new file mode 100644 index 000000000..2383f1aca --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRMpMonitorAlarmCountMController.java @@ -0,0 +1,53 @@ +package com.njcn.device.pms.controller.distribution; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam; +import com.njcn.device.pms.pojo.vo.PwRMpMonitorAlarmCountMVO; +import com.njcn.device.pms.service.distribution.PwRMpMonitorAlarmCountMService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 监测点告警统计 + * @Title RMpMonitorAlarmCountMController + * @Package com.njcn.device.pms.controller + * @Author jianghaifei + * @Date 2022-10-13 08:54 + * @Version V1.0 + */ +@RestController +@Api(tags = "配网-监测点告警统计(月)") +@RequiredArgsConstructor +@RequestMapping("/pwRMpMonitorAlarmCountM") +public class PwRMpMonitorAlarmCountMController extends BaseController { + + private final PwRMpMonitorAlarmCountMService rMpMonitorAlarmCountMService; + + /*** + * 根据条件查询监测点告警统计(月)(配网) + * @author jianghaifei + * @date 2022-11-01 15:21 + * @param rMpMonitorAlarmCountMParam + * @return java.util.List + */ + @PostMapping("/getPwRMpMonitorAlarmCountMList") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("查询监测点告警统计(月)(配网)") + public HttpResult> getPwRMpMonitorAlarmCountMList(@RequestBody RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) { + String methodDescribe = getMethodDescribe("getPwRMpMonitorAlarmCountMList"); + List list = rMpMonitorAlarmCountMService.getPwRMpMonitorAlarmCountMList(rMpMonitorAlarmCountMParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRStatAreaAlarmCountMController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRStatAreaAlarmCountMController.java new file mode 100644 index 000000000..4f3b8d7fb --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/PwRStatAreaAlarmCountMController.java @@ -0,0 +1,46 @@ +package com.njcn.device.pms.controller.distribution; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam; +import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO; +import com.njcn.device.pms.service.distribution.PwRStatAreaAlarmCountMService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Title RStatAreaAlarmCountMController + * @Package com.njcn.device.pms.controller + * @Author jianghaifei + * @Date 2022-10-10 15:13 + * @Version V1.0 + */ + +@RestController +@Api(tags = "配网-区域告警统计(月)") +@RequiredArgsConstructor +@RequestMapping("/pwRStatAreaAlarmCountM") +public class PwRStatAreaAlarmCountMController extends BaseController { + + private final PwRStatAreaAlarmCountMService rStatAreaAlarmCountMService; + + @PostMapping("getPwAllRStatAreaAlarmCountMList") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("查询区域告警统计(月)(配网)") + public HttpResult> getPwAllRStatAreaAlarmCountMList(@RequestBody RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam) { + String methodDescribe = getMethodDescribe("getPwAllRStatAreaAlarmCountMList"); + List list = rStatAreaAlarmCountMService.getPwAllRStatAreaAlarmCountMList(rStatAreaAlarmCountMParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RStatPwAlarmCountWController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RStatPwAlarmCountWController.java new file mode 100644 index 000000000..72cfbf676 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RStatPwAlarmCountWController.java @@ -0,0 +1,64 @@ +package com.njcn.device.pms.controller.distribution; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.param.RStatPwAlarmCountWParam; +import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam; +import com.njcn.device.pms.pojo.vo.RStatPwAlarmCountWVO; +import com.njcn.device.pms.pojo.vo.RStatPwAlarmDetailVO; +import com.njcn.device.pms.service.distribution.RStatPwAlarmCountWService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Title RStatPwAlarmCountWController + * @Package com.njcn.device.pms.controller + * @Author jianghaifei + * @Date 2022-11-02 18:53 + * @Version V1.0 + */ +@RestController +@RequestMapping("/rStatPwAlarmCountW") +@Api(tags = "配网-告警统计(周)") +@RequiredArgsConstructor +public class RStatPwAlarmCountWController extends BaseController { + + private final RStatPwAlarmCountWService rStatPwAlarmCountWService; + + /*** + * + * @author jianghaifei + * @date 2022-11-02 19:01 + * @param rStatPwAlarmCountWParam + * @return com.njcn.common.pojo.response.HttpResult> + */ + @PostMapping("getAllRStatPwAlarmCountList") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("查询告警统计(周)") + public HttpResult> getAllRStatPwAlarmCountList(@RequestBody RStatPwAlarmCountWParam rStatPwAlarmCountWParam) { + String methodDescribe = getMethodDescribe("getAllRStatPwAlarmCountList"); + List list = rStatPwAlarmCountWService.getAllRStatPwAlarmCountList(rStatPwAlarmCountWParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + + @PostMapping("getAlarmDetailList") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("告警明细查看") + public HttpResult> getAlarmDetailList(@RequestBody RStatPwAlarmDetailParam rStatPwAlarmDetailParam) { + String methodDescribe = getMethodDescribe("getAlarmDetailList"); + List list = rStatPwAlarmCountWService.getAlarmDetailList(rStatPwAlarmDetailParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityCheckController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityCheckController.java new file mode 100644 index 000000000..240e133d1 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityCheckController.java @@ -0,0 +1,76 @@ +package com.njcn.device.pms.controller.majornetwork; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO; +import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; +import com.njcn.device.pms.service.majornetwork.DataQualityCheckService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 主网数据质量-数据质量核查 + * + * @author yzh + * @date 2022/11/2 + */ +@RestController +@RequestMapping("/dataQualityCheck") +@Api(tags = "主网数据质量-数据质量核查") +@RequiredArgsConstructor +public class DataQualityCheckController extends BaseController { + + private final DataQualityCheckService dataQualityCheckService; + + /** + * 获取主网数据质量-台帐类数据质量核查 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/2 + */ + @PostMapping("/getQualityCheckOfAccountData") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取主网数据质量-台帐类数据质量核查") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getQualityCheckOfAccountData(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getQualityCheckOfAccountData"); + List list = dataQualityCheckService.getQualityCheckOfAccountData(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取主网数据质量-监测指标数据质量核查 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/2 + */ + @PostMapping("/getMonitoringIndexDataQualityVerification") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取主网数据质量-监测指标数据质量核查") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getMonitoringIndexDataQualityVerification(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getMonitoringIndexDataQualityVerification"); + List list = dataQualityCheckService.getMonitoringIndexDataQualityVerification(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityDetailsController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityDetailsController.java new file mode 100644 index 000000000..4d790ba5f --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityDetailsController.java @@ -0,0 +1,95 @@ +package com.njcn.device.pms.controller.majornetwork; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.api.TractionStationClient; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.param.PmsTractionStationParam; +import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO; +import com.njcn.device.pms.pojo.vo.RStatMeasurementAccountDetailVO; +import com.njcn.device.pms.pojo.vo.RStatTargetDetailVO; +import com.njcn.device.pms.pojo.vo.RStatTractionStationAccountDetailVO; +import com.njcn.device.pms.service.majornetwork.DataQualityDetailsService; +import com.njcn.device.pms.service.majornetwork.ITractionStationService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +/** + * TODO 主网数据质量-数据质量核查详情 + * + * @author yzh + * @date 2022/11/4 + */ +@RestController +@RequestMapping("/dataQualityDetails") +@Api(tags = "主网数据质量-数据质量核查详情") +@RequiredArgsConstructor +public class DataQualityDetailsController extends BaseController { + + private final DataQualityDetailsService dataQualityDetailsService; + + /** + * 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/4 + */ + @PostMapping("/getQualityProblemsOfMonitoringPointAccountData") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getQualityProblemsOfMonitoringPointAccountData(@RequestBody DataQualityDetailsParam param) { + String methodDescribe = getMethodDescribe("getQualityProblemsOfMonitoringPointAccountData"); + List list = dataQualityDetailsService.getQualityProblemsOfMonitoringPointAccountData(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/4 + */ + @PostMapping("/getTractionPlatformAccountDataQualityProblem") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getTractionPlatformAccountDataQualityProblem(@RequestBody DataQualityDetailsParam param) { + String methodDescribe = getMethodDescribe("getTractionPlatformAccountDataQualityProblem"); + List list = dataQualityDetailsService.getTractionPlatformAccountDataQualityProblem(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取主网数据质量-稳态指标类数据质量问题查询 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/8 + */ + @PostMapping("/getRStatTargetDetail") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取主网数据质量-稳态指标类数据质量问题查询") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getRStatTargetDetail(@RequestBody DataQualityDetailsParam param) { + String methodDescribe = getMethodDescribe("getRStatTargetDetail"); + List list = dataQualityDetailsService.getRStatTargetDetail(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityStatController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityStatController.java new file mode 100644 index 000000000..f9e7d57fe --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DataQualityStatController.java @@ -0,0 +1,93 @@ +package com.njcn.device.pms.controller.majornetwork; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.vo.ROperatingIndexVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterPollVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterVO; +import com.njcn.device.pms.service.majornetwork.DataQualityStatService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 主网数据质量-数据质量统计 + * + * @author yzh + * @date 2022/11/1 + */ + +@RestController +@RequestMapping("/dataQualityStat") +@Api(tags = "主网数据质量-数据质量统计") +@RequiredArgsConstructor +public class DataQualityStatController extends BaseController { + + private final DataQualityStatService dataQualityStatService; + + /** + * 获取主网数据质量-台账数据质量统计 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/1 + */ + @PostMapping("/getLedgerDataQualityStat") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取主网数据质量-台账数据质量统计") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getLedgerDataQualityStat(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getLedgerDataQualityStat"); + List list = dataQualityStatService.getLedgerDataQualityStat(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取主网数据质量-监测指标数据质量统计 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/1 + */ + @PostMapping("/getMonitoringIndexDataQualityStat") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取主网数据质量-监测指标数据质量统计") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getMonitoringIndexDataQualityStat(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getMonitoringIndexDataQualityStat"); + List list = dataQualityStatService.getMonitoringIndexDataQualityStat(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 获取主网数据质量-监测指标数据质量问题汇总统计 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/1 + */ + @PostMapping("/getSummaryStatOfMonitoringIndexDataQualityProblems") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取主网数据质量-监测指标数据质量问题汇总统计") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getSummaryStatOfMonitoringIndexDataQualityProblems(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getSummaryStatOfMonitoringIndexDataQualityProblems"); + List list = dataQualityStatService.getSummaryStatOfMonitoringIndexDataQualityProblems(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java new file mode 100644 index 000000000..b01d810cc --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java @@ -0,0 +1,82 @@ +package com.njcn.device.pms.controller.majornetwork; + + +import cn.hutool.core.collection.CollectionUtil; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; +import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; +import com.njcn.device.pms.pojo.param.DistributionMonitorParam; +import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; +import com.njcn.device.pms.pojo.vo.DoubleUserVO; +import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import com.njcn.web.controller.BaseController; + +import java.util.List; + +/** + *

+ * 配网监测点台账 + *

+ * + * @author hongawen + * @since 2022-10-14 + */ +@RestController +@RequestMapping("/pms/distributionMonitor") +@Slf4j +@RequiredArgsConstructor +@Api(tags = "台账-配网监测点") +public class DistributionMonitorController extends BaseController { + + private final IDistributionMonitorService iDistributionMonitorService; + + /** + * 新增配网监测点表 + * @author cdf + * @date 2022/10/26 + */ + @PostMapping + @ApiImplicitParam(name = "distributionMonitorParam",value = "配网监测点实体",required = true) + public HttpResult addDistributionMonitor(@RequestBody DistributionMonitorParam distributionMonitorParam){ + String methodDescribe = getMethodDescribe("addDistributionMonitor"); + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + + + /** + * 获取指定组装下的发电用电用户 + * @author cdf + * @date 2022/11/15 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getDoubleUserByDept") + @ApiOperation("获取指定组装下的发电用电用户") + @ApiImplicitParam(name = "orgId", value = "组装机构编号", required = true) + public HttpResult> getDoubleUserByDept(@RequestParam("orgId")String orgId) { + String methodDescribe = getMethodDescribe("getDoubleUserByDept"); + List infos = iDistributionMonitorService.getDoubleUserByDept(orgId); + if (CollectionUtil.isEmpty(infos)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, infos, methodDescribe); + } + } + + + + +} + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/GeneratrixWireController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/GeneratrixWireController.java similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/GeneratrixWireController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/GeneratrixWireController.java index 941cb8a7a..788cb97c8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/GeneratrixWireController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/GeneratrixWireController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; @@ -8,7 +8,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.param.GeneratrixWireParam; import com.njcn.device.pms.pojo.po.GeneratrixWire; -import com.njcn.device.pms.service.IGeneratrixWireService; +import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; import com.njcn.web.controller.BaseController; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; @@ -55,7 +55,7 @@ public class GeneratrixWireController extends BaseController { @PostMapping("/updateGeneratrixWire") @ApiOperation("修改线路") @ApiImplicitParam(name = "generatrixWireParam", value = "线路实体", required = true) - public HttpResult updateGeneratrixWire(@RequestBody GeneratrixWireParam.UpdateGeneratrixWireParam generatrixWireParam) { + public HttpResult updateGeneratrixWire(@RequestBody GeneratrixWireParam generatrixWireParam) { String methodDescribe = getMethodDescribe("updateGeneratrixWire"); boolean result = iGeneratrixWireService.updateGeneratrixWire(generatrixWireParam); if(result){ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/HarmonicGeneralManagementController.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/HarmonicGeneralManagementController.java index 97feb0056..156a45bc3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/HarmonicGeneralManagementController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/HarmonicGeneralManagementDataController.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementDataController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/HarmonicGeneralManagementDataController.java index 1f2ab32b5..d81341468 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/HarmonicGeneralManagementDataController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/HarmonicGeneralManagementDataController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/MonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/MonitorController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java index 7e8fd15ea..6dbe839b4 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/MonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.annotation.OperateInfo; @@ -9,13 +9,11 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; 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.MonitorParam; import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.device.pms.pojo.vo.PmsMonitorVO; -import com.njcn.device.pms.service.IMonitorService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; import com.njcn.device.pq.pojo.po.Overlimit; import com.njcn.web.controller.BaseController; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneralDeviceController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneralDeviceController.java similarity index 95% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneralDeviceController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneralDeviceController.java index dc7beccad..10fb4b53b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneralDeviceController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneralDeviceController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.annotation.OperateInfo; @@ -9,9 +9,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import com.njcn.device.pms.service.IPmsGeneralDeviceService; -import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; -import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java index 1c7da4d50..166e6b9fc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PmsGeneratrixController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.annotation.OperateInfo; @@ -12,7 +12,7 @@ import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; import com.njcn.device.pms.pojo.param.GeneratrixParam; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.pojo.po.Generatrix; -import com.njcn.device.pms.service.IPmsGeneratrixService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; import com.njcn.web.controller.BaseController; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.*; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerClientController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerClientController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java index e29c2e09b..f419731a8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerClientController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; @@ -9,7 +9,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.param.PowerClientParam; import com.njcn.device.pms.pojo.po.PowerClient; -import com.njcn.device.pms.service.IPowerClientService; +import com.njcn.device.pms.service.majornetwork.IPowerClientService; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerDistributionareaController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerDistributionareaController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java index a5ac06387..aafe3f8b7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerDistributionareaController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,9 +12,7 @@ import com.njcn.common.utils.LogUtil; import com.njcn.device.pms.pojo.param.PowerDistributionareaParam; import com.njcn.device.pms.pojo.po.PowerDistributionarea; import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO; -import com.njcn.device.pms.service.IPowerDistributionareaService; -import com.njcn.system.pojo.param.EventTemplateParam; -import com.njcn.system.pojo.po.EventTemplate; +import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerGenerationUserController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerGenerationUserController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java index 04c1d9345..12594563e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerGenerationUserController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; @@ -9,7 +9,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.param.PowerGenerationUserParam; import com.njcn.device.pms.pojo.po.PowerGenerationUser; -import com.njcn.device.pms.service.IPowerGenerationUserService; +import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerQualityMatterController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerQualityMatterController.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerQualityMatterController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerQualityMatterController.java index dfeb8c1be..f488b1df6 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PowerQualityMatterController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerQualityMatterController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RMpMonitorAlarmCountMController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java similarity index 79% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RMpMonitorAlarmCountMController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java index d5d584d24..91d8d5ab3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RMpMonitorAlarmCountMController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; @@ -6,10 +6,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam; -import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam; import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO; -import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO; -import com.njcn.device.pms.service.RMpMonitorAlarmCountMService; +import com.njcn.device.pms.service.majornetwork.RMpMonitorAlarmCountMService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,9 +35,16 @@ public class RMpMonitorAlarmCountMController extends BaseController { private final RMpMonitorAlarmCountMService rMpMonitorAlarmCountMService; + /*** + * 根据条件查询监测点告警统计(月)(主网) + * @author jianghaifei + * @date 2022-11-01 15:21 + * @param rMpMonitorAlarmCountMParam + * @return com.njcn.common.pojo.response.HttpResult> + */ @PostMapping("/getRMpMonitorAlarmCountMList") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("根据条件查询监测点告警统计(月)") + @ApiOperation("查询监测点告警统计(月)(主网)") public HttpResult> getAllRStatAreaAlarmCountMList(@RequestBody RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) { String methodDescribe = getMethodDescribe("getAllRStatAreaAlarmCountMList"); List list = rMpMonitorAlarmCountMService.getRMpMonitorAlarmCountMList(rMpMonitorAlarmCountMParam); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/ROperatingIndexController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/ROperatingIndexController.java new file mode 100644 index 000000000..ae4dd54df --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/ROperatingIndexController.java @@ -0,0 +1,65 @@ +package com.njcn.device.pms.controller.majornetwork; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.common.pojo.enums.common.LogEnum; +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.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.param.ROperatingIndexParam; +import com.njcn.device.pms.pojo.vo.ROperatingIndexCommonVO; +import com.njcn.device.pms.service.majornetwork.ROperatingIndexMService; +import com.njcn.device.pms.service.majornetwork.ROperatingIndexYService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Title ROperatingIndexController + * @Package com.njcn.device.pms.controller.majornetwork + * @Author jianghaifei + * @Date 2022-11-09 16:18 + * @Version V1.0 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/rOperatingIndex") +@Api(tags = "主网-运行指标统计") +public class ROperatingIndexController extends BaseController { + + private final ROperatingIndexMService rOperatingIndexMService; //月 + + private final ROperatingIndexYService rOperatingIndexYService; //年 + + @PostMapping("/getOperatingList") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("查询运行指标统计(主网)") + public HttpResult> getOperatingList(@RequestBody ROperatingIndexParam rOperatingIndexParam) { + String methodDescribe = getMethodDescribe("getOperatingList"); + Integer type = rOperatingIndexParam.getType(); + if (type == null) { + throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER, "参数日期维度【type】非法"); + } + List list; + + if (BizParamConstant.STAT_BIZ_YEAR.equals(type.toString())) { + //年 + list = rOperatingIndexYService.getOperatingList(rOperatingIndexParam); + } else if (BizParamConstant.STAT_BIZ_MONTH.equals(type.toString())) { + //月 + list = rOperatingIndexMService.getOperatingList(rOperatingIndexParam); + } else { + throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER, "参数日期维度【type】非法"); + } + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatAreaAlarmCountMController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatAreaAlarmCountMController.java similarity index 86% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatAreaAlarmCountMController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatAreaAlarmCountMController.java index 538e56dfd..21bdd8df3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatAreaAlarmCountMController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatAreaAlarmCountMController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; @@ -6,10 +6,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam; -import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam; import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO; -import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO; -import com.njcn.device.pms.service.RStatAreaAlarmCountMService; +import com.njcn.device.pms.service.majornetwork.RStatAreaAlarmCountMService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -39,10 +37,11 @@ public class RStatAreaAlarmCountMController extends BaseController { @PostMapping("getAllRStatAreaAlarmCountMList") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("根据条件查询所有区域告警统计(月)") + @ApiOperation("查询区域告警统计(月)(主网)") public HttpResult> getAllRStatAreaAlarmCountMList(@RequestBody RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam) { String methodDescribe = getMethodDescribe("getAllRStatAreaAlarmCountMList"); List list = rStatAreaAlarmCountMService.getAllRStatAreaAlarmCountMList(rStatAreaAlarmCountMParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatBusbarHarmonicController.java similarity index 91% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatBusbarHarmonicController.java index 3de8f923a..f3281b12f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatBusbarHarmonicController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatBusbarHarmonicController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; @@ -8,7 +8,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.param.UniversalFrontEndParam; import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO; -import com.njcn.device.pms.service.RStatBusbarHarmonicService; +import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -43,7 +43,7 @@ public class RStatBusbarHarmonicController extends BaseController { * @return 变电站母线电压指标年报 */ @PostMapping("/getRStatBusbarHarmonic") - @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("获取变电站母线电压指标年报") @ApiImplicitParam(name = "param", value = "条件参数", required = true) public HttpResult> getRStatBusbarHarmonic(@RequestBody UniversalFrontEndParam param) { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatZwAlarmCountWController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatZwAlarmCountWController.java similarity index 95% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatZwAlarmCountWController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatZwAlarmCountWController.java index 635742de2..db575fe67 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RStatZwAlarmCountWController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RStatZwAlarmCountWController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; @@ -8,7 +8,7 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam; import com.njcn.device.pms.pojo.vo.ProblemMonitorDetailVO; import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO; -import com.njcn.device.pms.service.RStatZwAlarmCountWService; +import com.njcn.device.pms.service.majornetwork.RStatZwAlarmCountWService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RmpEventDetailController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RmpEventDetailController.java similarity index 91% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RmpEventDetailController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RmpEventDetailController.java index 12f0da08f..2cbeb64c0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/RmpEventDetailController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RmpEventDetailController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; @@ -7,7 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.param.UniversalFrontEndParam; import com.njcn.device.pms.pojo.vo.RmpEventDetailVO; -import com.njcn.device.pms.service.RmpEventDetailService; +import com.njcn.device.pms.service.majornetwork.RmpEventDetailService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -42,7 +42,7 @@ public class RmpEventDetailController extends BaseController { * @return 暂态事件明细 */ @PostMapping("/getDetailsOfTransientEvents") - @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("获取区域暂态指标统计") @ApiImplicitParam(name = "param", value = "前端参数", required = true) public HttpResult> getRmpEventDetail(@RequestBody UniversalFrontEndParam param) { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/SourceManagementController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/SourceManagementController.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/SourceManagementController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/SourceManagementController.java index 1e5303294..eae7ea779 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/SourceManagementController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/SourceManagementController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatationStatController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatationStatController.java similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatationStatController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatationStatController.java index 136621df1..09fc556b4 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatationStatController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatationStatController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.annotation.OperateInfo; @@ -11,7 +11,7 @@ import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.StatationStatParam; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; -import com.njcn.device.pms.service.IStatationStatService; +import com.njcn.device.pms.service.majornetwork.IStatationStatService; import com.njcn.web.controller.BaseController; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatisticsRunMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatisticsRunMonitorController.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatisticsRunMonitorController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatisticsRunMonitorController.java index 9a048d0e3..2231c2734 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/StatisticsRunMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatisticsRunMonitorController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalController.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalController.java index f2f61429d..bb2626781 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,10 +10,10 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.device.pms.pojo.param.PmsTerminalParam; -import com.njcn.device.pms.pojo.po.Terminal; +import com.njcn.device.pms.pojo.po.PmsTerminal; import com.njcn.device.pms.pojo.vo.PmsTerminalVO; -import com.njcn.device.pms.service.ITerminalService; -import com.njcn.device.pq.pojo.param.TerminalParam; +import com.njcn.device.pms.service.majornetwork.ITerminalService; +import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -48,11 +48,11 @@ public class TerminalController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("getTerminalList") @ApiOperation("查询监测终端台账所有信息") - @ApiImplicitParam(name = "queryParam",value = "查询监测终端台账信息",required = true) - public HttpResult> getTerminalList(@RequestBody @Validated PmsTerminalParam.QueryParam queryParam){ + @ApiImplicitParam(name = "baseParam",value = "查询监测终端台账信息",required = true) + public HttpResult> getTerminalList(@RequestBody @Validated BaseParam baseParam){ String methodDescribe = getMethodDescribe("getTerminalList"); - LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam); - Page res = iTerminalService.getTerminalList(queryParam); + LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, baseParam); + Page res = iTerminalService.getTerminalList(baseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe); } @@ -60,11 +60,11 @@ public class TerminalController extends BaseController { @GetMapping("/getTerminalById") @ApiOperation("根据ID查询监测终端台账数据") @ApiImplicitParam(name = "id",value = "id",required = true) - public HttpResult getTerminalById(@RequestParam("id") String id){ + public HttpResult getTerminalById(@RequestParam("id") String id){ String methodDescribe = getMethodDescribe("getTerminalById"); - Terminal terminal = iTerminalService.getTerminalById(id); - if (Objects.nonNull(terminal)){ - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, terminal, methodDescribe); + PmsTerminal pmsTerminal = iTerminalService.getTerminalById(id); + if (Objects.nonNull(pmsTerminal)){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pmsTerminal, methodDescribe); } else { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalEliminateDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalEliminateDataController.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalEliminateDataController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalEliminateDataController.java index dbdb9bb4b..5bfc939b1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TerminalEliminateDataController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalEliminateDataController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TractionStationController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TractionStationController.java similarity index 73% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TractionStationController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TractionStationController.java index ce8331386..6d5793333 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TractionStationController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TractionStationController.java @@ -1,15 +1,17 @@ -package com.njcn.device.pms.controller; - +package com.njcn.device.pms.controller.majornetwork; +import cn.hutool.core.collection.CollUtil; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.PmsTractionStationParam; import com.njcn.device.pms.pojo.param.TractionStationParam; import com.njcn.device.pms.pojo.po.TractionStation; -import com.njcn.device.pms.service.ITractionStationService; +import com.njcn.device.pms.service.majornetwork.ITractionStationService; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -26,7 +28,7 @@ import java.util.Objects; /** *

- * 牵引站信息 + * 牵引站信息 *

* * @author hongawen @@ -59,7 +61,7 @@ public class TractionStationController extends BaseController { public HttpResult getTractionStationById(@RequestParam("tractionStationId") String tractionStationId) { String methodDescribe = getMethodDescribe("getTractionStationById"); TractionStation res = iTractionStationService.getTractionStationById(tractionStationId); - if(Objects.nonNull(res)){ + if (Objects.nonNull(res)) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); @@ -68,14 +70,15 @@ public class TractionStationController extends BaseController { /** * 新增牵引站信息 + * * @author hany * @date 2022/10/28 */ @PostMapping("/addTractionStation") - @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType= OperateType.ADD) + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) @ApiOperation("新增牵引站信息") @ApiImplicitParam(name = "tractionStationParam", value = "新增实体", required = true) - public HttpResult add(@RequestBody @Validated TractionStationParam tractionStationParam){ + public HttpResult add(@RequestBody @Validated TractionStationParam tractionStationParam) { String methodDescribe = getMethodDescribe("add"); boolean result = iTractionStationService.add(tractionStationParam); if (result) { @@ -87,14 +90,15 @@ public class TractionStationController extends BaseController { /** * 修改牵引站信息 + * * @author hany * @date 2022/10/28 */ @PostMapping("/updateTractionStation") - @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE) + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE) @ApiOperation("修改牵引站信息") @ApiImplicitParam(name = "updateParam", value = "更新实体", required = true) - public HttpResult update(@RequestBody @Validated TractionStationParam updateParam){ + public HttpResult update(@RequestBody @Validated TractionStationParam updateParam) { String methodDescribe = getMethodDescribe("update"); boolean result = iTractionStationService.update(updateParam); if (result) { @@ -106,6 +110,7 @@ public class TractionStationController extends BaseController { /** * 删除牵引站信息 + * * @param ids id * @author hany * @date 2022/10/28 @@ -114,15 +119,37 @@ public class TractionStationController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE) @ApiOperation("删除牵引站信息") @ApiImplicitParam(name = "ids", value = "ID索引", required = true) - public HttpResult delete(@RequestBody List ids){ + public HttpResult delete(@RequestBody List ids) { String methodDescribe = getMethodDescribe("delete"); boolean result = iTractionStationService.delete(ids); - if(result){ + if (result) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - }else { + } else { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } } + /** + * 获取牵引站详细信息 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/8 + */ + @PostMapping("/getPmsTractionStationInfo") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("获取牵引站详细信息") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getPmsTractionStationInfo(@RequestBody PmsTractionStationParam param) { + String methodDescribe = getMethodDescribe("getPmsTractionStationInfo"); + List result = iTractionStationService.getPmsTractionStationInfo(param); + if (CollUtil.isEmpty(result)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TransientStasticDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TransientStasticDataController.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TransientStasticDataController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TransientStasticDataController.java index 9ab9ab690..6afd1a670 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TransientStasticDataController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TransientStasticDataController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TreatTransientDetailDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TreatTransientDetailDataController.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TreatTransientDetailDataController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TreatTransientDetailDataController.java index 2ab5a6d70..061dffc9d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/TreatTransientDetailDataController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TreatTransientDetailDataController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.majornetwork; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DeptLineMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DeptLineMapper.java new file mode 100644 index 000000000..12d8fa1f0 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DeptLineMapper.java @@ -0,0 +1,69 @@ +package com.njcn.device.pms.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pq.pojo.po.DeptLine; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author denghuajun + * @since 2022-01-12 18:04 + */ +public interface DeptLineMapper extends BaseMapper { + /** + * 换绑监测点 + * @param id 部门id + * @param lineId 监测点id + * @return + */ + int deptChangeBindLine(@Param("id")String id,@Param("lineId")String lineId); + + + /** + * 查询所有绑定的监测点 + */ + List getAllBindLine(); + + /** + * 查询其他绑定的监测点 + * @param deptId + * @return + */ + List getOtherBindLine(@Param("deptId")String deptId); + + /** + * 查询自己绑定的监测点 + * @param deptId + * @return + */ + List getMyselfBindLine(@Param("deptId")String deptId); + + @Select ("SELECT\n" + + "\tpq_dept_line.Id,\n" + + "\tpq_dept_line.Line_Id\n" + + "FROM\n" + + "\tpq_dept_line\n" + + "WHERE\n" + + "\tEXISTS (\n" + + "\t\tSELECT\n" + + "\t\t\t1\n" + + "\t\tFROM\n" + + "\t\t\tpq_device,\n" + + "\t\t\tpq_line\n" + + "\t\tWHERE\n" + + "\t\t\tSUBSTRING_INDEX(\n" + + "\t\t\t\tSUBSTRING_INDEX(pq_line.Pids, ',', 5),\n" + + "\t\t\t\t',',\n" + + "\t\t\t\t- 1\n" + + "\t\t\t) = pq_device.Id\n" + + "\t\tAND pq_line.Id = pq_dept_line.Line_Id and (pq_device.Dev_Data_Type= 2 or pq_device.Dev_Data_Type = #{devDataType})\n" + + "\t)") + List getLineByDeptRelation(@Param("devDataType")Integer devDataType); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TractionStationMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TractionStationMapper.java deleted file mode 100644 index 37b4228a0..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TractionStationMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.device.pms.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pms.pojo.po.TractionStation; - -/** - *

- * Mapper 接口 - *

- * - * @author hongawen - * @since 2022-10-14 - */ -public interface TractionStationMapper extends BaseMapper { - -} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwDataQualityCheckMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwDataQualityCheckMapper.java new file mode 100644 index 000000000..9f24390c4 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwDataQualityCheckMapper.java @@ -0,0 +1,59 @@ +package com.njcn.device.pms.mapper.distribution; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author yzh + * @date 2022/11/8 + */ + +@Mapper +public interface PwDataQualityCheckMapper { + + /** + * 获取配网数据质量-台帐类数据质量核查（年） + * + * @param deptIds 单位id + * @param param 条件参数 + * @param distributionPoint 配网字典id + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getYearInfo(@Param("deptIds") List deptIds, + @Param("param") StatisticsBizBaseParam param, + @Param("distributionPoint") String distributionPoint); + + /** + * 获取配网数据质量-台帐类数据质量核查（季） + * + * @param deptIds 单位id + * @param param 条件参数 + * @param distributionPoint 配网字典id + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getSeasonInfo(@Param("deptIds") List deptIds, + @Param("param") StatisticsBizBaseParam param, + @Param("distributionPoint") String distributionPoint); + + /** + * 获取配网数据质量-台帐类数据质量核查（月） + * + * @param deptIds 单位id + * @param param 条件参数 + * @param distributionPoint 配网字典id + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getMonthInfo(@Param("deptIds") List deptIds, + @Param("param") StatisticsBizBaseParam param, + @Param("distributionPoint") String distributionPoint); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PwMonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwMonitorMapper.java similarity index 93% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PwMonitorMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwMonitorMapper.java index 1972f0142..f0c22b434 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PwMonitorMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwMonitorMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.distribution; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRMpMonitorAlarmCountMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRMpMonitorAlarmCountMMapper.java new file mode 100644 index 000000000..51d4d5aa5 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRMpMonitorAlarmCountMMapper.java @@ -0,0 +1,15 @@ +package com.njcn.device.pms.mapper.distribution; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM; + +/** +* @author jianghf +* @description 针对表【r_mp_monitor_alarm_count_m】的数据库操作Mapper +* @createDate 2022-10-12 20:08:33 +* @Entity com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM +*/ +public interface PwRMpMonitorAlarmCountMMapper extends BaseMapper { + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwROperatingIndexMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwROperatingIndexMapper.java new file mode 100644 index 000000000..6337fa2b0 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwROperatingIndexMapper.java @@ -0,0 +1,55 @@ +package com.njcn.device.pms.mapper.distribution; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 获取配网数据质量-监测指标数据质量统计 + * + * @author yzh + * @date 2022/11/7 + */ + +@Mapper +public interface PwROperatingIndexMapper { + + /** + * 获取配网数据质量-监测指标数据质量统计（年） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/7 + */ + List getYearInfo(@Param(("param")) StatisticsBizBaseParam param, + @Param(("deptIdList")) List deptIdList); + + /** + * 获取配网数据质量-监测指标数据质量统计（季） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/7 + */ + List getSeasonInfo(@Param(("param")) StatisticsBizBaseParam param, + @Param(("deptIdList")) List deptIdList); + + /** + * 获取配网数据质量-监测指标数据质量统计（月） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/7 + */ + List getMonthInfo(@Param(("param")) StatisticsBizBaseParam param, + @Param(("deptIdList")) List deptIdList); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRStatAreaAlarmCountMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRStatAreaAlarmCountMMapper.java new file mode 100644 index 000000000..680e0a3c0 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRStatAreaAlarmCountMMapper.java @@ -0,0 +1,15 @@ +package com.njcn.device.pms.mapper.distribution; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM; + +/** +* @author jianghf +* @description 针对表【r_stat_area_alarm_count_m】的数据库操作Mapper +* @createDate 2022-10-10 14:36:46 +* @Entity com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM +*/ +public interface PwRStatAreaAlarmCountMMapper extends BaseMapper { + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRStatTargetCheckDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRStatTargetCheckDataMapper.java new file mode 100644 index 000000000..102d35f15 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRStatTargetCheckDataMapper.java @@ -0,0 +1,59 @@ +package com.njcn.device.pms.mapper.distribution; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author yzh + * @date 2022/11/8 + */ + +@Mapper +public interface PwRStatTargetCheckDataMapper { + + /** + * 获取配网数据质量-监测指标数据质量核查（年） + * + * @param deptIds 单位id + * @param param 条件参数 + * @param distributionPoint 配网字典id + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getYearInfo(@Param("deptIds") List deptIds, + @Param("param") StatisticsBizBaseParam param, + @Param("distributionPoint") String distributionPoint); + + /** + * 获取配网数据质量-监测指标数据质量核查（季） + * + * @param deptIds 单位id + * @param param 条件参数 + * @param distributionPoint 配网字典id + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getSeasonInfo(@Param("deptIds") List deptIds, + @Param("param") StatisticsBizBaseParam param, + @Param("distributionPoint") String distributionPoint); + + /** + * 获取配网数据质量-监测指标数据质量核查（月） + * + * @param deptIds 单位id + * @param param 条件参数 + * @param distributionPoint 配网字典id + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getMonthInfo(@Param("deptIds") List deptIds, + @Param("param") StatisticsBizBaseParam param, + @Param("distributionPoint") String distributionPoint); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingIndexMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingIndexMMapper.java new file mode 100644 index 000000000..e7c6640aa --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingIndexMMapper.java @@ -0,0 +1,23 @@ +package com.njcn.device.pms.mapper.distribution; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexM; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; + +import java.util.List; +import java.util.Map; + +/** +* @author jianghf +* @description 针对表【r_dn_operating_index_m(配网运行指标统计-月表,配网监测指标数据质量统计-月表 )】的数据库操作Mapper +* @createDate 2022-11-10 10:21:46 +* @Entity com.njcn.device.pms.pojo.po.RDnOperatingIndexM +*/ +public interface RDnOperatingIndexMMapper extends BaseMapper { + + List getOperatingList(Map condMap); +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java new file mode 100644 index 000000000..76c98e203 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java @@ -0,0 +1,23 @@ +package com.njcn.device.pms.mapper.distribution; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; + +import java.util.List; +import java.util.Map; + +/** +* @author jianghf +* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Mapper +* @createDate 2022-11-10 10:21:46 +* @Entity com.njcn.device.pms.pojo.po.RDnOperatingY +*/ +public interface RDnOperatingYMapper extends BaseMapper { + + List getOperatingList(Map condMap); +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpPwAlarmDetailDMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RMpPwAlarmDetailDMapper.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpPwAlarmDetailDMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RMpPwAlarmDetailDMapper.java index e44f0b8ba..ae7146cf7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpPwAlarmDetailDMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RMpPwAlarmDetailDMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.distribution; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RStatPwAlarmCountWMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RStatPwAlarmCountWMapper.java new file mode 100644 index 000000000..9ed4ce9ee --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RStatPwAlarmCountWMapper.java @@ -0,0 +1,23 @@ +package com.njcn.device.pms.mapper.distribution; + +import com.njcn.device.pms.pojo.po.RStatPwAlarmCountW; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.vo.RStatPwAlarmCountWVO; + +import java.util.List; +import java.util.Map; + +/** +* @author jianghf +* @description 针对表【r_stat_pw_alarm_count_w】的数据库操作Mapper +* @createDate 2022-11-02 15:42:29 +* @Entity com.njcn.device.pms.pojo.po.RStatPwAlarmCountW +*/ +public interface RStatPwAlarmCountWMapper extends BaseMapper { + + List getRStatPwAlarmCountVOList(Map condMap); +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwDataQualityCheckMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwDataQualityCheckMapper.xml new file mode 100644 index 000000000..ebd6ac920 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwDataQualityCheckMapper.xml @@ -0,0 +1,69 @@ + + + + + + org_no AS orgNo, + data_date AS dataDate, + dev_field_null AS devFieldNull, + dev_run_time_abnormal AS devRunTimeAbnormal, + dev_type_error AS devTypeError, + dev_check_time_abnormal AS devCheckTimeAbnormal, + dev_ip_error AS devIpError, + measurement_field_null AS measurementFieldNull, + measurement_name_abnormal AS measurementNameAbnormal, + measurement_type_abnormal AS measurementTypeAbnormal, + measurement_capacity_error AS measurementCapacityError, + measurement_dev_not_match AS measurementDevNotMatch, + measurement_type_error AS measurementTypeError, + traction_station_measurement_redundancy AS tractionStationMeasurementRedundancy, + railway_capacity_error AS railwayCapacityError, + traction_station_measurement_missing AS tractionStationMeasurementMissing, + data_type AS dataType + + + org_no IN + + #{item} + + + AND data_type = #{distributionPoint} + + + AND DATE_FORMAT(data_date, '%Y-%m-%d') >= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d') + + + AND DATE_FORMAT(data_date, '%Y-%m-%d') <= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d') + + + + + + + + + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PwMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml similarity index 54% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PwMonitorMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml index f9def7d1f..46409a8b6 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PwMonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml @@ -1,14 +1,18 @@ - + - + + SELECT + z.org_no AS orgNo, + z.data_date AS dataDate, + z.measurement_run_points AS measurementCount, + z.effective_access_measurement_count AS effectiveAccessMeasurementCount, + IFNULL(( + SELECT + a.effective_access_measurement_count + FROM + r_dn_operating_y AS a + WHERE + a.org_no = z.org_no + AND ( + z.data_date >= date( + DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR ))) + AND ( + z.data_date <= date( + DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR ))) + ), + 3.14159 + ) AS effectiveAccessMeasurementCountYearOnYear, + IFNULL(( + SELECT + b.effective_access_measurement_count + FROM + r_dn_operating_y AS b + WHERE + b.org_no = z.org_no + AND ( + z.data_date >= date( + DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR ))) + AND ( + z.data_date <= date( + DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR ))) + ), + 3.14159 + ) AS effectiveAccessMeasurementCountRingRatio, + TRUNCATE ( z.effective_access_measurement_count / z.measurement_run_points, 2 ) AS effectiveAccessRate, + IFNULL(( + SELECT TRUNCATE + ( c.effective_access_measurement_count / c.measurement_run_points, 2 ) + FROM + r_dn_operating_y AS c + WHERE + c.org_no = z.org_no + AND ( + z.data_date >= date( + DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR ))) + AND ( + z.data_date <= date( + DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR ))) + ), + 3.14159 + ) AS effectiveAccessRateYearOnYear, + IFNULL(( + SELECT TRUNCATE + ( d.effective_access_measurement_count / d.measurement_run_points, 2 ) + FROM + r_dn_operating_y AS d + WHERE + d.org_no = z.org_no + AND ( + z.data_date >= date( + DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR ))) + AND ( + z.data_date <= date( + DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR ))) + ), + 3.14159 + ) AS effectiveAccessRateRingRatio, + z.data_integrity_rate AS dataIntegrityRate, + IFNULL(( + SELECT + e.data_integrity_rate + FROM + r_dn_operating_y AS e + WHERE + e.org_no = z.org_no + AND ( + z.data_date >= date( + DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR ))) + AND ( + z.data_date <= date( + DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR ))) + ), + 3.14159 + ) AS dataIntegrityRateYearOnYear, + IFNULL(( + SELECT + f.data_integrity_rate + FROM + r_dn_operating_y AS f + WHERE + f.org_no = z.org_no + AND ( + z.data_date >= date( + DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR ))) + AND ( + z.data_date <= date( + DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR ))) + ), + 3.14159 + ) AS dataIntegrityRateRingRatio, + z.index_integrity_rate AS indexIntegrityRate, + z.is_unusual AS isUnusual + FROM + r_dn_operating_y AS z + WHERE + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRStatAreaAlarmCountMMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRStatAreaAlarmCountMMapper.xml new file mode 100644 index 000000000..7ee8e911b --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRStatAreaAlarmCountMMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + org_no,data_date,data_type, + vdev_alarm_info,vdev_alarm_ratio,freq_alarm_info, + freq_alarm_ratio,unbalance_alarm_info,unbalance_alarm_ratio, + v_alarm_info,v_alarm_ratio,flicker_alarm_info, + flicker_alarm_ratio,sag_alarm_info,sag_alarm_avg_count, + interrupt_alarm_info,interrupt_alarm_avg_count,harmonic_type_grade, + event_type_grade + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRStatTargetCheckDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRStatTargetCheckDataMapper.xml new file mode 100644 index 000000000..5c24009cd --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRStatTargetCheckDataMapper.xml @@ -0,0 +1,77 @@ + + + + + + org_no AS orgNo, + data_date AS dataDate, + fundamental_voltage_abnormal AS fundamentalVoltageAbnormal, + frequency_abnormal AS frequencyAbnormal, + v_dev_abnormal AS vDevAbnormal, + harmonic_voltage_abnormal AS harmonicVoltageAbnormal, + centre_harmonic_voltage AS centreHarmonicVoltage, + tp_voltage_unbalance AS tpVoltageUnbalance, + v_dev_last_overlimit AS vDevLastOverlimit, + traction_station_measurement_none AS tractionStationMeasurementNone, + railway_fundamental_voltage_abnormal AS railwayFundamentalVoltageAbnormal, + railway_fundamental_current_abnormal AS railwayFundamentalCurrentAbnormal, + railway_total_active_power_abnormal AS railwayTotalActivePowerAbnormal, + railway_harmonic_voltage_content_abnormal AS railwayHarmonicVoltageContentAbnormal, + freq_upload_event AS freqUploadEvent, + wave_upload_error AS waveUploadError, + event_last_time_abnormal AS eventLastTimeAbnormal, + event_type_amplitude_atypism AS eventTypeAmplitudeAtypism, + event_type_amplitude_abnormal AS eventTypeAmplitudeAbnormal, + event_phase_none AS eventPhaseNone, + run_volatge_up AS runVolatgeUp, + run_volatge_low AS runVolatgeLow, + data_type AS dataType + + + org_no IN + + #{item} + + + AND data_type = #{distributionPoint} + + + AND DATE_FORMAT(data_date, '%Y-%m-%d') >= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d') + + + AND DATE_FORMAT(data_date, '%Y-%m-%d') <= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d') + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingIndexMMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingIndexMMapper.xml new file mode 100644 index 000000000..aff075b1c --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingIndexMMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + org_no,data_date,measurement_point_type, + measurement_run_points,transit_measurement_points,effective_access_measurement_count, + effective_access_rate,should_count,should_point_coverage, + data_integrity_rate,data_right_rate,index_integrity_rate, + is_unusual + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml new file mode 100644 index 000000000..2d446b568 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + org_no,data_date,measurement_point_type, + measurement_run_points,transit_measurement_points,effective_access_measurement_count, + effective_access_rate,should_count,should_point_coverage, + data_integrity_rate,data_right_rate,index_integrity_rate, + is_unusual + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpPwAlarmDetailDMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RMpPwAlarmDetailDMapper.xml similarity index 91% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpPwAlarmDetailDMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RMpPwAlarmDetailDMapper.xml index ecbf73b96..4957ed236 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RMpPwAlarmDetailDMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RMpPwAlarmDetailDMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RStatPwAlarmCountWMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RStatPwAlarmCountWMapper.xml new file mode 100644 index 000000000..0a134c154 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RStatPwAlarmCountWMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + org_no,data_date,online_monitor_count, + alarm_monitor_count + + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DistributionMonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/DistributionMonitorMapper.java similarity index 72% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DistributionMonitorMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/DistributionMonitorMapper.java index e6d53fd4c..aea0a912b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/DistributionMonitorMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/DistributionMonitorMapper.java @@ -1,9 +1,10 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.po.DistributionMonitor; +import com.njcn.device.pms.pojo.vo.DoubleUserVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,5 +26,12 @@ public interface DistributionMonitorMapper extends BaseMapper getIdByOrgId(@Param("orgIds")List orgIds, @Param("pmsDeviceInfoParam") PmsDeviceInfoParam pmsDeviceInfoParam); + /** + * 获取指定部门下的用电发电用户 + * @author cdf + * @date 2022/11/15 + */ + List getDoubleUserByDept(@Param("orgId")String orgId); + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/GeneratrixWireMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/GeneratrixWireMapper.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/GeneratrixWireMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/GeneratrixWireMapper.java index 0422b92c4..5caef3d92 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/GeneratrixWireMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/GeneratrixWireMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.GeneratrixWire; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/HarmonicGeneralManagementDataMapper.java similarity index 86% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementDataMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/HarmonicGeneralManagementDataMapper.java index 6f3f10cc4..7159ee153 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementDataMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/HarmonicGeneralManagementDataMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/HarmonicGeneralManagementMapper.java similarity index 86% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/HarmonicGeneralManagementMapper.java index 1c31cb120..67ca7e1ba 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/HarmonicGeneralManagementMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/HarmonicGeneralManagementMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.HarmonicGeneralManagement; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/MonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/MonitorMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java index 608c6fcbb..ca3fe804b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/MonitorMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.common.pojo.dto.SimpleDTO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/OverlimitMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/OverlimitMapper.java similarity index 83% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/OverlimitMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/OverlimitMapper.java index eb3ebdbd6..f4b07066c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/OverlimitMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/OverlimitMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java similarity index 95% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java index 790e3cc0a..4cd84c4d0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PmsGeneratrixMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerClientMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java similarity index 84% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerClientMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java index 511b59ae2..f13158e21 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerClientMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.PowerClient; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerDistributionareaMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerDistributionareaMapper.java similarity index 93% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerDistributionareaMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerDistributionareaMapper.java index e16032153..630ad1bd9 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerDistributionareaMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerDistributionareaMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerGenerationUserMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerGenerationUserMapper.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerGenerationUserMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerGenerationUserMapper.java index 72a856bce..4eff14a14 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerGenerationUserMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerGenerationUserMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.PowerGenerationUser; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerQualityMatterMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerQualityMatterMapper.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerQualityMatterMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerQualityMatterMapper.java index af3564b95..095349fb8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PowerQualityMatterMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerQualityMatterMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.PowerQualityMatter; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpMonitorAlarmCountMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RMpMonitorAlarmCountMMapper.java similarity index 89% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpMonitorAlarmCountMMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RMpMonitorAlarmCountMMapper.java index 81dc73a37..419f2cd02 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpMonitorAlarmCountMMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RMpMonitorAlarmCountMMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpTargetWarnDMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RMpTargetWarnDMapper.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpTargetWarnDMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RMpTargetWarnDMapper.java index f5d3c4948..59d5863de 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RMpTargetWarnDMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RMpTargetWarnDMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.RMpTargetWarnD; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexMMapper.java new file mode 100644 index 000000000..46d01059a --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexMMapper.java @@ -0,0 +1,18 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.device.pms.pojo.po.ROperatingIndexM; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author jianghf +* @description 针对表【r_operating_index_m(主网运行指标统计-月表,主网监测指标数据质量统计-月表 )】的数据库操作Mapper +* @createDate 2022-11-09 19:56:01 +* @Entity com.njcn.device.pms.pojo.po.ROperatingIndexM +*/ +public interface ROperatingIndexMMapper extends BaseMapper { + +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexMapper.java new file mode 100644 index 000000000..6089fc02f --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexMapper.java @@ -0,0 +1,54 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.ROperatingIndexVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 主网数据质量-监测指标数据质量统计 + * + * @author yzh + * @date 2022/11/2 + */ +@Mapper +public interface ROperatingIndexMapper { + + /** + * 获取主网数据质量-监测指标数据质量统计（年） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getYearInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); + + /** + * 获取主网数据质量-监测指标数据质量统计（季） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getSeasonInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); + + /** + * 获取主网数据质量-监测指标数据质量统计（月） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getMonthInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexYMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexYMapper.java new file mode 100644 index 000000000..a3e90cdc5 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/ROperatingIndexYMapper.java @@ -0,0 +1,18 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.device.pms.pojo.po.ROperatingIndexY; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author jianghf +* @description 针对表【r_operating_index_y(主网运行指标统计-年表,主网监测指标数据质量统计-年表 )】的数据库操作Mapper +* @createDate 2022-11-09 19:56:01 +* @Entity com.njcn.device.pms.pojo.po.ROperatingIndexY +*/ +public interface ROperatingIndexYMapper extends BaseMapper { + +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RQualityParameterMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RQualityParameterMapper.java new file mode 100644 index 000000000..2ee003689 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RQualityParameterMapper.java @@ -0,0 +1,33 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.po.RQualityParameterPO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 主网数据质量-台账数据质量统计 + * + * @author yzh + * @date 2022/11/1 + */ +@Mapper +public interface RQualityParameterMapper { + + /** + * 获取主网数据质量-台账数据质量统计 + * + * @param param 条件参数 + * @param deptIdList 单位id + * @param dataType 主网测点 + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getLedgerDataQualityStat(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList, + @Param("dataType") String dataType); + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAccountCheckDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAccountCheckDataMapper.java new file mode 100644 index 000000000..7f80918e4 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAccountCheckDataMapper.java @@ -0,0 +1,54 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 主网数据质量-台帐类数据质量核查 + * + * @author yzh + * @date 2022/11/2 + */ + +@Mapper +public interface RStatAccountCheckDataMapper { + /** + * 获取主网数据质量-台帐类数据质量核查（年） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getYearInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); + + /** + * 获取主网数据质量-台帐类数据质量核查（季） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getSeasonInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); + + /** + * 获取主网数据质量-台帐类数据质量核查（月） + * + * @param param 单位id + * @param deptIdList 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getMonthInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatAreaAlarmCountMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAreaAlarmCountMMapper.java similarity index 89% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatAreaAlarmCountMMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAreaAlarmCountMMapper.java index 0f62abe07..c799a375a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatAreaAlarmCountMMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAreaAlarmCountMMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatBusbarHarmonicMapper.java similarity index 95% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatBusbarHarmonicMapper.java index 4accaf9a3..3113bfa93 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatBusbarHarmonicMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatBusbarHarmonicMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatEventOrgMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatEventOrgMapper.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatEventOrgMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatEventOrgMapper.java index 4c63c32d1..29370ec0b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatEventOrgMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatEventOrgMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.njcn.device.pms.pojo.po.RStatEventOrgPO; import com.njcn.device.pms.pojo.vo.RStatEventOrgVO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatMeasurementAccountDetailMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatMeasurementAccountDetailMapper.java new file mode 100644 index 000000000..256c45caf --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatMeasurementAccountDetailMapper.java @@ -0,0 +1,30 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.po.RStatMeasurementAccountDetailPO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author yzh + * @date 2022/11/7 + */ + +@Mapper +public interface RStatMeasurementAccountDetailMapper { + + /** + * 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + * + * + * @param monitorIdList + * @param param 前端参数 + * @return java.util.List + * @author yzh + * @date 2022/11/7 + */ + List getQualityProblemsOfMonitoringPointAccountData(@Param("monitorIdList") List monitorIdList, + @Param("param") DataQualityDetailsParam param); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatOrgMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatOrgMapper.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatOrgMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatOrgMapper.java index 3d1aed2a7..c988c2216 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatOrgMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatOrgMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.vo.RStatOrgVO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatSubstationMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatSubstationMapper.java similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatSubstationMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatSubstationMapper.java index 595736189..c7f3168c5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatSubstationMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatSubstationMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.njcn.device.pms.pojo.po.PmsMonitorPO; import com.njcn.device.pms.pojo.vo.RStatSubstationVO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetCheckDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetCheckDataMapper.java new file mode 100644 index 000000000..2bb66b516 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetCheckDataMapper.java @@ -0,0 +1,54 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 主网数据质量-监测指标数据质量核查 + * + * @author yzh + * @date 2022/11/2 + */ +@Mapper +public interface RStatTargetCheckDataMapper { + + /** + * 获取主网数据质量-台帐类数据质量核查（年） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getYearInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); + + /** + * 获取主网数据质量-台帐类数据质量核查（季） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getSeasonInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); + + /** + * 获取主网数据质量-台帐类数据质量核查（月） + * + * @param param 条件参数 + * @param deptIdList 单位id + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getMonthInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetDetailMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetDetailMapper.java new file mode 100644 index 000000000..3f40218e0 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetDetailMapper.java @@ -0,0 +1,31 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.po.RStatTargetDetailPO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 获取主网数据质量-稳态指标类数据质量问题查询 + * + * @author yzh + * @date 2022/11/9 + */ + +@Mapper +public interface RStatTargetDetailMapper { + + /** + * 获取主网数据质量-稳态指标类数据质量问题查询 + * + * @param param 前端条件 + * @param monitorIds 监测点id + * @return java.util.List + * @author yzh + * @date 2022/11/9 + */ + List getRStatTargetDetail(@Param("param") DataQualityDetailsParam param, + @Param("monitorIds") List monitorIds); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTractionStationAccountDetailMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTractionStationAccountDetailMapper.java new file mode 100644 index 000000000..e4e3a88b8 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTractionStationAccountDetailMapper.java @@ -0,0 +1,31 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.po.RStatTractionStationAccountDetailPO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题 + * + * @author yzh + * @date 2022/11/9 + */ + +@Mapper +public interface RStatTractionStationAccountDetailMapper { + + /** + * 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题 + * + * @param param 条件参数 + * @param substationIds 牵引站id + * @return java.util.List + * @author yzh + * @date 2022/11/9 + */ + List getTractionPlatformAccountDataQualityProblem(@Param("param") DataQualityDetailsParam param, + @Param("substationIds") List substationIds); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatZwAlarmCountWMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatZwAlarmCountWMapper.java similarity index 94% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatZwAlarmCountWMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatZwAlarmCountWMapper.java index ef00b3fef..748d2e8f6 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RStatZwAlarmCountWMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatZwAlarmCountWMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RmpEventDetailMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RmpEventDetailMapper.java similarity index 86% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RmpEventDetailMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RmpEventDetailMapper.java index e556c3a67..41faf52ef 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/RmpEventDetailMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RmpEventDetailMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.vo.RmpEventDetailVO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/SourceManagementMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SourceManagementMapper.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/SourceManagementMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SourceManagementMapper.java index 678f190ba..0ea5198ba 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/SourceManagementMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SourceManagementMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatationStatMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java similarity index 94% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatationStatMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java index 19dabb8b2..2e7363457 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatationStatMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatisticsRunMonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatisticsRunMonitorMapper.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatisticsRunMonitorMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatisticsRunMonitorMapper.java index 9a2c2fc45..b48dffa9d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/StatisticsRunMonitorMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatisticsRunMonitorMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.StatisticsRunMonitor; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalEliminateDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalEliminateDataMapper.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalEliminateDataMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalEliminateDataMapper.java index 1a8dde5a8..d0b2167f5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalEliminateDataMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalEliminateDataMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.TerminalEliminateData; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalMapper.java similarity index 75% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalMapper.java index 1058a4f0a..dc74d6286 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TerminalMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TerminalMapper.java @@ -1,9 +1,9 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pms.pojo.po.Terminal; +import com.njcn.device.pms.pojo.po.PmsTerminal; import com.njcn.device.pms.pojo.vo.PmsTerminalVO; import org.apache.ibatis.annotations.Param; @@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Param; * @author hongawen * @since 2022-10-14 */ -public interface TerminalMapper extends BaseMapper { +public interface TerminalMapper extends BaseMapper { Page page(@Param("page")Page page, @Param("ew") QueryWrapper queryWrapper); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TractionStationMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TractionStationMapper.java new file mode 100644 index 000000000..0322569c7 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TractionStationMapper.java @@ -0,0 +1,30 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.PmsTractionStationParam; +import com.njcn.device.pms.pojo.po.TractionStation; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author hongawen + * @since 2022-10-14 + */ +public interface TractionStationMapper extends BaseMapper { + + /** + * 获取牵引站详细信息 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getPmsTractionStationInfo(@Param("param") PmsTractionStationParam param); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TransientStasticDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TransientStasticDataMapper.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TransientStasticDataMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TransientStasticDataMapper.java index b4b922d53..4bcf95121 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TransientStasticDataMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TransientStasticDataMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.TransientStasticData; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TreatTransientDetailDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TreatTransientDetailDataMapper.java similarity index 86% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TreatTransientDetailDataMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TreatTransientDetailDataMapper.java index 3d72157c0..0ca0401ea 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/TreatTransientDetailDataMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/TreatTransientDetailDataMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.mapper; +package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pms.pojo.po.TreatTransientDetailData; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DistributionMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml similarity index 65% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DistributionMonitorMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml index 85a416763..a4f765dcb 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DistributionMonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml @@ -1,9 +1,9 @@ - + - SELECT t.Operation_Id operationId,t.Power_Station_Id powerrId,t.Line_Id lineId,t.id monitorId FROM @@ -31,4 +31,25 @@ ) t INNER JOIN pms_distribution_monitor b ON t.id = b.Monitor_Id + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/HarmonicGeneralManagementDataMapper.xml similarity index 61% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementDataMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/HarmonicGeneralManagementDataMapper.xml index cdde9fbff..a5e8e906f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementDataMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/HarmonicGeneralManagementDataMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/HarmonicGeneralManagementMapper.xml similarity index 62% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/HarmonicGeneralManagementMapper.xml index 10584f1df..c7ad53411 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/HarmonicGeneralManagementMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/HarmonicGeneralManagementMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/MonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/MonitorMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml index 207f77971..e28e3f331 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/MonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerClientMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml similarity index 66% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerClientMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml index 370322afa..9522b734a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerClientMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerDistributionareaMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml similarity index 81% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerDistributionareaMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml index 0e9dbf6c0..808a8f7fc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PowerDistributionareaMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml @@ -1,6 +1,6 @@ - + + SELECT + + FROM + r_operating_index_y + WHERE + + + + + + + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/ROperatingIndexYMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/ROperatingIndexYMapper.xml new file mode 100644 index 000000000..6813c124d --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/ROperatingIndexYMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + org_no,data_date,measurement_run_points, + transit_measurement_points,effective_access_measurement_count,online_measurement_points, + online_measurement_count,should_count,should_point_coverage, + data_integrity_rate,data_right_rate,index_integrity_rate, + is_unusual + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RQualityParameterMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RQualityParameterMapper.xml new file mode 100644 index 000000000..3144eeb24 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RQualityParameterMapper.xml @@ -0,0 +1,47 @@ + + + + + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml new file mode 100644 index 000000000..4f7578c92 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml @@ -0,0 +1,67 @@ + + + + + + org_no AS orgNO, + data_date AS dataDate, + dev_field_null AS devFieldNull, + dev_run_time_abnormal AS devRunTimeAbnormal, + dev_type_error AS devTypeError, + dev_check_time_abnormal AS devCheckTimeAbnormal, + dev_ip_error AS devIpError, + measurement_field_null AS measurementFieldNull, + measurement_limit_abnormal AS measurementLimitAbnormal, + measurement_name_abnormal AS measurementNameAbnormal, + measurement_type_abnormal AS measurementTypeAbnormal, + measurement_capacity_error AS measurementCapacityError, + measurement_dev_not_match AS measurementDevNotMatch, + measurement_type_error AS measurementTypeError, + traction_station_measurement_missing AS tractionStationMeasurementMissing, + traction_station_measurement_redundancy AS tractionStationMeasurementRedundancy, + railway_capacity_error AS railwayCapacityError, + traction_station_field_null AS tractionStationFieldNull, + traction_station_capacity_error AS tractionStationCapacityError, + traction_station_Info_redundancy AS tractionStationInfoRedundancy, + data_type AS dataType + + + org_no IN + + #{item} + + + AND DATE_FORMAT(data_date, '%Y-%m-%d') >= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d') + + + AND DATE_FORMAT(data_date, '%Y-%m-%d') <= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d') + + + + + + + + + + + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatAreaAlarmCountMMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAreaAlarmCountMMapper.xml similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatAreaAlarmCountMMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAreaAlarmCountMMapper.xml index e6353dd24..c544d786d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatAreaAlarmCountMMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAreaAlarmCountMMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatBusbarHarmonicMapper.xml similarity index 94% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatBusbarHarmonicMapper.xml index df00f0865..3a8b2f5d9 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatBusbarHarmonicMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatBusbarHarmonicMapper.xml @@ -1,6 +1,6 @@ - + + SELECT + data_date AS dataDate, + check_rules AS checkRules, + measurement_point_id AS measurementPointId + FROM + r_stat_measurement_account_detail + WHERE + measurement_point_id IN + + #{item} + + + AND check_rules IN + + #{item} + + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatOrgMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatOrgMapper.xml similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatOrgMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatOrgMapper.xml index ccc4b0aad..b1fe28c03 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatOrgMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatOrgMapper.xml @@ -1,6 +1,6 @@ - + org_no IN diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatSubstationMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatSubstationMapper.xml similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatSubstationMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatSubstationMapper.xml index 7efaef6fa..8bd8f24d8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatSubstationMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatSubstationMapper.xml @@ -1,6 +1,6 @@ - + + SELECT + + FROM + r_stat_target_check_data_Y + WHERE + + + + + + + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetDetailMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetDetailMapper.xml new file mode 100644 index 000000000..0adc749b9 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetDetailMapper.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTractionStationAccountDetailMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTractionStationAccountDetailMapper.xml new file mode 100644 index 000000000..61590a79e --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTractionStationAccountDetailMapper.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatZwAlarmCountWMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatZwAlarmCountWMapper.xml similarity index 95% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatZwAlarmCountWMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatZwAlarmCountWMapper.xml index ebe4d382a..ecb1fa641 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RStatZwAlarmCountWMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatZwAlarmCountWMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RmpEventDetailMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RmpEventDetailMapper.xml similarity index 59% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RmpEventDetailMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RmpEventDetailMapper.xml index 9a12ffff9..ddea53344 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/RmpEventDetailMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RmpEventDetailMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/SourceManagementMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SourceManagementMapper.xml similarity index 65% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/SourceManagementMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SourceManagementMapper.xml index 606c70ab5..754fccae5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/SourceManagementMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SourceManagementMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatationStatMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml similarity index 95% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatationStatMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml index dd40bb65a..17ab14787 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/StatationStatMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml @@ -1,6 +1,6 @@ - + SELECT pms_terminal.* diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TractionStationMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TractionStationMapper.xml new file mode 100644 index 000000000..5254d6437 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TractionStationMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TransientStasticDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TransientStasticDataMapper.xml similarity index 64% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TransientStasticDataMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TransientStasticDataMapper.xml index 6fbbd6e8e..92fe82e49 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TransientStasticDataMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TransientStasticDataMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TreatTransientDetailDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TreatTransientDetailDataMapper.xml similarity index 63% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TreatTransientDetailDataMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TreatTransientDetailDataMapper.xml index 6c3c4ccac..b698b7be5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TreatTransientDetailDataMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/TreatTransientDetailDataMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DeptLineMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DeptLineMapper.xml new file mode 100644 index 000000000..25f2e3093 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/DeptLineMapper.xml @@ -0,0 +1,20 @@ + + + + + + update pq_dept_line set id = #{id} where Line_Id = #{lineId} + + + + + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TractionStationMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TractionStationMapper.xml deleted file mode 100644 index e839ffba2..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/TractionStationMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/DeptLineService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/DeptLineService.java new file mode 100644 index 000000000..fc0f1e1dd --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/DeptLineService.java @@ -0,0 +1,64 @@ +package com.njcn.device.pms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pq.pojo.po.DeptLine; +import com.njcn.web.pojo.param.DeptLineParam; + +import java.util.List; +import java.util.Map; + +/** + * @author denghuajun + * @date 2022/1/12 17:30 + * + */ +public interface DeptLineService extends IService { + + /** + * 部门绑定监测点 + * @param deptLineParam 部门监测点的实体类 + * @return 绑定结果 + */ + void deptBindLine(DeptLineParam deptLineParam); + + + /** + * 部门解绑监测点 + * @param deptLineParam 部门监测点的实体类 + * @return 解绑结果 + */ + void deptDeleteBindLine(DeptLineParam deptLineParam); + + + /** + * 根据部门ids集合查询是否绑定监测点 + * @param ids 部门ids + * @return 查询结果 + */ + List selectDeptBindLines(List ids); + + /** + * 部门解除绑定监测点 + * @param id 部门id + * @return 解绑结果 + */ + int removeBind(String id); + + /** + * 功能描述: 根据部门id获取绑定的监测点 + * + * @param id + * @return java.util.List + * @author xy + * @date 2022/1/25 9:28 + */ + List getLineByDeptId(String id); + /** + * @Description: 获取部门和监测点的关系（分稳态暂态） + * @Param: [devDataType] + * @return: java.util.Map> + * @Author: clam + * @Date: 2022/10/19 + */ + Map> getLineByDeptRelation(Integer devDataType); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPwMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/IPwMonitorService.java similarity index 90% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPwMonitorService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/IPwMonitorService.java index 748d3ec7d..a2bd27854 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPwMonitorService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/IPwMonitorService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.distribution; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityCheckService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityCheckService.java new file mode 100644 index 000000000..28c91ba49 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityCheckService.java @@ -0,0 +1,37 @@ +package com.njcn.device.pms.service.distribution; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO; +import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; + +import java.util.List; + +/** + * 配网数据质量-数据质量核查 + * + * @author yzh + * @date 2022/11/8 + */ + +public interface PwDataQualityCheckService { + + /** + * 获取配网数据质量-台帐类数据质量核查 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getPwQualityCheckOfAccountData(StatisticsBizBaseParam param); + + /** + * 获取配网数据质量-监测指标数据质量核查 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getPwMonitoringIndexDataQualityVerification(StatisticsBizBaseParam param); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityDetailsService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityDetailsService.java new file mode 100644 index 000000000..d847f4f19 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityDetailsService.java @@ -0,0 +1,35 @@ +package com.njcn.device.pms.service.distribution; + +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.vo.PwRStatMeasurementAccountDetailVO; +import com.njcn.device.pms.pojo.vo.PwRStatTargetDetailVO; + +import java.util.List; + +/** + * @author yzh + * @date 2022/11/8 + */ + +public interface PwDataQualityDetailsService { + + /** + * 获取配网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getPwQualityProblemsOfMonitoringPointAccountData(DataQualityDetailsParam param); + + /** + * 获取配网数据质量-稳态指标类数据质量问题查询 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getPwRStatTargetDetail(DataQualityDetailsParam param); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityStatService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityStatService.java new file mode 100644 index 000000000..d91923737 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwDataQualityStatService.java @@ -0,0 +1,48 @@ +package com.njcn.device.pms.service.distribution; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingVO; +import com.njcn.device.pms.pojo.vo.PwRQualityParameterVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterPollVO; + +import java.util.List; + +/** + * 配网数据质量-数据质量统计 + * + * @author yzh + * @date 2022/11/4 + */ + +public interface PwDataQualityStatService { + + /** + * 获取配网数据质量-台账数据质量统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/4 + */ + List getPwLedgerDataQualityStat(StatisticsBizBaseParam param); + + /** + * 获取配网数据质量-监测指标数据质量统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/4 + */ + List getPwMonitoringIndexDataQualityStat(StatisticsBizBaseParam param); + + /** + * 获取配网数据质量-监测指标数据质量问题汇总统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/7 + */ + List getPwSummaryStatOfMonitoringIndexDataQualityProblems(StatisticsBizBaseParam param); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwRMpMonitorAlarmCountMService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwRMpMonitorAlarmCountMService.java new file mode 100644 index 000000000..3b1352947 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwRMpMonitorAlarmCountMService.java @@ -0,0 +1,25 @@ +package com.njcn.device.pms.service.distribution; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam; +import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM; +import com.njcn.device.pms.pojo.vo.PwRMpMonitorAlarmCountMVO; + +import java.util.List; + +/** +* @author jianghf +* @description 针对表【r_mp_monitor_alarm_count_m】的数据库操作Service +* @createDate 2022-10-12 20:08:33 +*/ +public interface PwRMpMonitorAlarmCountMService extends IService { + + /*** + * 根据条件查询监测点告警统计(月)(配网) + * @author jianghaifei + * @date 2022-11-01 15:21 + * @param rMpMonitorAlarmCountMParam + * @return java.util.List + */ + List getPwRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwRStatAreaAlarmCountMService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwRStatAreaAlarmCountMService.java new file mode 100644 index 000000000..b82d74ede --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/PwRStatAreaAlarmCountMService.java @@ -0,0 +1,25 @@ +package com.njcn.device.pms.service.distribution; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam; +import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM; +import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO; + +import java.util.List; + +/** +* @author jianghf +* @description 针对表【r_stat_area_alarm_count_m】的数据库操作Service +* @createDate 2022-10-10 14:36:46 +*/ +public interface PwRStatAreaAlarmCountMService extends IService { + + /*** + * 根据条件查询所有区域告警统计(月)(配网) + * @author jianghaifei + * @date 2022-11-1 14:33 + * @param rStatAreaAlarmCountMParam + * @return java.util.List + */ + List getPwAllRStatAreaAlarmCountMList(RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingIndexMService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingIndexMService.java new file mode 100644 index 000000000..f1fdb4f8b --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingIndexMService.java @@ -0,0 +1,18 @@ +package com.njcn.device.pms.service.distribution; + +import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexM; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; + +import java.util.List; + +/** +* @author jianghf +* @description 针对表【r_dn_operating_index_m(配网运行指标统计-月表,配网监测指标数据质量统计-月表 )】的数据库操作Service +* @createDate 2022-11-10 10:21:46 +*/ +public interface RDnOperatingIndexMService extends IService { + + List getOperatingList(PwRDnOperatingParam pwRDnOperatingParam); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java new file mode 100644 index 000000000..dedb2fc4e --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java @@ -0,0 +1,18 @@ +package com.njcn.device.pms.service.distribution; + +import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; +import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; + +import java.util.List; + +/** +* @author jianghf +* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service +* @createDate 2022-11-10 10:21:46 +*/ +public interface RDnOperatingYService extends IService { + + List getOperatingList(PwRDnOperatingParam pwRDnOperatingParam); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpPwAlarmDetailDService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RMpPwAlarmDetailDService.java similarity index 87% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpPwAlarmDetailDService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RMpPwAlarmDetailDService.java index 0f82dcb0c..cd50fe63f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpPwAlarmDetailDService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RMpPwAlarmDetailDService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.distribution; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RStatPwAlarmCountWService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RStatPwAlarmCountWService.java new file mode 100644 index 000000000..386714cc7 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RStatPwAlarmCountWService.java @@ -0,0 +1,22 @@ +package com.njcn.device.pms.service.distribution; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.param.RStatPwAlarmCountWParam; +import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam; +import com.njcn.device.pms.pojo.po.RStatPwAlarmCountW; +import com.njcn.device.pms.pojo.vo.RStatPwAlarmCountWVO; +import com.njcn.device.pms.pojo.vo.RStatPwAlarmDetailVO; + +import java.util.List; + +/** +* @author jianghf +* @description 针对表【r_stat_pw_alarm_count_w】的数据库操作Service +* @createDate 2022-11-02 15:42:29 +*/ +public interface RStatPwAlarmCountWService extends IService { + + List getAllRStatPwAlarmCountList(RStatPwAlarmCountWParam rStatPwAlarmCountWParam); + + List getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/IPwMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java similarity index 94% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/IPwMonitorServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java index 54c6a52db..bd5f708b2 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/IPwMonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java @@ -1,12 +1,11 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.distribution.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import com.njcn.device.pms.mapper.PwMonitorMapper; -import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; +import com.njcn.device.pms.mapper.distribution.PwMonitorMapper; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; -import com.njcn.device.pms.service.IPwMonitorService; +import com.njcn.device.pms.service.distribution.IPwMonitorService; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; import lombok.RequiredArgsConstructor; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityCheckServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityCheckServiceImpl.java new file mode 100644 index 000000000..e5d261621 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityCheckServiceImpl.java @@ -0,0 +1,162 @@ +package com.njcn.device.pms.service.distribution.impl; + +import cn.hutool.core.collection.CollUtil; +import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.mapper.distribution.PwDataQualityCheckMapper; +import com.njcn.device.pms.mapper.distribution.PwRStatTargetCheckDataMapper; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; +import com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO; +import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; +import com.njcn.device.pms.service.distribution.PwDataQualityCheckService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 配网数据质量-数据质量核查 + * + * @author yzh + * @date 2022/11/8 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class PwDataQualityCheckServiceImpl implements PwDataQualityCheckService { + + private final IPmsGeneralDeviceService iPmsGeneralDeviceService; + + private final DicDataFeignClient dicDataFeignClient; + + private final PwDataQualityCheckMapper pwDataQualityCheckMapper; + + private final PwRStatTargetCheckDataMapper pwRStatTargetCheckDataMapper; + + /** + * 获取配网数据质量-台帐类数据质量核查 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + @Override + public List getPwQualityCheckOfAccountData(StatisticsBizBaseParam param) { + // 获取单位的子单位id + List data = getDeptIds(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 取出单位id + List deptIds = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 获取配网字典信息 + String distributionPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData().getId(); + // 创建集合封装返回数据 + List result = new ArrayList<>(); + // 获取配网数据质量-台帐类数据质量核查 + switch (param.getType()) { + // 年 + case 1: + result = pwDataQualityCheckMapper.getYearInfo(deptIds, param, distributionPoint); + break; + // 季 + case 2: + result = pwDataQualityCheckMapper.getSeasonInfo(deptIds, param, distributionPoint); + break; + // 月 + case 3: + result = pwDataQualityCheckMapper.getMonthInfo(deptIds, param, distributionPoint); + break; + default: + break; + } + if (CollUtil.isEmpty(result)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 属性赋值 + return result.stream().peek(vo -> { + vo.setOrgName(dataMap.get(vo.getOrgNo()).getName()); + }).collect(Collectors.toList()); + } + + /** + * 获取配网数据质量-监测指标数据质量核查 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + @Override + public List getPwMonitoringIndexDataQualityVerification(StatisticsBizBaseParam param) { + // 获取单位的子单位id + List data = getDeptIds(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 取出单位id + List deptIds = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 获取配网字典信息 + String distributionPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData().getId(); + // 创建集合封装返回数据 + List result = new ArrayList<>(); + // 获取配网数据质量-监测指标数据质量核查 + switch (param.getType()) { + // 年 + case 1: + result = pwRStatTargetCheckDataMapper.getYearInfo(deptIds, param, distributionPoint); + break; + // 季 + case 2: + result = pwRStatTargetCheckDataMapper.getSeasonInfo(deptIds, param, distributionPoint); + break; + // 月 + case 3: + result = pwRStatTargetCheckDataMapper.getMonthInfo(deptIds, param, distributionPoint); + break; + default: + break; + } + if (CollUtil.isEmpty(result)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 属性赋值 + return result.stream().peek(vo -> { + vo.setOrgName(dataMap.get(vo.getOrgNo()).getName()); + }).collect(Collectors.toList()); + } + + /** + * 将单位信息转为map集合 key: 单位id value: 单位实体 + */ + private Map getDataMap(List data) { + return data + .stream() + .collect(Collectors.toMap(PmsGeneralDeviceDTO::getIndex, PmsGeneralDeviceDTO -> PmsGeneralDeviceDTO)); + } + + /** + * 获取单位的子单位id + */ + private List getDeptIds(StatisticsBizBaseParam param) { + PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); + pmsDeviceInfoParam.setDeptIndex(param.getId()); + pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); + return iPmsGeneralDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityDetailsServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityDetailsServiceImpl.java new file mode 100644 index 000000000..fd1f6bc22 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityDetailsServiceImpl.java @@ -0,0 +1,163 @@ +package com.njcn.device.pms.service.distribution.impl; + +import cn.hutool.core.collection.CollUtil; +import com.njcn.device.pms.mapper.majornetwork.RStatMeasurementAccountDetailMapper; +import com.njcn.device.pms.mapper.majornetwork.RStatTargetDetailMapper; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; +import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; +import com.njcn.device.pms.pojo.po.RStatMeasurementAccountDetailPO; +import com.njcn.device.pms.pojo.po.RStatTargetDetailPO; +import com.njcn.device.pms.pojo.vo.PwRStatMeasurementAccountDetailVO; +import com.njcn.device.pms.pojo.vo.PwRStatTargetDetailVO; +import com.njcn.device.pms.service.distribution.IPwMonitorService; +import com.njcn.device.pms.service.distribution.PwDataQualityDetailsService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.pojo.po.DictData; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author yzh + * @date 2022/11/8 + */ + +@Slf4j +@Service +@RequiredArgsConstructor +public class PwDataQualityDetailsServiceImpl implements PwDataQualityDetailsService { + + private final IPwMonitorService iPwMonitorService; + + private final RStatMeasurementAccountDetailMapper rStatMeasurementAccountDetailMapper; + + private final RStatTargetDetailMapper rStatTargetDetailMapper; + + private final IMonitorService iMonitorService; + + private final DicDataFeignClient dicDataFeignClient; + + /** + * 获取配网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + @Override + public List getPwQualityProblemsOfMonitoringPointAccountData(DataQualityDetailsParam param) { + // 获取配网监测点id + List data = getPwmonitorInfo(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + List pos = + rStatMeasurementAccountDetailMapper + .getQualityProblemsOfMonitoringPointAccountData(data.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()), + param); + if (CollUtil.isEmpty(pos)) { + return Collections.emptyList(); + } + + // 查询二类监测点字典 + DictData twoLine = dicDataFeignClient.getDicDataByCode(DicDataEnum.TWO_LINE.getCode()).getData(); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 属性赋值 + return pos.stream().map(po -> { + PwRStatMeasurementAccountDetailVO vo = new PwRStatMeasurementAccountDetailVO(); + BeanUtils.copyProperties(po, vo); + vo.setMonitorId(po.getMeasurementPointId()); + vo.setOrgName(dataMap.get(vo.getMonitorId()).getOrgName()); + vo.setMonitorName(dataMap.get(vo.getMonitorId()).getMonitorName()); + vo.setMonitorVoltageLevel(dataMap.get(vo.getMonitorId()).getVoltageLevel()); + vo.setPowerName(dataMap.get(vo.getMonitorId()).getPowerName()); + // TODO 线路 + vo.setMediumVoltageLine(dataMap.get(vo.getMonitorId()).getLineName()); + if (dataMap.get(vo.getMonitorId()).getMonitorSort().equals(twoLine.getId())) { + vo.setPlatformAreaName(twoLine.getName()); + } else { + vo.setPlatformAreaName("/"); + } + return vo; + }).collect(Collectors.toList()); + } + + /** + * 获取配网数据质量-稳态指标类数据质量问题查询 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + @Override + public List getPwRStatTargetDetail(DataQualityDetailsParam param) { + // 获取配网监测点id + List data = getPwmonitorInfo(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 取配网数据质量-稳态指标类数据质量问题查询 + List pos = rStatTargetDetailMapper.getRStatTargetDetail(param, data.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList())); + if (CollUtil.isEmpty(pos)) { + return Collections.emptyList(); + } + // 查询二类监测点字典 + DictData twoLine = dicDataFeignClient.getDicDataByCode(DicDataEnum.TWO_LINE.getCode()).getData(); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 属性赋值 + return pos.stream().map(po -> { + PwRStatTargetDetailVO vo = new PwRStatTargetDetailVO(); + BeanUtils.copyProperties(po,vo); + vo.setMonitorId(po.getMeasurementPointId()); + vo.setMonitorName(dataMap.get(vo.getMonitorId()).getMonitorName()); + vo.setMonitorVoltageLevel(dataMap.get(vo.getMonitorId()).getVoltageLevel()); + vo.setPowerName(dataMap.get(vo.getMonitorId()).getPowerName()); + vo.setMediumVoltageLine(dataMap.get(vo.getMonitorId()).getLineName()); + if (dataMap.get(vo.getMonitorId()).getMonitorSort().equals(twoLine.getId())) { + vo.setPlatformAreaName(twoLine.getName()); + } else { + vo.setPlatformAreaName("/"); + } + // TODO 地市公司 + vo.setCityCompany("南京"); + return vo; + }).collect(Collectors.toList()); + } + + /** + * 获取配网监测点id + * + * @param param 条件参数 + * @return List + */ + private List getPwmonitorInfo(DataQualityDetailsParam param) { + PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); + pwPmsMonitorParam.setOrgId(param.getId()); + return iPwMonitorService.getPwMonitorList(pwPmsMonitorParam); + } + + /** + * 将单位信息转为map集合 key: 单位id value: 单位实体 + */ + private Map getDataMap(List data) { + return data + .stream() + .collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, PwPmsMonitorDTO -> PwPmsMonitorDTO)); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityStatServiceImpl.java new file mode 100644 index 000000000..1177ae034 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityStatServiceImpl.java @@ -0,0 +1,199 @@ +package com.njcn.device.pms.service.distribution.impl; + +import cn.hutool.core.collection.CollUtil; +import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; +import com.njcn.device.pms.mapper.distribution.PwROperatingIndexMapper; +import com.njcn.device.pms.mapper.majornetwork.RQualityParameterMapper; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; +import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; +import com.njcn.device.pms.pojo.po.RQualityParameterPO; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingVO; +import com.njcn.device.pms.pojo.vo.PwRQualityParameterVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterPollVO; +import com.njcn.device.pms.service.distribution.PwDataQualityStatService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 配网数据质量-数据质量统计 + * + * @author yzh + * @date 2022/11/4 + */ + +@Service +@Slf4j +@RequiredArgsConstructor +public class PwDataQualityStatServiceImpl implements PwDataQualityStatService { + + private final IPmsGeneralDeviceService iPmsGeneralDeviceService; + + private final DicDataFeignClient dicDataFeignClient; + + private final PwROperatingIndexMapper rOperatingIndexMapper; + + private final RQualityParameterMapper rQualityParameterMapper; + + private final DecimalFormat df = new DecimalFormat("###.00"); + + /** + * 获取配网数据质量-台账数据质量统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/4 + */ + @Override + public List getPwLedgerDataQualityStat(StatisticsBizBaseParam param) { + // 获取单位的子单位信息 + List data = getDeptInfo(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 获取配网字典id + String distributionPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData().getId(); + // 获取单位id + List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 获取配网数据质量-台账数据质量统计 + List pos = rQualityParameterMapper.getLedgerDataQualityStat(param, deptIdList, distributionPoint); + if (CollUtil.isEmpty(pos)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 属性赋值 + return pos.stream().map(po -> { + PwRQualityParameterVO vo = new PwRQualityParameterVO(); + BeanUtils.copyProperties(po, vo); + vo.setOrgName(dataMap.get(vo.getOrgNo()).getName()); + vo.setMeasurementCompleteQuantity(Double.toString( + Integer.parseInt(po.getMeasurementCount()) * Double.parseDouble(po.getMonitoringIntegrityRate()) + )); + return vo; + }).collect(Collectors.toList()); + } + + /** + * 获取配网数据质量-监测指标数据质量统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/4 + */ + @Override + public List getPwMonitoringIndexDataQualityStat(StatisticsBizBaseParam param) { + // 获取单位的子单位信息 + List data = getDeptInfo(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 创建集合封装数据 + List result = new ArrayList<>(); + // 日期条件 + switch (param.getType()) { + // 年 + case 1: + result = rOperatingIndexMapper.getYearInfo(param, + data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList())); + break; + // 季 + case 2: + result = rOperatingIndexMapper.getSeasonInfo(param, + data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList())); + break; + // 月 + case 3: + result = rOperatingIndexMapper.getMonthInfo(param, + data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList())); + break; + default: + break; + } + if (CollUtil.isEmpty(result)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 属性赋值 + return result.stream().peek(vo -> { + vo.setOrgName(dataMap.get(vo.getOrgNo()).getName()); + }).collect(Collectors.toList()); + + } + + /** + * 获取配网数据质量-监测指标数据质量问题汇总统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/7 + */ + @Override + public List getPwSummaryStatOfMonitoringIndexDataQualityProblems(StatisticsBizBaseParam param) { + // 获取单位的子单位信息 + List data = getDeptInfo(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 取出单位id + List deptIds = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 获取配网字典id + String distributionPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData().getId(); + // 获取配网数据质量-监测指标数据质量问题汇总统计 + List pos = rQualityParameterMapper.getLedgerDataQualityStat(param, deptIds, distributionPoint); + if (CollUtil.isEmpty(pos)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + return pos.stream().map(po -> { + RQualityParameterPollVO vo = new RQualityParameterPollVO(); + BeanUtils.copyProperties(po, vo); + vo.setOrgId(po.getOrgNo()); + vo.setOrgName(dataMap.get(vo.getOrgId()).getName()); + vo.setProblemProportion(Double.parseDouble(df.format((po.getProblem() * 1.0) / (po.getEffectiveAccessMeasurementCount() * 1.0))) * 100); + if (po.getProblemYearOnYear() == null) { + vo.setProblemYearOnYear("3.14159"); + } else { + vo.setProblemYearOnYear(po.getProblemYearOnYear()); + } + return vo; + }).collect(Collectors.toList()); + } + + /** + * 获取单位的子单位信息 + */ + private List getDeptInfo(StatisticsBizBaseParam param) { + PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); + pmsDeviceInfoParam.setDeptIndex(param.getId()); + pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); + return iPmsGeneralDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); + } + + /** + * 将单位信息转为map集合 key: 单位id value: 单位实体 + */ + private Map getDataMap(List data) { + return data + .stream() + .collect(Collectors.toMap(PmsGeneralDeviceDTO::getIndex, PmsGeneralDeviceDTO -> PmsGeneralDeviceDTO)); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java new file mode 100644 index 000000000..927abe944 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java @@ -0,0 +1,171 @@ +package com.njcn.device.pms.service.distribution.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.mapper.distribution.PwRMpMonitorAlarmCountMMapper; +import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; +import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; +import com.njcn.device.pms.pojo.param.PmsMonitorParam; +import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; +import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam; +import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM; +import com.njcn.device.pms.pojo.vo.PwRMpMonitorAlarmCountMVO; +import com.njcn.device.pms.service.distribution.PwRMpMonitorAlarmCountMService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.WebUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 监测点告警统计service +* @author jianghf +* @description 针对表【r_mp_monitor_alarm_count_m】的数据库操作Service实现 +* @createDate 2022-10-12 20:08:33 +*/ +@Service +@RequiredArgsConstructor +public class PwRMpMonitorAlarmCountMServiceImpl extends ServiceImpl +implements PwRMpMonitorAlarmCountMService { + + private final DeptFeignClient deptFeignClient; + + private final DicDataFeignClient dicDataFeignClient; + + private final IMonitorService iMonitorService; //【主网监测点】服务类 + + private final IPwMonitorServiceImpl iPwMonitorService; //【配网监测点】服务类 + + /*** + * 根据条件查询监测点告警统计(月)(配网) + * @author jianghaifei + * @date 2022-11-01 15:21 + * @param rMpMonitorAlarmCountMParam + * @return java.util.List + */ + @Override + public List getPwRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) { + //提取查询条件 + String id = rMpMonitorAlarmCountMParam.getId(); //单位id + if (StringUtils.isBlank(id)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); + } + String startTime = rMpMonitorAlarmCountMParam.getStartTime(); //开始时间 + String endTime = rMpMonitorAlarmCountMParam.getEndTime(); //结束时间 +// String monitorObjectType = rMpMonitorAlarmCountMParam.getMonitorObjectType(); //监测点对象类型id +// List voltageLevelParamList = StringUtils.isNotBlank(rMpMonitorAlarmCountMParam.getVoltageLevel()) ? Arrays.asList(rMpMonitorAlarmCountMParam.getVoltageLevel().split(",")) : null; //电压等级 + String monitorName = rMpMonitorAlarmCountMParam.getMeasurementPointName(); //监测点名称 + + //获取所有子部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + if (CollUtil.isEmpty(deptDTOList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); + } + //单位id集合 + List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + + //获取配网id + String dataType = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData().getId(); + //获取监测点类别字典 + List lineSortDict = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_SORT.getCode()).getData(); + Map lineSortIdMap = lineSortDict.stream().collect(Collectors.toMap(DictData::getCode, DictData::getId)); + + //根据条件查询单位下面的所有配网监测点 + PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); + pwPmsMonitorParam.setOrgId(id); //单位id + pwPmsMonitorParam.setMonitorName(monitorName); //监测点名称 + List pwMonitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam); + //监测点id集合 + List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); + if (CollUtil.isEmpty(monitorIdList)) { + return new ArrayList<>(); + } + //监测点map key:监测点id value:监测点实体 + Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); + + //根据监测点idList等条件查询【监测点告警月统计】表数据 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(RMpMonitorAlarmCountM::getMeasurementPointId, monitorIdList) + .ge(RMpMonitorAlarmCountM::getDataDate, startTime) + .le(RMpMonitorAlarmCountM::getDataDate, endTime) + .eq(RMpMonitorAlarmCountM::getDataType, dataType); + List alarmCountMList = this.list(lambdaQueryWrapper); + List resultList; + if (CollUtil.isNotEmpty(alarmCountMList)) { + //封装前端展示的数据 + resultList = alarmCountMList.stream().map(item -> { + PwRMpMonitorAlarmCountMVO pwRMpMonitorAlarmCountMVO = new PwRMpMonitorAlarmCountMVO(); + BeanUtils.copyProperties(item, pwRMpMonitorAlarmCountMVO); + //单位信息 + pwRMpMonitorAlarmCountMVO.setOrgName(deptDTOMap.get(item.getOrgNo()).getName()); //所属单位名称 + //监测点信息 + pwRMpMonitorAlarmCountMVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName());//监测点名称 +// pwRMpMonitorAlarmCountMVO.setMonitorTypeName(monitorTypeMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorType()));//监测点类型名称 + pwRMpMonitorAlarmCountMVO.setMonitorSort(monitorMap.get(item.getMeasurementPointId()).getMonitorSort());//监测点类别id + pwRMpMonitorAlarmCountMVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()); //电压等级id +// pwRMpMonitorAlarmCountMVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel())); //电压等级 + + //监测点类别信息(I类监测点) + if (lineSortIdMap.get(DicDataEnum.ONE_LINE.getCode()).equals(monitorMap.get(item.getMeasurementPointId()).getMonitorSort())) { + //变电站信息 + pwRMpMonitorAlarmCountMVO.setPowerId(monitorMap.get(item.getMeasurementPointId()).getPowerId()); + pwRMpMonitorAlarmCountMVO.setPowerName(monitorMap.get(item.getMeasurementPointId()).getPowerName()); + + pwRMpMonitorAlarmCountMVO.setPowerDistributionAreaId("/"); //台区 + pwRMpMonitorAlarmCountMVO.setPowerDistributionAreaName("/"); + + pwRMpMonitorAlarmCountMVO.setPowerClientId("/"); //用户 + pwRMpMonitorAlarmCountMVO.setPowerClientName("/"); + } + //监测点类别信息(II类监测点) + if (lineSortIdMap.get(DicDataEnum.TWO_LINE.getCode()).equals(monitorMap.get(item.getMeasurementPointId()).getMonitorSort())) { + //变电站信息 + pwRMpMonitorAlarmCountMVO.setPowerId(monitorMap.get(item.getMeasurementPointId()).getPowerId()); + pwRMpMonitorAlarmCountMVO.setPowerName(monitorMap.get(item.getMeasurementPointId()).getPowerName()); + + //台区 + pwRMpMonitorAlarmCountMVO.setPowerDistributionAreaId(monitorMap.get(item.getMeasurementPointId()).getMonitorId()); + pwRMpMonitorAlarmCountMVO.setPowerDistributionAreaName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); + + pwRMpMonitorAlarmCountMVO.setPowerClientId("/"); //用户 + pwRMpMonitorAlarmCountMVO.setPowerClientName("/"); + } + //监测点类别信息(III类监测点) + if (lineSortIdMap.get(DicDataEnum.THREE_LINE.getCode()).equals(monitorMap.get(item.getMeasurementPointId()).getMonitorSort())) { + //变电站信息 + pwRMpMonitorAlarmCountMVO.setPowerId(monitorMap.get(item.getMeasurementPointId()).getPowerId()); + pwRMpMonitorAlarmCountMVO.setPowerName(monitorMap.get(item.getMeasurementPointId()).getPowerName()); + //台区 + pwRMpMonitorAlarmCountMVO.setPowerDistributionAreaId("/"); + pwRMpMonitorAlarmCountMVO.setPowerDistributionAreaName("/"); + //用户 + pwRMpMonitorAlarmCountMVO.setPowerClientId(monitorMap.get(item.getMeasurementPointId()).getMonitorId()); + pwRMpMonitorAlarmCountMVO.setPowerClientName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); + + } + return pwRMpMonitorAlarmCountMVO; + }).collect(Collectors.toList()); + + } else { + resultList = new ArrayList<>(); + } + return resultList; + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRStatAreaAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRStatAreaAlarmCountMServiceImpl.java new file mode 100644 index 000000000..acc8ee92f --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRStatAreaAlarmCountMServiceImpl.java @@ -0,0 +1,96 @@ +package com.njcn.device.pms.service.distribution.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.mapper.distribution.PwRStatAreaAlarmCountMMapper; +import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam; +import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM; +import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO; +import com.njcn.device.pms.service.distribution.PwRStatAreaAlarmCountMService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.WebUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** +* @author jianghf +* @description 针对表【r_stat_area_alarm_count_m】的数据库操作Service实现 +* @createDate 2022-10-10 14:36:46 +*/ +@Service +@RequiredArgsConstructor +public class PwRStatAreaAlarmCountMServiceImpl extends ServiceImpl +implements PwRStatAreaAlarmCountMService{ + + private final DeptFeignClient deptFeignClient; + + private final DicDataFeignClient dicDataFeignClient; + + /*** + * 根据条件查询所有区域告警统计(月)(配网) + * @author jianghaifei + * @date 2022-11-1 14:33 + * @param rStatAreaAlarmCountMParam + * @return java.util.List + */ + @Override + public List getPwAllRStatAreaAlarmCountMList(RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam) { + //获取查询条件 + String id = rStatAreaAlarmCountMParam.getId(); //单位id + if (StringUtils.isBlank(id)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); + } + String startTime = rStatAreaAlarmCountMParam.getStartTime(); //开始时间 yyyy-MM-dd + String endTime = rStatAreaAlarmCountMParam.getEndTime(); //截止时间 yyyy-MM-dd + //获取所有子部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + if (CollUtil.isEmpty(deptDTOList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); + } + //单位id集合 + List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + //获取配网id + String dataType = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData().getId(); + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + //条件组装: where org_no in (orgNoList) and data_date >= startTime and data_date <= endTime + lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgNoList), RStatAreaAlarmCountM::getOrgNo, orgNoList) + .ge(StringUtils.isNotBlank(startTime), RStatAreaAlarmCountM::getDataDate, startTime) + .le(StringUtils.isNotBlank(endTime), RStatAreaAlarmCountM::getDataDate, endTime) + .eq(RStatAreaAlarmCountM::getDataType, dataType); + + //查询区域告警统计(月)集合 + List records = this.list(lambdaQueryWrapper); + + List resultList; + if (CollUtil.isNotEmpty(records)) { + //填充返回数据 + resultList = records.stream().map(item -> { + RStatAreaAlarmCountMVO rStatAreaAlarmCountMVO = new RStatAreaAlarmCountMVO(); + BeanUtils.copyProperties(item, rStatAreaAlarmCountMVO); + //设置单位名称 + rStatAreaAlarmCountMVO.setOrgName(deptDTOMap.get(rStatAreaAlarmCountMVO.getOrgNo()).getName()); + + return rStatAreaAlarmCountMVO; + }).collect(Collectors.toList()); + } else { + resultList = new ArrayList<>(); + } + return resultList; + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingIndexMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingIndexMServiceImpl.java new file mode 100644 index 000000000..f7888dadb --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingIndexMServiceImpl.java @@ -0,0 +1,85 @@ +package com.njcn.device.pms.service.distribution.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; +import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexM; +import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; +import com.njcn.device.pms.service.distribution.IPwMonitorService; +import com.njcn.device.pms.service.distribution.RDnOperatingIndexMService; +import com.njcn.device.pms.mapper.distribution.RDnOperatingIndexMMapper; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.WebUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** +* @author jianghf +* @description 针对表【r_dn_operating_index_m(配网运行指标统计-月表,配网监测指标数据质量统计-月表 )】的数据库操作Service实现 +* @createDate 2022-11-10 10:21:46 +*/ +@Service +@RequiredArgsConstructor +public class RDnOperatingIndexMServiceImpl extends ServiceImpl + implements RDnOperatingIndexMService{ + + private final DicDataFeignClient dicDataFeignClient; + + private final DeptFeignClient deptFeignClient; + + @Override + public List getOperatingList(PwRDnOperatingParam pwRDnOperatingParam) { + //提取参数 + String id = pwRDnOperatingParam.getId(); //单位id + String startTime = pwRDnOperatingParam.getStartTime(); //开始时间 + String endTime = pwRDnOperatingParam.getEndTime(); //结束时间 + + //获取所有子部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + if (CollUtil.isEmpty(deptDTOList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); + } + //单位id集合 + List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + + //获取监测点类别字典id + String monitorSortOne = dicDataFeignClient.getDicDataByCode(DicDataEnum.ONE_LINE.getCode()).getData().getId(); // I类 + String monitorSortTwo = dicDataFeignClient.getDicDataByCode(DicDataEnum.TWO_LINE.getCode()).getData().getId(); // II类 + String monitorSortThree = dicDataFeignClient.getDicDataByCode(DicDataEnum.THREE_LINE.getCode()).getData().getId(); // III类 + + HashMap condMap = new HashMap<>(); + condMap.put("orgIdList", orgNoList); + condMap.put("startTime", startTime); + condMap.put("endTime", endTime); + condMap.put("monitorSortOne", monitorSortOne); + condMap.put("monitorSortTwo", monitorSortTwo); + condMap.put("monitorSortThree", monitorSortThree); + List list = this.baseMapper.getOperatingList(condMap); + list = list.stream().peek(item -> { + item.setOrgName(deptDTOMap.get(item.getOrgNo()).getName()); //单位名称 + }).collect(Collectors.toList()); + return list; + } +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java new file mode 100644 index 000000000..6ef79bef4 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java @@ -0,0 +1,78 @@ +package com.njcn.device.pms.service.distribution.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; +import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; +import com.njcn.device.pms.service.distribution.RDnOperatingYService; +import com.njcn.device.pms.mapper.distribution.RDnOperatingYMapper; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.WebUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** +* @author jianghf +* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service实现 +* @createDate 2022-11-10 10:21:46 +*/ +@Service +@RequiredArgsConstructor +public class RDnOperatingYServiceImpl extends ServiceImpl + implements RDnOperatingYService{ + + private final DicDataFeignClient dicDataFeignClient; + + private final DeptFeignClient deptFeignClient; + + @Override + public List getOperatingList(PwRDnOperatingParam pwRDnOperatingParam) { + //提取参数 + String id = pwRDnOperatingParam.getId(); //单位id + String startTime = pwRDnOperatingParam.getStartTime(); //开始时间 + String endTime = pwRDnOperatingParam.getEndTime(); //结束时间 + + //获取所有子部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + if (CollUtil.isEmpty(deptDTOList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); + } + //单位id集合 + List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + + //获取监测点类别字典id + String monitorSortOne = dicDataFeignClient.getDicDataByCode(DicDataEnum.ONE_LINE.getCode()).getData().getId(); // I类 + String monitorSortTwo = dicDataFeignClient.getDicDataByCode(DicDataEnum.TWO_LINE.getCode()).getData().getId(); // II类 + String monitorSortThree = dicDataFeignClient.getDicDataByCode(DicDataEnum.THREE_LINE.getCode()).getData().getId(); // III类 + + HashMap condMap = new HashMap<>(); + condMap.put("orgIdList", orgNoList); + condMap.put("startTime", startTime); + condMap.put("endTime", endTime); + condMap.put("monitorSortOne", monitorSortOne); + condMap.put("monitorSortTwo", monitorSortTwo); + condMap.put("monitorSortThree", monitorSortThree); + List list = this.baseMapper.getOperatingList(condMap); + list = list.stream().peek(item -> { + item.setOrgName(deptDTOMap.get(item.getOrgNo()).getName()); //单位名称 + }).collect(Collectors.toList()); + return list; + } +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpPwAlarmDetailDServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java similarity index 70% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpPwAlarmDetailDServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java index 6340287c6..05758b981 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpPwAlarmDetailDServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java @@ -1,9 +1,9 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.distribution.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pms.mapper.RMpPwAlarmDetailDMapper; +import com.njcn.device.pms.mapper.distribution.RMpPwAlarmDetailDMapper; import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD; -import com.njcn.device.pms.service.RMpPwAlarmDetailDService; +import com.njcn.device.pms.service.distribution.RMpPwAlarmDetailDService; import org.springframework.stereotype.Service; /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RStatPwAlarmCountWServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RStatPwAlarmCountWServiceImpl.java new file mode 100644 index 000000000..8d43a9d99 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RStatPwAlarmCountWServiceImpl.java @@ -0,0 +1,225 @@ +package com.njcn.device.pms.service.distribution.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.mapper.distribution.RStatPwAlarmCountWMapper; +import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; +import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; +import com.njcn.device.pms.pojo.param.PmsMonitorParam; +import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; +import com.njcn.device.pms.pojo.param.RStatPwAlarmCountWParam; +import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam; +import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD; +import com.njcn.device.pms.pojo.po.RStatPwAlarmCountW; +import com.njcn.device.pms.pojo.vo.RStatPwAlarmCountWVO; +import com.njcn.device.pms.pojo.vo.RStatPwAlarmDetailVO; +import com.njcn.device.pms.service.distribution.IPwMonitorService; +import com.njcn.device.pms.service.distribution.RMpPwAlarmDetailDService; +import com.njcn.device.pms.service.distribution.RStatPwAlarmCountWService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.WebUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** +* @author jianghf +* @description 针对表【r_stat_pw_alarm_count_w】的数据库操作Service实现 +* @createDate 2022-11-02 15:42:29 +*/ +@Service +@RequiredArgsConstructor +public class RStatPwAlarmCountWServiceImpl extends ServiceImpl + implements RStatPwAlarmCountWService { + + private final DeptFeignClient deptFeignClient; + + private final DicDataFeignClient dicDataFeignClient; + + private final IPwMonitorService iPwMonitorService; + + private final IMonitorService iMonitorService; + + private final RMpPwAlarmDetailDService rMpPwAlarmDetailDService; + + /*** + * 查询各单位告警监测点总数、占比、占比同比信息 + * @author jianghaifei + * @date 2022-11-03 09:06 + * @param rStatPwAlarmCountWParam + * @return java.util.List + */ + @Override + public List getAllRStatPwAlarmCountList(RStatPwAlarmCountWParam rStatPwAlarmCountWParam) { + //提取查询条件 + String id = rStatPwAlarmCountWParam.getId(); //单位id + if (StringUtils.isBlank(id)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); + } + String startTime = rStatPwAlarmCountWParam.getStartTime(); //开始时间 + String endTime = rStatPwAlarmCountWParam.getEndTime(); //结束时间 + + //获取所有子部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + if (CollUtil.isEmpty(deptDTOList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); + } + //单位id集合 + List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map deptNameMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, DeptDTO::getName)); + + //设置数据库查询条件 + Map condMap = new HashMap<>(); + condMap.put("orgIdList", orgNoList); + condMap.put("startTime", startTime); + condMap.put("endTime", endTime); + List list = this.baseMapper.getRStatPwAlarmCountVOList(condMap); + + //封装返回结果 + List resultList = list.stream().map(item -> { + item.setOrgName(deptNameMap.get(item.getOrgNo())); + return item; + }).collect(Collectors.toList()); + return resultList; + } + + /*** + * 告警明细查看 + * @author jianghaifei + * @date 2022-11-03 13:56 + * @param rStatPwAlarmDetailParam + * @return java.util.List + */ + @Override + public List getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam) { + //提取查询条件 + String id = rStatPwAlarmDetailParam.getId(); //单位id + if (StringUtils.isBlank(id)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); + } + String startTime = rStatPwAlarmDetailParam.getStartTime(); //开始时间 + String endTime = rStatPwAlarmDetailParam.getEndTime(); //结束时间 + String monitorName = rStatPwAlarmDetailParam.getMonitorName(); //监测点名称 + //告警类型 + List alarmTypeList = StringUtils.isNotBlank(rStatPwAlarmDetailParam.getAlarmType()) ? Arrays.asList(rStatPwAlarmDetailParam.getAlarmType().split(",")) : null; + //监测点类型 + List monitorSortList = StringUtils.isNotBlank(rStatPwAlarmDetailParam.getMonitorSort()) ? Arrays.asList(rStatPwAlarmDetailParam.getMonitorSort().split(",")) : null; + + //获取监测点类别字典 + List lineSortDict = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_SORT.getCode()).getData(); + Map lineSortIdMap = lineSortDict.stream().collect(Collectors.toMap(DictData::getCode, DictData::getId)); + + //获取所有子部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + if (CollUtil.isEmpty(deptDTOList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); + } + //单位id集合 + List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + + //monitor表自身信息(后面I类监测点设置信息要用到) + PmsMonitorParam pmsMonitorParam = new PmsMonitorParam(); + pmsMonitorParam.setOrgIds(orgNoList); + pmsMonitorParam.setMonitorName(monitorName); + List mainMonitorList = iMonitorService.getMonitorInfoListByCond(pmsMonitorParam); + Map mainMonitorMap = mainMonitorList.stream().collect(Collectors.toMap(PmsMonitorDTO::getId, monitor -> monitor)); + + //根据条件查询单位下面的所有配网监测点 + PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); + pwPmsMonitorParam.setOrgId(id); //单位id + pwPmsMonitorParam.setMonitorName(monitorName); //监测点名称 + pwPmsMonitorParam.setMonitorSort(monitorSortList); //监测点类别 + List pwMonitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam); + + //配网监测点id集合 + List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); + if (CollUtil.isEmpty(monitorIdList)) { + return new ArrayList<>(); + } + //监测点map key:监测点id value:监测点实体 + Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); + + //查询监测点的告警明细 + LambdaQueryWrapper alarmDetailWrapper = new LambdaQueryWrapper<>(); + alarmDetailWrapper.in(RMpPwAlarmDetailD::getMeasurementPointId, monitorIdList) + .in(CollUtil.isNotEmpty(alarmTypeList), RMpPwAlarmDetailD::getAlarmType, alarmTypeList) + .ge(StringUtils.isNotBlank(startTime), RMpPwAlarmDetailD::getDataDate, startTime) + .le(StringUtils.isNotBlank(endTime), RMpPwAlarmDetailD::getDataDate, endTime); + List alarmDetailList = rMpPwAlarmDetailDService.list(alarmDetailWrapper); + + List resultList = alarmDetailList.stream().map(item -> { + RStatPwAlarmDetailVO rStatPwAlarmDetailVO = new RStatPwAlarmDetailVO(); + rStatPwAlarmDetailVO.setAlarmType(item.getAlarmType()); //告警类型 + rStatPwAlarmDetailVO.setAlarmInfo(item.getAlarmInfo()); //告警描述 + rStatPwAlarmDetailVO.setDataDate(item.getDataDate()); //告警时间 + + rStatPwAlarmDetailVO.setMeasurementPointId(item.getMeasurementPointId()); //监测点id + rStatPwAlarmDetailVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称 + rStatPwAlarmDetailVO.setOrgId(monitorMap.get(item.getMeasurementPointId()).getOrgId()); //单位id + rStatPwAlarmDetailVO.setOrgName(monitorMap.get(item.getMeasurementPointId()).getOrgName());//单位名称 + rStatPwAlarmDetailVO.setMonitorSort(monitorMap.get(item.getMeasurementPointId()).getMonitorSort());//监测点类别 + rStatPwAlarmDetailVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()); //电压等级 + + //监测点类别信息(I类监测点) + if (lineSortIdMap.get(DicDataEnum.ONE_LINE.getCode()).equals(monitorMap.get(item.getMeasurementPointId()).getMonitorSort())) { + //变电站信息 + rStatPwAlarmDetailVO.setPowerId(monitorMap.get(item.getMeasurementPointId()).getPowerId()); + rStatPwAlarmDetailVO.setPowerName(monitorMap.get(item.getMeasurementPointId()).getPowerName()); + + rStatPwAlarmDetailVO.setPowerDistributionAreaId("/"); //台区 + rStatPwAlarmDetailVO.setPowerDistributionAreaName("/"); + + rStatPwAlarmDetailVO.setPowerClientId("/"); //用户 + rStatPwAlarmDetailVO.setPowerClientName("/"); + } + //监测点类别信息(II类监测点) + if (lineSortIdMap.get(DicDataEnum.TWO_LINE.getCode()).equals(monitorMap.get(item.getMeasurementPointId()).getMonitorSort())) { + //变电站信息 + rStatPwAlarmDetailVO.setPowerId(monitorMap.get(item.getMeasurementPointId()).getPowerId()); + rStatPwAlarmDetailVO.setPowerName(monitorMap.get(item.getMeasurementPointId()).getPowerName()); + //台区 + rStatPwAlarmDetailVO.setPowerDistributionAreaId(monitorMap.get(item.getMeasurementPointId()).getMonitorId()); + rStatPwAlarmDetailVO.setPowerDistributionAreaName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); + //用户 + rStatPwAlarmDetailVO.setPowerClientId("/"); + rStatPwAlarmDetailVO.setPowerClientName("/"); + } + //监测点类别信息(III类监测点) + if (lineSortIdMap.get(DicDataEnum.THREE_LINE.getCode()).equals(monitorMap.get(item.getMeasurementPointId()).getMonitorSort())) { + //变电站信息 + rStatPwAlarmDetailVO.setPowerId(monitorMap.get(item.getMeasurementPointId()).getPowerId()); + rStatPwAlarmDetailVO.setPowerName(monitorMap.get(item.getMeasurementPointId()).getPowerName()); + //台区 + rStatPwAlarmDetailVO.setPowerDistributionAreaId("/"); + rStatPwAlarmDetailVO.setPowerDistributionAreaName("/"); + //用户 + rStatPwAlarmDetailVO.setPowerClientId(monitorMap.get(item.getMeasurementPointId()).getMonitorId()); + rStatPwAlarmDetailVO.setPowerClientName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); + + } + + return rStatPwAlarmDetailVO; + }).collect(Collectors.toList()); + + return resultList; + } +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DeptLineServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DeptLineServiceImpl.java new file mode 100644 index 000000000..77cde2fa9 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DeptLineServiceImpl.java @@ -0,0 +1,94 @@ +package com.njcn.device.pms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.device.pms.mapper.DeptLineMapper; +import com.njcn.device.pq.pojo.po.DeptLine; +import com.njcn.device.pms.service.DeptLineService; +import com.njcn.web.pojo.param.DeptLineParam; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author denghuajun + * @date 2022/1/12 17:32 + * + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class DeptLineServiceImpl extends ServiceImpl implements DeptLineService { + + private final DeptLineMapper deptLineMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public void deptBindLine(DeptLineParam deptLineParam) { + //先解绑，再进行绑定 + QueryWrapper deptLineQueryWrapper = new QueryWrapper<>(); + deptLineQueryWrapper.eq("pq_dept_line.id", deptLineParam.getId()); + this.baseMapper.delete(deptLineQueryWrapper); + List deptLines = deptLineParam.getIds().stream().map(id -> { + DeptLine deptLine = new DeptLine(); + deptLine.setId(deptLineParam.getId()); + deptLine.setLineId(id); + return deptLine; + }).collect(Collectors.toList()); + this.saveBatch(deptLines); + } + + @Override + public void deptDeleteBindLine(DeptLineParam deptLineParam) { + for (int i = 0; i < deptLineParam.getIds().size(); i++) { + QueryWrapper deptLineQueryWrapper = new QueryWrapper<>(); + deptLineQueryWrapper.eq("pq_dept_line.id", deptLineParam.getId()); + deptLineQueryWrapper.eq("pq_dept_line.Line_Id", deptLineParam.getIds().get(i)); + this.baseMapper.delete(deptLineQueryWrapper); + } + } + + @Override + public List selectDeptBindLines(List ids) { + return this.lambdaQuery().in(DeptLine::getId, ids).list(); + } + + @Override + public int removeBind(String id) { + QueryWrapper deptLineQueryWrapper = new QueryWrapper<>(); + deptLineQueryWrapper.eq("pq_dept_line.id", id); + return this.baseMapper.delete(deptLineQueryWrapper); + } + + @Override + public List getLineByDeptId(String id) { + return this.lambdaQuery().in(DeptLine::getId, id).list().stream().map(DeptLine::getLineId).distinct().collect(Collectors.toList()); + } + + /** + * @param devDataType + * @Description: 获取部门和监测点的关系（分稳态暂态） + * @Param: [devDataType] + * @return: java.util.Map> + * @Author: clam + * @Date: 2022/10/19 + */ + @Override + public Map> getLineByDeptRelation(Integer devDataType) { + + Map> map = new HashMap<> (); + + List deptLines = deptLineMapper.getLineByDeptRelation(devDataType); + Map> collect = deptLines.stream ( ).collect (Collectors.groupingBy (DeptLine::getId, Collectors.mapping (DeptLine::getLineId,Collectors.toList ()))); + + return collect; + } + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityCheckService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityCheckService.java new file mode 100644 index 000000000..6d0fb0166 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityCheckService.java @@ -0,0 +1,37 @@ +package com.njcn.device.pms.service.majornetwork; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO; +import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; + +import java.util.List; + +/** + * 主网数据质量-数据质量核查 + * + * @author yzh + * @date 2022/11/2 + */ + +public interface DataQualityCheckService { + + /** + * 获取主网数据质量-台帐类数据质量核查 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getQualityCheckOfAccountData(StatisticsBizBaseParam param); + + /** + * 获取主网数据质量-监测指标数据质量核查 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + List getMonitoringIndexDataQualityVerification(StatisticsBizBaseParam param); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityDetailsService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityDetailsService.java new file mode 100644 index 000000000..7079883cd --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityDetailsService.java @@ -0,0 +1,47 @@ +package com.njcn.device.pms.service.majornetwork; + +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO; +import com.njcn.device.pms.pojo.vo.RStatMeasurementAccountDetailVO; +import com.njcn.device.pms.pojo.vo.RStatTargetDetailVO; +import com.njcn.device.pms.pojo.vo.RStatTractionStationAccountDetailVO; + +import java.util.List; + +/** + * @author yzh + * @date 2022/11/4 + */ + +public interface DataQualityDetailsService { + + /** + * 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/4 + */ + List getQualityProblemsOfMonitoringPointAccountData(DataQualityDetailsParam param); + + /** + * 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/4 + */ + List getTractionPlatformAccountDataQualityProblem(DataQualityDetailsParam param); + + /** + * 获取主网数据质量-稳态指标类数据质量问题查询 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getRStatTargetDetail(DataQualityDetailsParam param); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityStatService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityStatService.java new file mode 100644 index 000000000..039505a15 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/DataQualityStatService.java @@ -0,0 +1,48 @@ +package com.njcn.device.pms.service.majornetwork; + +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.pojo.vo.ROperatingIndexVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterPollVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterVO; + +import java.util.List; + +/** + * 主网数据质量-数据质量统计 + * + * @author yzh + * @date 2022/11/1 + */ + +public interface DataQualityStatService { + + /** + * 获取主网数据质量-台账数据质量统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/1 + */ + List getLedgerDataQualityStat(StatisticsBizBaseParam param); + + /** + * 获取主网数据质量-监测指标数据质量统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/1 + */ + List getMonitoringIndexDataQualityStat(StatisticsBizBaseParam param); + + /** + * 获取主网数据质量-监测指标数据质量问题汇总统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/1 + */ + List getSummaryStatOfMonitoringIndexDataQualityProblems(StatisticsBizBaseParam param); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IDistributionMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java similarity index 71% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IDistributionMonitorService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java index 7826efe0c..2ce853e26 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IDistributionMonitorService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java @@ -1,9 +1,10 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.po.DistributionMonitor; +import com.njcn.device.pms.pojo.vo.DoubleUserVO; import java.util.List; @@ -26,4 +27,11 @@ public interface IDistributionMonitorService extends IService getMonitorByCondition(List deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam); + + /** + * 获取指定组装下的发电用电用户 + * @author cdf + * @date 2022/11/15 + */ + List getDoubleUserByDept(String orgId); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IGeneratrixWireService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java similarity index 90% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IGeneratrixWireService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java index 07666138d..21009a5d0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IGeneratrixWireService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.GeneratrixWireParam; @@ -31,7 +31,7 @@ public interface IGeneratrixWireService extends IService { * @param generatrixWireParam 线路 * @return boolean */ - boolean updateGeneratrixWire(GeneratrixWireParam.UpdateGeneratrixWireParam generatrixWireParam); + boolean updateGeneratrixWire(GeneratrixWireParam generatrixWireParam); /** * 删除线路 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementDataService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IHarmonicGeneralManagementDataService.java similarity index 86% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementDataService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IHarmonicGeneralManagementDataService.java index 26fc3a073..ade60114d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementDataService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IHarmonicGeneralManagementDataService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.HarmonicGeneralManagementData; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IHarmonicGeneralManagementService.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IHarmonicGeneralManagementService.java index a577b78e2..0c2cc4b3d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IHarmonicGeneralManagementService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IHarmonicGeneralManagementService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.HarmonicGeneralManagement; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IMonitorService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java index bdba90059..8e7611130 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IMonitorService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.common.pojo.dto.SimpleDTO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneralDeviceService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneralDeviceService.java similarity index 94% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneralDeviceService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneralDeviceService.java index 7cf497a6d..ccab4bc82 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneralDeviceService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneralDeviceService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java index 594bdda15..39bc684f0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPmsGeneratrixService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerClientService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerClientService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java index 492cc9f00..9fd8da52c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerClientService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.PowerClientParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerDistributionareaService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerDistributionareaService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java index 8b12881c1..44bdd4862 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerDistributionareaService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerGenerationUserService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerGenerationUserService.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerGenerationUserService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerGenerationUserService.java index 4ef4f8db9..c199b1049 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerGenerationUserService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerGenerationUserService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.PowerGenerationUserParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerQualityMatterService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerQualityMatterService.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerQualityMatterService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerQualityMatterService.java index 554f67ff8..3e26c7c03 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPowerQualityMatterService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerQualityMatterService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.PowerQualityMatter; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISourceManagementService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ISourceManagementService.java similarity index 84% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISourceManagementService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ISourceManagementService.java index b708714bc..fa8dab326 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISourceManagementService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ISourceManagementService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.SourceManagement; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatationStatService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java similarity index 97% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatationStatService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java index 70507e5cb..38e0a3d39 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatationStatService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatisticsRunMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatisticsRunMonitorService.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatisticsRunMonitorService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatisticsRunMonitorService.java index b0570ae80..3024d6608 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IStatisticsRunMonitorService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatisticsRunMonitorService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.StatisticsRunMonitor; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalEliminateDataService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalEliminateDataService.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalEliminateDataService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalEliminateDataService.java index 9c0827e35..83dd84d52 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalEliminateDataService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalEliminateDataService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.TerminalEliminateData; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java similarity index 66% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java index 3fcb9be6c..37e62cf84 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITerminalService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java @@ -1,10 +1,10 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.PmsTerminalParam; -import com.njcn.device.pms.pojo.po.Terminal; -import com.njcn.device.pms.pojo.vo.PmsTerminalVO; +import com.njcn.device.pms.pojo.po.PmsTerminal; +import com.njcn.web.pojo.param.BaseParam; import java.util.List; @@ -16,20 +16,20 @@ import java.util.List; * @author hongawen * @since 2022-10-14 */ -public interface ITerminalService extends IService { +public interface ITerminalService extends IService { /** * 查询所有 - * @param queryParam + * @param baseParam * @return */ - Page getTerminalList(PmsTerminalParam.QueryParam queryParam); + Page getTerminalList(BaseParam baseParam); /** * 根据id查询 * @return */ - Terminal getTerminalById(String id); + PmsTerminal getTerminalById(String id); /** * 新增 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITractionStationService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITractionStationService.java similarity index 64% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITractionStationService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITractionStationService.java index 9c3bd1254..1f10651dd 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITractionStationService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITractionStationService.java @@ -1,6 +1,8 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.PmsTractionStationParam; import com.njcn.device.pms.pojo.param.TractionStationParam; import com.njcn.device.pms.pojo.po.TractionStation; import com.njcn.web.pojo.param.BaseParam; @@ -9,7 +11,7 @@ import java.util.List; /** *

- * 服务类 + * 服务类 *

* * @author hongawen @@ -19,12 +21,14 @@ public interface ITractionStationService extends IService { /** * 查询牵引站列表 + * * @return boolean */ List getTractionStationList(BaseParam baseParam); /** * 查询牵引站 + * * @return boolean */ TractionStation getTractionStationById(String tractionStationId); @@ -36,14 +40,25 @@ public interface ITractionStationService extends IService { /** * 修改 + * * @param */ boolean update(TractionStationParam updateParam); /** * 删除 + * * @param ids ids */ boolean delete(List ids); + /** + * 获取牵引站详细信息 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + List getPmsTractionStationInfo(PmsTractionStationParam param); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITransientStasticDataService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransientStasticDataService.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITransientStasticDataService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransientStasticDataService.java index b097fa90f..136dda309 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITransientStasticDataService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransientStasticDataService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.TransientStasticData; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITreatTransientDetailDataService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITreatTransientDetailDataService.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITreatTransientDetailDataService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITreatTransientDetailDataService.java index 90ed93dad..024d0b1c8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ITreatTransientDetailDataService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITreatTransientDetailDataService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.TreatTransientDetailData; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpMonitorAlarmCountMService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RMpMonitorAlarmCountMService.java similarity index 63% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpMonitorAlarmCountMService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RMpMonitorAlarmCountMService.java index f04661dca..ada82efea 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpMonitorAlarmCountMService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RMpMonitorAlarmCountMService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam; @@ -14,5 +14,14 @@ import java.util.List; */ public interface RMpMonitorAlarmCountMService extends IService { + + /*** + * 根据条件查询监测点告警统计(月)(主网) + * @author jianghaifei + * @date 2022-11-01 15:21 + * @param rMpMonitorAlarmCountMParam + * @return com.njcn.common.pojo.response.HttpResult> + */ List getRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam); + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpTargetWarnDService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RMpTargetWarnDService.java similarity index 86% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpTargetWarnDService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RMpTargetWarnDService.java index 0a65aa046..dc8976659 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RMpTargetWarnDService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RMpTargetWarnDService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.po.RMpTargetWarnD; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ROperatingIndexMService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ROperatingIndexMService.java new file mode 100644 index 000000000..5beef638b --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ROperatingIndexMService.java @@ -0,0 +1,25 @@ +package com.njcn.device.pms.service.majornetwork; + +import com.njcn.device.pms.pojo.param.ROperatingIndexParam; +import com.njcn.device.pms.pojo.po.ROperatingIndexM; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO; +import com.njcn.device.pms.pojo.vo.ROperatingIndexCommonVO; + +import java.util.List; + +/** +* @author jianghf +* @description 针对表【r_operating_index_m(主网运行指标统计-月表,主网监测指标数据质量统计-月表 )】的数据库操作Service +* @createDate 2022-11-09 19:56:01 +*/ +public interface ROperatingIndexMService extends IService { + + /*** + * 查询运行指标统计(主网) + * @author jianghaifei + * @date 2022-11-09 19:04 + * @param rOperatingIndexParam + */ + List getOperatingList(ROperatingIndexParam rOperatingIndexParam); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ROperatingIndexYService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ROperatingIndexYService.java new file mode 100644 index 000000000..f921d4b15 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ROperatingIndexYService.java @@ -0,0 +1,25 @@ +package com.njcn.device.pms.service.majornetwork; + +import com.njcn.device.pms.pojo.param.ROperatingIndexParam; +import com.njcn.device.pms.pojo.po.ROperatingIndexY; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO; +import com.njcn.device.pms.pojo.vo.ROperatingIndexCommonVO; + +import java.util.List; + +/** +* @author jianghf +* @description 针对表【r_operating_index_y(主网运行指标统计-年表,主网监测指标数据质量统计-年表 )】的数据库操作Service +* @createDate 2022-11-09 19:56:01 +*/ +public interface ROperatingIndexYService extends IService { + + /*** + * 查询运行指标统计(主网) + * @author jianghaifei + * @date 2022-11-09 19:04 + * @param rOperatingIndexParam + */ + List getOperatingList(ROperatingIndexParam rOperatingIndexParam); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatAreaAlarmCountMService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatAreaAlarmCountMService.java similarity index 87% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatAreaAlarmCountMService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatAreaAlarmCountMService.java index ddddfdcdf..1e78a1764 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatAreaAlarmCountMService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatAreaAlarmCountMService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam; @@ -15,11 +15,12 @@ import java.util.List; public interface RStatAreaAlarmCountMService extends IService { /*** - * 根据条件查询所有区域告警统计(月) + * 根据条件查询所有区域告警统计(月)(主网) * @author jianghaifei * @date 2022-10-10 15:20 * @param rStatAreaAlarmCountMParam * @return java.util.List */ List getAllRStatAreaAlarmCountMList(RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam); + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatBusbarHarmonicService.java similarity index 92% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatBusbarHarmonicService.java index e1e433fcf..3072688e3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatBusbarHarmonicService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatBusbarHarmonicService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatZwAlarmCountWService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatZwAlarmCountWService.java similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatZwAlarmCountWService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatZwAlarmCountWService.java index 23ca1ed5b..76c101cf7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RStatZwAlarmCountWService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RStatZwAlarmCountWService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RmpEventDetailService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RmpEventDetailService.java similarity index 91% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RmpEventDetailService.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RmpEventDetailService.java index 1226f7ade..9cc40b8c0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/RmpEventDetailService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RmpEventDetailService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service; +package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.UniversalFrontEndParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityCheckServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityCheckServiceImpl.java new file mode 100644 index 000000000..ee2f59b24 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityCheckServiceImpl.java @@ -0,0 +1,155 @@ +package com.njcn.device.pms.service.majornetwork.impl; + +import cn.hutool.core.collection.CollUtil; +import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.mapper.majornetwork.RStatAccountCheckDataMapper; +import com.njcn.device.pms.mapper.majornetwork.RStatTargetCheckDataMapper; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; +import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; +import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO; +import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; +import com.njcn.device.pms.service.majornetwork.DataQualityCheckService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 主网数据质量-数据质量核查 + * + * @author yzh + * @date 2022/11/2 + */ +@Service +@Slf4j +@RequiredArgsConstructor +public class DataQualityCheckServiceImpl implements DataQualityCheckService { + + private final IPmsGeneralDeviceService iPmsGeneralDeviceService; + + private final RStatAccountCheckDataMapper rStatAccountCheckDataMapper; + + private final RStatTargetCheckDataMapper rStatTargetCheckDataMapper; + + /** + * 获取主网数据质量-台帐类数据质量核查 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + @Override + public List getQualityCheckOfAccountData(StatisticsBizBaseParam param) { + // 获取当前用户的部门的子部门信息 + List data = getPmsGeneralDeviceDTOList(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 创建集合封装查询数据 + List result = new ArrayList<>(); + // 获取主网数据质量-台帐类数据质量核查 + switch (param.getType()) { + // 年 + case 1: + result = rStatAccountCheckDataMapper.getYearInfo(param, deptIdList); + break; + // 季 + case 2: + result = rStatAccountCheckDataMapper.getSeasonInfo(param, deptIdList); + break; + // 月 + case 3: + result = rStatAccountCheckDataMapper.getMonthInfo(param, deptIdList); + break; + default: + break; + } + if (CollUtil.isEmpty(result)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + return result.stream().peek(vo -> { + vo.setOrgName(dataMap.get(vo.getOrgNo()).getName()); + }).collect(Collectors.toList()); + } + + /** + * 获取主网数据质量-监测指标数据质量核查 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + @Override + public List getMonitoringIndexDataQualityVerification(StatisticsBizBaseParam param) { + // 获取当前用户的部门的子部门信息 + List data = getPmsGeneralDeviceDTOList(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 创建集合封装数据 + List result = new ArrayList<>(); + // 获取主网数据质量-台帐类数据质量核查 + switch (param.getType()) { + // 年 + case 1: + result = rStatTargetCheckDataMapper.getYearInfo(param, deptIdList); + break; + // 季 + case 2: + result = rStatTargetCheckDataMapper.getSeasonInfo(param, deptIdList); + break; + // 月 + case 3: + result = rStatTargetCheckDataMapper.getMonthInfo(param, deptIdList); + break; + default: + break; + } + if (CollUtil.isEmpty(result)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + return result.stream().peek(vo -> { + vo.setOrgName(dataMap.get(vo.getOrgNo()).getName()); + }).collect(Collectors.toList()); + } + + /** + * 将单位信息转为map集合 key: 单位id value: 单位实体 + */ + private Map getDataMap(List data) { + return data + .stream() + .collect(Collectors.toMap(PmsGeneralDeviceDTO::getIndex, PmsGeneralDeviceDTO -> PmsGeneralDeviceDTO)); + } + + /** + * 获取当前用户的部门的子部门信息 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + private List getPmsGeneralDeviceDTOList(StatisticsBizBaseParam param) { + // 获取当前用户的部门的子部门信息 + PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); + pmsDeviceInfoParam.setDeptIndex(param.getId()); + pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); + return iPmsGeneralDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityDetailsServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityDetailsServiceImpl.java new file mode 100644 index 000000000..c725c3ed3 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityDetailsServiceImpl.java @@ -0,0 +1,241 @@ +package com.njcn.device.pms.service.majornetwork.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.device.pms.mapper.majornetwork.RStatMeasurementAccountDetailMapper; +import com.njcn.device.pms.mapper.majornetwork.RStatTargetDetailMapper; +import com.njcn.device.pms.mapper.majornetwork.RStatTractionStationAccountDetailMapper; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; +import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.DataQualityDetailsParam; +import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; +import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; +import com.njcn.device.pms.pojo.param.PmsTractionStationParam; +import com.njcn.device.pms.pojo.po.RStatMeasurementAccountDetailPO; +import com.njcn.device.pms.pojo.po.RStatTargetDetailPO; +import com.njcn.device.pms.pojo.po.RStatTractionStationAccountDetailPO; +import com.njcn.device.pms.pojo.vo.RStatMeasurementAccountDetailVO; +import com.njcn.device.pms.pojo.vo.RStatTargetDetailVO; +import com.njcn.device.pms.pojo.vo.RStatTractionStationAccountDetailVO; +import com.njcn.device.pms.service.majornetwork.DataQualityDetailsService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; +import com.njcn.device.pms.service.majornetwork.ITractionStationService; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.WebUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 主网数据质量-数据质量核查详情 + * + * @author yzh + * @date 2022/11/4 + */ + +@Service +@Slf4j +@RequiredArgsConstructor +public class DataQualityDetailsServiceImpl implements DataQualityDetailsService { + + private final IPmsGeneralDeviceService iPmsGeneralDeviceService; + + private final RStatMeasurementAccountDetailMapper rStatMeasurementAccountDetailMapper; + + private final IMonitorService iMonitorService; + + private final ITractionStationService iTractionStationService; + + private final RStatTractionStationAccountDetailMapper rStatTractionStationAccountDetailMapper; + + private final RStatTargetDetailMapper rStatTargetDetailMapper; + + /** + * 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/4 + */ + @Override + public List getQualityProblemsOfMonitoringPointAccountData(DataQualityDetailsParam param) { + // 获取单位下的子单位信息 + List data = getDeptInfo(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 创建集合封装返回数据 + List result = new ArrayList<>(); + for (PmsGeneralDeviceDTO dto : data) { + if (CollUtil.isEmpty(dto.getMonitorIdList())) { + continue; + } + // 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 + List pos = + rStatMeasurementAccountDetailMapper + .getQualityProblemsOfMonitoringPointAccountData(dto.getMonitorIdList(), param); + if (CollUtil.isEmpty(pos)) { + return Collections.emptyList(); + } + // 获取监测点信息 + PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam(); + pmsMonitorInfoParam.setMonitorIds(pos + .stream() + .map(RStatMeasurementAccountDetailPO::getMeasurementPointId) + .collect(Collectors.toList())); + List monitorInfoDTOS = iMonitorService.getMonitorInfo(pmsMonitorInfoParam); + // //将单位信息转为map集合 key: 单位id value: 单位实体 + Map monitorInfoMap = monitorInfoDTOS + .stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, PmsMonitorInfoDTO -> PmsMonitorInfoDTO)); + // 属性赋值 + for (RStatMeasurementAccountDetailPO po : pos) { + for (PmsMonitorInfoDTO monitorInfoDTO : monitorInfoDTOS) { + if (po.getMeasurementPointId().equals(monitorInfoDTO.getMonitorId())) { + RStatMeasurementAccountDetailVO vo = new RStatMeasurementAccountDetailVO(); + vo.setOrgId(dto.getIndex()); + vo.setOrgName(dto.getName()); + vo.setDataDate(po.getDataDate()); + vo.setPowerId(monitorInfoDTO.getPowerId()); + vo.setPowerName(monitorInfoDTO.getPowerName()); + vo.setMonitorId(po.getMeasurementPointId()); + vo.setMonitorName(monitorInfoDTO.getMonitorName()); + vo.setCheckRules(po.getCheckRules()); + vo.setMonitorVoltageLevel(monitorInfoDTO.getMonitorVoltageLevel()); + result.add(vo); + } + } + } + } + return result; + } + + /** + * 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/4 + */ + @Override + public List getTractionPlatformAccountDataQualityProblem(DataQualityDetailsParam param) { + // 获取单位下的子单位信息 + List data = getDeptInfo(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 获取牵引站信息 + PmsTractionStationParam pmsTractionStationParam = new PmsTractionStationParam(); + pmsTractionStationParam.setOrgIds(data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList())); + List tractionStationInfo = iTractionStationService.getPmsTractionStationInfo(pmsTractionStationParam); + if (CollUtil.isEmpty(tractionStationInfo)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map tractionStationInfoMap = getDataMap(tractionStationInfo); + // 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题 + List pos = rStatTractionStationAccountDetailMapper.getTractionPlatformAccountDataQualityProblem(param, + tractionStationInfo.stream().map(PmsTractionStationDTO::getId).collect(Collectors.toList())); + if (CollUtil.isEmpty(pos)) { + return Collections.emptyList(); + } + // 属性赋值 + return pos.stream().map(po -> { + RStatTractionStationAccountDetailVO vo = new RStatTractionStationAccountDetailVO(); + BeanUtils.copyProperties(po, vo); + vo.setSubstationName(tractionStationInfoMap.get(vo.getSubstationId()).getName()); + vo.setElectricRailwayLineName(tractionStationInfoMap.get(vo.getSubstationId()).getRailwayLineName()); + vo.setPowerName((tractionStationInfoMap.get(vo.getSubstationId()).getPowerName())); + vo.setPowerVoltageLevel((tractionStationInfoMap.get(vo.getSubstationId()).getPowerVoltageLevel())); + // TODO 铁路类型 + String railwayLineId = tractionStationInfoMap + .get(vo.getSubstationId()) + .getRailwayLineId() + .substring(0, tractionStationInfoMap.get(vo.getSubstationId()).getRailwayLineId().length() - 1); + if (!railwayLineId.equals("1") && !railwayLineId.equals("2")) { + vo.setTypeOfRailway("0"); + } else { + vo.setTypeOfRailway(railwayLineId); + } + return vo; + }).collect(Collectors.toList()); + } + + + + /** + * 获取主网数据质量-稳态指标类数据质量问题查询 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/8 + */ + @Override + public List getRStatTargetDetail(DataQualityDetailsParam param) { + // 获取单位下的子单位信息 + List data = getDeptInfo(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 获取主网数据质量-稳态指标类数据质量问题查询 + List pos = rStatTargetDetailMapper.getRStatTargetDetail(param, data.stream() + .flatMap(pmsGeneralDeviceDTO -> pmsGeneralDeviceDTO.getMonitorIdList().stream()) + .collect(Collectors.toList())); + if (CollUtil.isEmpty(pos)) { + return Collections.emptyList(); + } + // 取出监测点id + List measurementPointId = pos.stream().map(RStatTargetDetailPO::getMeasurementPointId).collect(Collectors.toList()); + PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam(); + pmsMonitorInfoParam.setMonitorIds(measurementPointId); + List pmsMonitorInfoList = iMonitorService.getMonitorInfo(pmsMonitorInfoParam); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map pmsMonitorInfoMap = pmsMonitorInfoList + .stream() + .collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, PmsMonitorInfoDTO -> PmsMonitorInfoDTO)); + // 创建集合封装返回数据 + return pos.stream().map(po -> { + RStatTargetDetailVO vo = new RStatTargetDetailVO(); + BeanUtils.copyProperties(po, vo); + vo.setMonitorId(po.getMeasurementPointId()); + vo.setPowerName(pmsMonitorInfoMap.get(vo.getMonitorId()).getPowerName()); + vo.setMonitorName(pmsMonitorInfoMap.get(vo.getMonitorId()).getMonitorName()); + vo.setMonitorVoltageLevel(pmsMonitorInfoMap.get(vo.getMonitorId()).getMonitorVoltageLevel()); + // TODO 地市公司 + vo.setCityCompany("南京"); + return vo; + }).collect(Collectors.toList()); + } + + + /** + * 获取单位下的子单位信息 + */ + private List getDeptInfo(DataQualityDetailsParam param) { + PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); + pmsDeviceInfoParam.setDeptIndex(param.getId()); + pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); + return iPmsGeneralDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); + + } + /** + * 将单位信息转为map集合 key: 单位id value: 单位实体 + */ + private Map getDataMap(List tractionStationInfo) { + return tractionStationInfo + .stream() + .collect(Collectors.toMap(PmsTractionStationDTO::getId, PmsTractionStationDTO -> PmsTractionStationDTO)); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java new file mode 100644 index 000000000..321598763 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java @@ -0,0 +1,205 @@ +package com.njcn.device.pms.service.majornetwork.impl; + +import cn.hutool.core.collection.CollUtil; +import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.device.pms.mapper.majornetwork.ROperatingIndexMapper; +import com.njcn.device.pms.mapper.majornetwork.RQualityParameterMapper; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; +import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; +import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; +import com.njcn.device.pms.pojo.po.RQualityParameterPO; +import com.njcn.device.pms.pojo.vo.ROperatingIndexVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterPollVO; +import com.njcn.device.pms.pojo.vo.RQualityParameterVO; +import com.njcn.device.pms.service.majornetwork.DataQualityStatService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 主网数据质量-数据质量统计 + * + * @author yzh + * @date 2022/11/1 + */ +@Service +@Slf4j +@RequiredArgsConstructor +public class DataQualityStatServiceImpl implements DataQualityStatService { + + private final IPmsGeneralDeviceService iPmsGeneralDeviceService; + + private final DicDataFeignClient dicDataFeignClient; + + private final RQualityParameterMapper rQualityParameterMapper; + + private final ROperatingIndexMapper rOperatingIndexMapper; + + private final DecimalFormat df = new DecimalFormat("###.00"); + + /** + * 获取主网数据质量-台账数据质量统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/1 + */ + @Override + public List getLedgerDataQualityStat(StatisticsBizBaseParam param) { + // 获取当前用户的部门的子部门信息 + List data = getPmsGeneralDeviceDTOList(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 获取配网字典id + String mainnetPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); + // 获取主网数据质量-台账数据质量统计 + List pos = rQualityParameterMapper.getLedgerDataQualityStat( + param, + data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()), + mainnetPoint + ); + if (CollUtil.isEmpty(pos)) { + return Collections.emptyList(); + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 属性赋值 + return pos.stream().map(po -> { + RQualityParameterVO vo = new RQualityParameterVO(); + BeanUtils.copyProperties(po, vo); + vo.setOrgName(dataMap.get(vo.getOrgNo()).getName()); + return vo; + }).collect(Collectors.toList()); + } + + /** + * 获取主网数据质量-监测指标数据质量统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/1 + */ + @Override + public List getMonitoringIndexDataQualityStat(StatisticsBizBaseParam param) { + // 获取当前用户的部门的子部门信息 + List data = getPmsGeneralDeviceDTOList(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + // 取出单位id + List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 创建集合封装返回数据 + List result = new ArrayList<>(); + // 获取主网数据质量-监测指标数据质量统计 + switch (param.getType()) { + // 年 + case 1: + result = rOperatingIndexMapper.getYearInfo(param, deptIdList); + break; + // 季 + case 2: + result = rOperatingIndexMapper.getSeasonInfo(param, deptIdList); + break; + // 月 + case 3: + result = rOperatingIndexMapper.getMonthInfo(param, deptIdList); + break; + default: + break; + } + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 处理数据 + // 计算有效接入率【有效接入监测点数量/在运监测点数】 + return result.stream().peek(vo -> { + vo.setOrgName(dataMap.get(vo.getOrgNo()).getName()); + vo.setEffectiveAccessRate( + Double.parseDouble( + df.format((vo.getEffectiveAccessMeasurementCount() * 1.0) + / (vo.getMeasurementCount() * 1.0)) + ) * 100); + }).collect(Collectors.toList()); + } + + /** + * 获取主网数据质量-监测指标数据质量问题汇总统计 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/1 + */ + @Override + public List getSummaryStatOfMonitoringIndexDataQualityProblems(StatisticsBizBaseParam param) { + // 获取当前用户的部门的子部门信息 + List data = getPmsGeneralDeviceDTOList(param); + if (CollUtil.isEmpty(data)) { + return Collections.emptyList(); + } + List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 获取配网字典id + String mainnetPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); + // 获取主网数据质量-监测指标数据质量问题汇总统计 + List pos = rQualityParameterMapper.getLedgerDataQualityStat(param, deptIdList, mainnetPoint); + // 将单位信息转为map集合 key: 单位id value: 单位实体 + Map dataMap = getDataMap(data); + // 属性赋值 + return pos.stream().map(po -> { + RQualityParameterPollVO vo = new RQualityParameterPollVO(); + BeanUtils.copyProperties(po, vo); + vo.setOrgId(po.getOrgNo()); + vo.setOrgName(dataMap.get(vo.getOrgId()).getName()); + vo.setProblemProportion( + Double.parseDouble( + df.format((po.getProblem() * 1.0) + / (po.getEffectiveAccessMeasurementCount() * 1.0)) + ) * 100); + if (po.getProblemYearOnYear() == null) { + vo.setProblemYearOnYear("3.14159"); + } else { + vo.setProblemYearOnYear(po.getProblemYearOnYear()); + } + return vo; + }).collect(Collectors.toList()); + } + + /** + * 将单位信息转为map集合 key: 单位id value: 单位实体 + */ + private Map getDataMap(List data) { + return data + .stream() + .collect(Collectors.toMap(PmsGeneralDeviceDTO::getIndex, PmsGeneralDeviceDTO -> PmsGeneralDeviceDTO)); + } + + /** + * 获取当前用户的部门的子部门信息 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/2 + */ + private List getPmsGeneralDeviceDTOList(StatisticsBizBaseParam param) { + // 获取当前用户的部门的子部门信息 + PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); + pmsDeviceInfoParam.setDeptIndex(param.getId()); + pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); + return iPmsGeneralDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DistributionMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java similarity index 56% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DistributionMonitorServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java index dea2ac10d..d84e613b4 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DistributionMonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java @@ -1,16 +1,22 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pms.mapper.*; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.enums.PmsDeviceResponseEnum; +import com.njcn.device.pms.mapper.majornetwork.DistributionMonitorMapper; import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.po.DistributionMonitor; -import com.njcn.device.pms.service.IDistributionMonitorService; +import com.njcn.device.pms.pojo.vo.DoubleUserVO; +import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.pojo.po.DictData; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** *

@@ -25,9 +31,16 @@ import java.util.List; @Slf4j public class DistributionMonitorServiceImpl extends ServiceImpl implements IDistributionMonitorService { + private final DicDataFeignClient dicDataFeignClient; + @Override public List getMonitorByCondition(List deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) { return this.baseMapper.getIdByOrgId(deptIdList,pmsDeviceInfoParam); } + + @Override + public List getDoubleUserByDept(String orgId) { + return this.baseMapper.getDoubleUserByDept(orgId); + } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/GeneratrixWireImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java similarity index 76% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/GeneratrixWireImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java index df1f7caee..3bf16f8ec 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/GeneratrixWireImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java @@ -1,11 +1,12 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pms.mapper.GeneratrixWireMapper; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.device.pms.mapper.majornetwork.GeneratrixWireMapper; import com.njcn.device.pms.pojo.param.GeneratrixWireParam; import com.njcn.device.pms.pojo.po.GeneratrixWire; -import com.njcn.device.pms.service.IGeneratrixWireService; +import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; @@ -26,14 +27,15 @@ public class GeneratrixWireImpl extends ServiceImpl diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneralDeviceServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java similarity index 96% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneralDeviceServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java index 7b36b8522..a78815af1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneralDeviceServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java @@ -1,14 +1,13 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import com.njcn.device.pms.pojo.po.Monitor; -import com.njcn.device.pms.service.IDistributionMonitorService; -import com.njcn.device.pms.service.IMonitorService; -import com.njcn.device.pms.service.IPmsGeneralDeviceService; +import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; import lombok.RequiredArgsConstructor; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java similarity index 92% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java index 09d981f85..70f056584 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PmsGeneratrixServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java @@ -1,14 +1,14 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pms.mapper.PmsGeneratrixMapper; +import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; import com.njcn.device.pms.pojo.param.GeneratrixParam; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.pojo.po.Generatrix; -import com.njcn.device.pms.service.IPmsGeneratrixService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerClientServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java similarity index 87% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerClientServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java index bb3ee6a88..5caf95221 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerClientServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java @@ -1,10 +1,9 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.PowerClientMapper; +import com.njcn.device.pms.mapper.majornetwork.PowerClientMapper; import com.njcn.device.pms.pojo.param.PowerClientParam; import com.njcn.device.pms.pojo.po.PowerClient; -import com.njcn.device.pms.pojo.po.PowerClient; -import com.njcn.device.pms.service.IPowerClientService; +import com.njcn.device.pms.service.majornetwork.IPowerClientService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.web.pojo.param.BaseParam; import org.springframework.beans.BeanUtils; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerDistributionareaServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java similarity index 92% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerDistributionareaServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java index 2b20cce84..57a3267e2 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerDistributionareaServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,15 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; -import com.njcn.device.pms.mapper.PowerDistributionareaMapper; +import com.njcn.device.pms.mapper.majornetwork.PowerDistributionareaMapper; import com.njcn.device.pms.pojo.param.PowerDistributionareaParam; import com.njcn.device.pms.pojo.po.PowerDistributionarea; import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO; -import com.njcn.device.pms.service.IPowerDistributionareaService; +import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.system.enums.EventResponseEnum; -import com.njcn.system.pojo.param.EventTemplateParam; -import com.njcn.system.pojo.po.EventTemplate; import com.njcn.web.factory.PageFactory; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerGenerationUserServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java similarity index 88% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerGenerationUserServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java index 88f164578..1987519e8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerGenerationUserServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java @@ -1,10 +1,9 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.PowerGenerationUserMapper; +import com.njcn.device.pms.mapper.majornetwork.PowerGenerationUserMapper; import com.njcn.device.pms.pojo.param.PowerGenerationUserParam; import com.njcn.device.pms.pojo.po.PowerGenerationUser; -import com.njcn.device.pms.pojo.po.PowerGenerationUser; -import com.njcn.device.pms.service.IPowerGenerationUserService; +import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.web.pojo.param.BaseParam; import org.springframework.beans.BeanUtils; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerQualityMatterServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerQualityMatterServiceImpl.java similarity index 67% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerQualityMatterServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerQualityMatterServiceImpl.java index c51bff16e..313c6145d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/PowerQualityMatterServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerQualityMatterServiceImpl.java @@ -1,8 +1,8 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.PowerQualityMatterMapper; +import com.njcn.device.pms.mapper.majornetwork.PowerQualityMatterMapper; import com.njcn.device.pms.pojo.po.PowerQualityMatter; -import com.njcn.device.pms.service.IPowerQualityMatterService; +import com.njcn.device.pms.service.majornetwork.IPowerQualityMatterService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpMonitorAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java similarity index 89% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpMonitorAlarmCountMServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java index ae9cd80fe..725a74c79 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpMonitorAlarmCountMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java @@ -1,17 +1,17 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.device.pms.mapper.RMpMonitorAlarmCountMMapper; +import com.njcn.device.pms.mapper.majornetwork.RMpMonitorAlarmCountMMapper; import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM; import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO; -import com.njcn.device.pms.service.IMonitorService; -import com.njcn.device.pms.service.RMpMonitorAlarmCountMService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.device.pms.service.majornetwork.RMpMonitorAlarmCountMService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; @@ -39,14 +39,21 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor public class RMpMonitorAlarmCountMServiceImpl extends ServiceImpl -implements RMpMonitorAlarmCountMService{ +implements RMpMonitorAlarmCountMService { private final DeptFeignClient deptFeignClient; private final DicDataFeignClient dicDataFeignClient; - private final IMonitorService iMonitorService; //【监测点】服务类 + private final IMonitorService iMonitorService; //【主网监测点】服务类 + /*** + * 根据条件查询监测点告警统计(月)(主网) + * @author jianghaifei + * @date 2022-11-01 15:21 + * @param rMpMonitorAlarmCountMParam + * @return java.util.List + */ @Override public List getRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) { //提取查询条件 @@ -79,7 +86,7 @@ implements RMpMonitorAlarmCountMService{ //将监测点类型字典信息转为map集合 key: 字典id value: 字典名称 Map monitorTypeMap = monitorTypeList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); //获取主网id - DictData mainId = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); + String dataType = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); //根据条件查询单位下面的所有监测点 LambdaQueryWrapper monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -101,7 +108,7 @@ implements RMpMonitorAlarmCountMService{ lambdaQueryWrapper.in(RMpMonitorAlarmCountM::getMeasurementPointId, monitorIdList) .ge(RMpMonitorAlarmCountM::getDataDate, startTime) .le(RMpMonitorAlarmCountM::getDataDate, endTime) - .eq(RMpMonitorAlarmCountM::getDataType, mainId); + .eq(RMpMonitorAlarmCountM::getDataType, dataType); List alarmCountMList = this.list(lambdaQueryWrapper); List resultList; if (CollUtil.isNotEmpty(alarmCountMList)) { @@ -124,4 +131,5 @@ implements RMpMonitorAlarmCountMService{ } return resultList; } + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpTargetWarnDServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpTargetWarnDServiceImpl.java similarity index 69% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpTargetWarnDServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpTargetWarnDServiceImpl.java index 78e689829..66485de72 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RMpTargetWarnDServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpTargetWarnDServiceImpl.java @@ -1,9 +1,9 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pms.mapper.RMpTargetWarnDMapper; +import com.njcn.device.pms.mapper.majornetwork.RMpTargetWarnDMapper; import com.njcn.device.pms.pojo.po.RMpTargetWarnD; -import com.njcn.device.pms.service.RMpTargetWarnDService; +import com.njcn.device.pms.service.majornetwork.RMpTargetWarnDService; import org.springframework.stereotype.Service; /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java new file mode 100644 index 000000000..e33f833ac --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java @@ -0,0 +1,84 @@ +package com.njcn.device.pms.service.majornetwork.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.mapper.majornetwork.ROperatingIndexMMapper; +import com.njcn.device.pms.pojo.param.ROperatingIndexParam; +import com.njcn.device.pms.pojo.po.ROperatingIndexM; +import com.njcn.device.pms.pojo.vo.ROperatingIndexCommonVO; +import com.njcn.device.pms.service.majornetwork.ROperatingIndexMService; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.WebUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.text.DecimalFormat; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** +* @author jianghf +* @description 针对表【r_operating_index_m(主网运行指标统计-月表,主网监测指标数据质量统计-月表 )】的数据库操作Service实现 +* @createDate 2022-11-09 19:56:01 +*/ +@Service +@RequiredArgsConstructor +public class ROperatingIndexMServiceImpl extends ServiceImpl + implements ROperatingIndexMService{ + + private final DeptFeignClient deptFeignClient; + + @Override + public List getOperatingList(ROperatingIndexParam rOperatingIndexParam) { + //提取参数 + String id = rOperatingIndexParam.getId(); //单位id + String startTime = rOperatingIndexParam.getStartTime(); //开始时间 + String endTime = rOperatingIndexParam.getEndTime(); //结束时间 + + //获取所有子部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + if (CollUtil.isEmpty(deptDTOList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); + } + //单位id集合 + List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + + //组装查询条件 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(ROperatingIndexM::getOrgNo, orgNoList) + .ge(StringUtils.isNotBlank(startTime), ROperatingIndexM::getDataDate, startTime) + .le(StringUtils.isNotBlank(endTime), ROperatingIndexM::getDataDate, endTime); + //查询数据 + List list = this.list(lambdaQueryWrapper); + + //封装返回数据 + DecimalFormat df = new DecimalFormat("###.00"); + List resultList = list.stream().map(item -> { + ROperatingIndexCommonVO rOperatingIndexCommonVO = new ROperatingIndexCommonVO(); + BeanUtils.copyProperties(item, rOperatingIndexCommonVO); + + rOperatingIndexCommonVO.setOrgName(deptDTOMap.get(item.getOrgNo()).getName()); //单位名称 + //在线监测率 + Integer measurementRunPoints = item.getMeasurementRunPoints(); //监测点数 + Integer transitMeasurementPoints = item.getTransitMeasurementPoints(); //在线监测点数 + Double transitMeasurementRate = Double.parseDouble(df.format(transitMeasurementPoints / (measurementRunPoints * 1.0) * 100)); + rOperatingIndexCommonVO.setTransitMeasurementRate(transitMeasurementRate); //在线监测率 + + return rOperatingIndexCommonVO; + }).collect(Collectors.toList()); + return resultList; + } +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexYServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexYServiceImpl.java new file mode 100644 index 000000000..a04f9e9f8 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexYServiceImpl.java @@ -0,0 +1,84 @@ +package com.njcn.device.pms.service.majornetwork.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.pojo.param.ROperatingIndexParam; +import com.njcn.device.pms.pojo.po.ROperatingIndexY; +import com.njcn.device.pms.pojo.vo.ROperatingIndexCommonVO; +import com.njcn.device.pms.service.majornetwork.ROperatingIndexYService; +import com.njcn.device.pms.mapper.majornetwork.ROperatingIndexYMapper; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.WebUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.text.DecimalFormat; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** +* @author jianghf +* @description 针对表【r_operating_index_y(主网运行指标统计-年表,主网监测指标数据质量统计-年表 )】的数据库操作Service实现 +* @createDate 2022-11-09 19:56:01 +*/ +@Service +@RequiredArgsConstructor +public class ROperatingIndexYServiceImpl extends ServiceImpl + implements ROperatingIndexYService{ + + private final DeptFeignClient deptFeignClient; + + @Override + public List getOperatingList(ROperatingIndexParam rOperatingIndexParam) { + //提取参数 + String id = rOperatingIndexParam.getId(); //单位id + String startTime = rOperatingIndexParam.getStartTime(); //开始时间 + String endTime = rOperatingIndexParam.getEndTime(); //结束时间 + + //获取所有子部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + if (CollUtil.isEmpty(deptDTOList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); + } + //单位id集合 + List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位id value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + + //组装查询条件 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(ROperatingIndexY::getOrgNo, orgNoList) + .ge(StringUtils.isNotBlank(startTime), ROperatingIndexY::getDataDate, startTime) + .le(StringUtils.isNotBlank(endTime), ROperatingIndexY::getDataDate, endTime); + //查询数据 + List list = this.list(lambdaQueryWrapper); + + //封装返回数据 + DecimalFormat df = new DecimalFormat("###.00"); + List resultList = list.stream().map(item -> { + ROperatingIndexCommonVO rOperatingIndexCommonVO = new ROperatingIndexCommonVO(); + BeanUtils.copyProperties(item, rOperatingIndexCommonVO); + + rOperatingIndexCommonVO.setOrgName(deptDTOMap.get(item.getOrgNo()).getName()); //单位名称 + //在线监测率 + Integer measurementRunPoints = item.getMeasurementRunPoints(); //监测点数 + Integer transitMeasurementPoints = item.getTransitMeasurementPoints(); //在线监测点数 + Double transitMeasurementRate = Double.parseDouble(df.format(transitMeasurementPoints / (measurementRunPoints * 1.0) * 100)); + rOperatingIndexCommonVO.setTransitMeasurementRate(transitMeasurementRate); //在线监测率 + + return rOperatingIndexCommonVO; + }).collect(Collectors.toList()); + return resultList; + } +} + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatAreaAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java similarity index 85% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatAreaAlarmCountMServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java index f8393190b..977450a49 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatAreaAlarmCountMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java @@ -1,18 +1,17 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.device.pms.mapper.RStatAreaAlarmCountMMapper; +import com.njcn.device.pms.mapper.majornetwork.RStatAreaAlarmCountMMapper; import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam; import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM; import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO; -import com.njcn.device.pms.service.RStatAreaAlarmCountMService; +import com.njcn.device.pms.service.majornetwork.RStatAreaAlarmCountMService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; -import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.web.utils.WebUtil; @@ -22,7 +21,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -41,6 +39,13 @@ implements RStatAreaAlarmCountMService{ private final DicDataFeignClient dicDataFeignClient; + /*** + * 根据条件查询所有区域告警统计(月)(主网) + * @author jianghaifei + * @date 2022-10-10 15:20 + * @param rStatAreaAlarmCountMParam + * @return java.util.List + */ @Override public List getAllRStatAreaAlarmCountMList(RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam) { //获取查询条件 @@ -60,14 +65,14 @@ implements RStatAreaAlarmCountMService{ //将单位信息转为map集合 key: 单位id value: 单位实体 Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); //获取主网id - DictData mainId = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); + String dataType = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); //条件组装: where org_no in (orgNoList) and data_date >= startTime and data_date <= endTime lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgNoList), RStatAreaAlarmCountM::getOrgNo, orgNoList) .ge(StringUtils.isNotBlank(startTime), RStatAreaAlarmCountM::getDataDate, startTime) .le(StringUtils.isNotBlank(endTime), RStatAreaAlarmCountM::getDataDate, endTime) - .eq(RStatAreaAlarmCountM::getDataType, mainId); + .eq(RStatAreaAlarmCountM::getDataType, dataType); //查询区域告警统计(月)集合 List records = this.list(lambdaQueryWrapper); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java similarity index 95% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java index 85369b56a..681b2bbd8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatBusbarHarmonicServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java @@ -1,20 +1,19 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; import com.njcn.device.pms.api.PmsGeneratrixClient; -import com.njcn.device.pms.mapper.RStatBusbarHarmonicMapper; +import com.njcn.device.pms.mapper.majornetwork.RStatBusbarHarmonicMapper; 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.pojo.param.UniversalFrontEndParam; import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO; import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO; -import com.njcn.device.pms.service.RStatBusbarHarmonicService; +import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -22,7 +21,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatZwAlarmCountWServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java similarity index 78% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatZwAlarmCountWServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java index f9afb4557..4e78b8817 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RStatZwAlarmCountWServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; @@ -7,12 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.device.pms.mapper.RStatZwAlarmCountWMapper; +import com.njcn.device.pms.mapper.majornetwork.RStatZwAlarmCountWMapper; import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam; -import com.njcn.device.pms.pojo.po.*; +import com.njcn.device.pms.pojo.po.Monitor; +import com.njcn.device.pms.pojo.po.RMpTargetWarnD; +import com.njcn.device.pms.pojo.po.RStatZwAlarmCountW; +import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.pojo.vo.ProblemMonitorDetailVO; import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO; -import com.njcn.device.pms.service.*; +import com.njcn.device.pms.service.distribution.RMpPwAlarmDetailDService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.device.pms.service.majornetwork.IStatationStatService; +import com.njcn.device.pms.service.majornetwork.RMpTargetWarnDService; +import com.njcn.device.pms.service.majornetwork.RStatZwAlarmCountWService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; @@ -134,21 +141,41 @@ implements RStatZwAlarmCountWService { LambdaQueryWrapper monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); monitorLambdaQueryWrapper.eq(Monitor::getOrgId, id); List orgMeasurementPointIdList = iMonitorService.list(monitorLambdaQueryWrapper).stream().map(Monitor::getId).collect(Collectors.toList()); - //以周为时间段，查询告警超过四次的监测点信息 - LambdaQueryWrapper alarmDetailWrapper = new LambdaQueryWrapper<>(); + //以周为时间段，查询告警超过四次的监测点信息 todo + LambdaQueryWrapper targetWarnWrapper = new LambdaQueryWrapper<>(); + targetWarnWrapper.select(RMpTargetWarnD::getMeasurementPointId) + .in(RMpTargetWarnD::getMeasurementPointId, orgMeasurementPointIdList) + .ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTime) + .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTime) + .groupBy(RMpTargetWarnD::getMeasurementPointId) + .or() //拼接or条件 + .eq(RMpTargetWarnD::getIsEffective, 1) //是否是有效接入监测点(0:否 1:是) + .eq(RMpTargetWarnD::getIsHarmonic, 1) //是否是稳态超标监测点(0:否 1:是) + .eq(RMpTargetWarnD::getIsEvent, 1) //是否是发生暂态的监测点(0:否 1:是) + .eq(RMpTargetWarnD::getIsWarn, 1) //是否是告警监测点数(0:否 1:是) + .eq(RMpTargetWarnD::getIsVDevWarn, 1) //电压偏差是否告警(0:否 1:是) + .eq(RMpTargetWarnD::getIsFreqWarn, 1) //频率偏差是否告警(0:否 1:是) + .eq(RMpTargetWarnD::getIsUnbalanceWarn, 1) //三相电压不平衡度是否告警(0:否 1:是) + .eq(RMpTargetWarnD::getIsVWarn, 1) //谐波电压是否告警(0:否 1:是) + .eq(RMpTargetWarnD::getIsFlickerWarn, 1) //闪变是否告警(0:否 1:是) + .eq(RMpTargetWarnD::getIsSagWarn, 1) //电压暂降是否告警(0:否 1:是) + .eq(RMpTargetWarnD::getIsInterruptWarn, 1) //短时中断是否告警(0:否 1:是) + .having("count(measurement_point_id) >= {0}", 4); + +// LambdaQueryWrapper alarmDetailWrapper = new LambdaQueryWrapper<>(); /* 组装查询条件：select count(1) from r_mp_pw_alarm_detail_d where data_date <= '2022-10-23' and data_date >= '2022-10-17' and measurement_point_id in (orgMeasurementPointIdList) group by measurement_point_id having count(measurement_point_id) >= 4 */ - alarmDetailWrapper.select(RMpPwAlarmDetailD::getMeasurementPointId) - .in(RMpPwAlarmDetailD::getMeasurementPointId, orgMeasurementPointIdList) - .ge(StringUtils.isNotBlank(startTime), RMpPwAlarmDetailD::getDataDate, startTime) - .le(StringUtils.isNotBlank(endTime), RMpPwAlarmDetailD::getDataDate, endTime) - .groupBy(RMpPwAlarmDetailD::getMeasurementPointId) - .having("count(measurement_point_id) >= {0}", 4); +// alarmDetailWrapper.select(RMpPwAlarmDetailD::getMeasurementPointId) +// .in(RMpPwAlarmDetailD::getMeasurementPointId, orgMeasurementPointIdList) +// .ge(StringUtils.isNotBlank(startTime), RMpPwAlarmDetailD::getDataDate, startTime) +// .le(StringUtils.isNotBlank(endTime), RMpPwAlarmDetailD::getDataDate, endTime) +// .groupBy(RMpPwAlarmDetailD::getMeasurementPointId) +// .having("count(measurement_point_id) >= {0}", 4); //告警超过四次的监测点idList - List measurementPointIdList = rMpPwAlarmDetailDService.listObjs(alarmDetailWrapper, Object::toString); + List measurementPointIdList = rMpTargetWarnDService.listObjs(targetWarnWrapper, Object::toString); // 计算问题严重的监测点 // 获取查询条件：月份开始时间、结束时间 @@ -159,12 +186,18 @@ implements RStatZwAlarmCountWService { int monthDay = Month.of(DateUtil.month(date)).getLastDay(DateUtil.isLeapYear(DateUtil.year(date))); //根据单位下监测点idList、月份条件查询监测点告警信息 - LambdaQueryWrapper targetWarnWrapper = new LambdaQueryWrapper<>(); - //组装查询条件： - targetWarnWrapper.in(RMpTargetWarnD::getMeasurementPointId, orgMeasurementPointIdList) - .ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTimeOfMonth) - .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTimeOfMonth); - List targetWarnDList = rMpTargetWarnDService.list(targetWarnWrapper); + List targetWarnDList; //告警超过四次 + if (CollUtil.isEmpty(measurementPointIdList)) { + targetWarnDList = new ArrayList<>(); + } else { + targetWarnWrapper.clear(); + //组装查询条件： + targetWarnWrapper.in(RMpTargetWarnD::getMeasurementPointId, orgMeasurementPointIdList) + .ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTimeOfMonth) + .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTimeOfMonth); + targetWarnDList = rMpTargetWarnDService.list(targetWarnWrapper); + } + //使用stream的分组方法（Collectors.partitioningBy()）对告警记录和没有告警的记录进行分组 true：有告警的记录 false：没有告警的记录 // Map> booleanListMap = targetWarnDList.stream().collect(Collectors.groupingBy( // item -> item.getIsEffective() == 1 || item.getIsHarmonic() == 1 || item.getIsEvent() == 1 || item.getIsWarn() == 1 @@ -203,6 +236,10 @@ implements RStatZwAlarmCountWService { .limit((int)Math.ceil(severityMap.size() * 0.3)).map(Map.Entry::getKey).collect(Collectors.toList()); //合并告警超过四次的监测点ids和严重程度前30%监测点dis measurementPointIdList.addAll(severity); + //如果问题严重监测点id集合是空的，那直接返回空集合 + if (CollUtil.isEmpty(measurementPointIdList)) { + return new ArrayList<>(); + } //去除集合中重复的监测点id，得到最终的有严重问题的监测点id集合 List lastMeasurementPointList = measurementPointIdList.stream().distinct().collect(Collectors.toList()); //根据监测点ids查询监测点信息 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RmpEventDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RmpEventDetailServiceImpl.java similarity index 81% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RmpEventDetailServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RmpEventDetailServiceImpl.java index db093e70a..7bad6a777 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/RmpEventDetailServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RmpEventDetailServiceImpl.java @@ -1,10 +1,10 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pms.mapper.RmpEventDetailMapper; +import com.njcn.device.pms.mapper.majornetwork.RmpEventDetailMapper; import com.njcn.device.pms.pojo.param.UniversalFrontEndParam; import com.njcn.device.pms.pojo.vo.RmpEventDetailVO; -import com.njcn.device.pms.service.RmpEventDetailService; +import com.njcn.device.pms.service.majornetwork.RmpEventDetailService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SourceManagementServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SourceManagementServiceImpl.java similarity index 67% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SourceManagementServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SourceManagementServiceImpl.java index 2718245e1..2350b0fa4 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SourceManagementServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SourceManagementServiceImpl.java @@ -1,8 +1,8 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.SourceManagementMapper; +import com.njcn.device.pms.mapper.majornetwork.SourceManagementMapper; import com.njcn.device.pms.pojo.po.SourceManagement; -import com.njcn.device.pms.service.ISourceManagementService; +import com.njcn.device.pms.service.majornetwork.ISourceManagementService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatationStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java similarity index 91% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatationStatServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java index 0dea3b711..81eff5416 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatationStatServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java @@ -1,12 +1,11 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.StatationStatMapper; +import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.StatationStatParam; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; -import com.njcn.device.pms.pojo.po.StatationStat; -import com.njcn.device.pms.service.IStatationStatService; +import com.njcn.device.pms.service.majornetwork.IStatationStatService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatisticsRunMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatisticsRunMonitorServiceImpl.java similarity index 67% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatisticsRunMonitorServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatisticsRunMonitorServiceImpl.java index 936a1aa5e..768f681a9 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/StatisticsRunMonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatisticsRunMonitorServiceImpl.java @@ -1,8 +1,8 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.StatisticsRunMonitorMapper; +import com.njcn.device.pms.mapper.majornetwork.StatisticsRunMonitorMapper; import com.njcn.device.pms.pojo.po.StatisticsRunMonitor; -import com.njcn.device.pms.service.IStatisticsRunMonitorService; +import com.njcn.device.pms.service.majornetwork.IStatisticsRunMonitorService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalEliminateDataServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalEliminateDataServiceImpl.java similarity index 67% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalEliminateDataServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalEliminateDataServiceImpl.java index 907521cc2..f061e7281 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalEliminateDataServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalEliminateDataServiceImpl.java @@ -1,8 +1,8 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.TerminalEliminateDataMapper; +import com.njcn.device.pms.mapper.majornetwork.TerminalEliminateDataMapper; import com.njcn.device.pms.pojo.po.TerminalEliminateData; -import com.njcn.device.pms.service.ITerminalEliminateDataService; +import com.njcn.device.pms.service.majornetwork.ITerminalEliminateDataService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java similarity index 55% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java index 59cf3002d..5dba48a52 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java @@ -1,18 +1,17 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; -import com.njcn.device.pms.mapper.TerminalMapper; +import com.njcn.device.pms.mapper.majornetwork.TerminalMapper; import com.njcn.device.pms.pojo.param.PmsTerminalParam; -import com.njcn.device.pms.pojo.po.Terminal; -import com.njcn.device.pms.pojo.vo.PmsTerminalVO; -import com.njcn.device.pms.service.ITerminalService; +import com.njcn.device.pms.pojo.po.PmsTerminal; +import com.njcn.device.pms.service.majornetwork.ITerminalService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.web.factory.PageFactory; +import com.njcn.web.pojo.param.BaseParam; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -27,17 +26,15 @@ import java.util.List; * @since 2022-10-14 */ @Service -public class TerminalServiceImpl extends ServiceImpl implements ITerminalService { +public class TerminalServiceImpl extends ServiceImpl implements ITerminalService { @Override - public Page getTerminalList(PmsTerminalParam.QueryParam queryParam) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("pms_terminal.status", DataStateEnum.DELETED.getCode()); - if(queryParam.getStatus().equals(1)){ - queryWrapper.eq("pms_terminal.status",1); - } + public Page getTerminalList(BaseParam baseParam) { + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + //初始化分页数据 - return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); + return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); } /** @@ -46,7 +43,7 @@ public class TerminalServiceImpl extends ServiceImpl i * @date 2022/10/27 */ @Override - public Terminal getTerminalById(String id) { + public PmsTerminal getTerminalById(String id) { return this.getById(id); } @@ -58,11 +55,11 @@ public class TerminalServiceImpl extends ServiceImpl i @Override public boolean add(PmsTerminalParam terminalParam) { checkName(terminalParam,true); - Terminal terminal = new Terminal(); - BeanUtils.copyProperties(terminalParam,terminal); + PmsTerminal pmsTerminal = new PmsTerminal(); + BeanUtils.copyProperties(terminalParam, pmsTerminal); //设为正常状态 - terminal.setStatus(DataStateEnum.ENABLE.getCode()); - return this.save(terminal); + pmsTerminal.setStatus(DataStateEnum.ENABLE.getCode()); + return this.save(pmsTerminal); } /** @@ -73,9 +70,9 @@ public class TerminalServiceImpl extends ServiceImpl i @Override public boolean update(PmsTerminalParam updateParam) { checkName(updateParam,false); - Terminal terminal = new Terminal(); - BeanUtils.copyProperties(updateParam,terminal); - return this.updateById(terminal); + PmsTerminal pmsTerminal = new PmsTerminal(); + BeanUtils.copyProperties(updateParam, pmsTerminal); + return this.updateById(pmsTerminal); } /** @@ -84,19 +81,19 @@ public class TerminalServiceImpl extends ServiceImpl i */ @Override public boolean delete(List ids) { - return this.lambdaUpdate().set(Terminal::getStatus, DataStateEnum.DELETED.getCode()).in(Terminal::getId, ids).update(); + return this.lambdaUpdate().set(PmsTerminal::getStatus, DataStateEnum.DELETED.getCode()).in(PmsTerminal::getId, ids).update(); } /** * 名称重复校验 */ private void checkName(PmsTerminalParam terminalParam, boolean flag){ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Terminal::getName,terminalParam.getName()); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PmsTerminal::getName,terminalParam.getName()); //修改 if(!flag){ if(terminalParam instanceof PmsTerminalParam){ - lambdaQueryWrapper.ne(Terminal::getId,terminalParam.getId()); + lambdaQueryWrapper.ne(PmsTerminal::getId,terminalParam.getId()); } } int result = this.count(lambdaQueryWrapper); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TractionStationServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TractionStationServiceImpl.java similarity index 64% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TractionStationServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TractionStationServiceImpl.java index 1c78942d2..9d4dbe82c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TractionStationServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TractionStationServiceImpl.java @@ -1,15 +1,18 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; -import com.njcn.device.pms.mapper.TractionStationMapper; +import com.njcn.device.pms.mapper.majornetwork.TractionStationMapper; +import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; +import com.njcn.device.pms.pojo.param.PmsTractionStationParam; import com.njcn.device.pms.pojo.param.TractionStationParam; import com.njcn.device.pms.pojo.po.TractionStation; -import com.njcn.device.pms.service.ITractionStationService; +import com.njcn.device.pms.service.majornetwork.ITractionStationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.web.pojo.param.BaseParam; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -17,17 +20,21 @@ import java.util.List; /** *

- * 服务实现类 + * 服务实现类 *

* * @author hongawen * @since 2022-10-14 */ @Service +@RequiredArgsConstructor public class TractionStationServiceImpl extends ServiceImpl implements ITractionStationService { + private final TractionStationMapper tractionStationMapper; + /** * 查询牵引站列表 + * * @param baseParam * @return */ @@ -38,6 +45,7 @@ public class TractionStationServiceImpl extends ServiceImpl + * @author yzh + * @date 2022/11/8 + */ + @Override + public List getPmsTractionStationInfo(PmsTractionStationParam param) { + return tractionStationMapper.getPmsTractionStationInfo(param); + } + /** * 名称重复校验 */ - private void checkName(TractionStationParam tractionStationParam, boolean flag){ + private void checkName(TractionStationParam tractionStationParam, boolean flag) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(TractionStation::getName,tractionStationParam.getName()); + lambdaQueryWrapper.eq(TractionStation::getName, tractionStationParam.getName()); //修改 - if(!flag){ - if(tractionStationParam instanceof TractionStationParam){ - lambdaQueryWrapper.ne(TractionStation::getId,tractionStationParam.getId()); + if (!flag) { + if (tractionStationParam instanceof TractionStationParam) { + lambdaQueryWrapper.ne(TractionStation::getId, tractionStationParam.getId()); } } int result = this.count(lambdaQueryWrapper); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TransientStasticDataServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransientStasticDataServiceImpl.java similarity index 67% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TransientStasticDataServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransientStasticDataServiceImpl.java index 280b2a503..d665382ad 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TransientStasticDataServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransientStasticDataServiceImpl.java @@ -1,8 +1,8 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.TransientStasticDataMapper; +import com.njcn.device.pms.mapper.majornetwork.TransientStasticDataMapper; import com.njcn.device.pms.pojo.po.TransientStasticData; -import com.njcn.device.pms.service.ITransientStasticDataService; +import com.njcn.device.pms.service.majornetwork.ITransientStasticDataService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TreatTransientDetailDataServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TreatTransientDetailDataServiceImpl.java similarity index 67% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TreatTransientDetailDataServiceImpl.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TreatTransientDetailDataServiceImpl.java index 8b1b9dd11..a38f2ef00 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/TreatTransientDetailDataServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TreatTransientDetailDataServiceImpl.java @@ -1,8 +1,8 @@ -package com.njcn.device.pms.service.impl; +package com.njcn.device.pms.service.majornetwork.impl; -import com.njcn.device.pms.mapper.TreatTransientDetailDataMapper; +import com.njcn.device.pms.mapper.majornetwork.TreatTransientDetailDataMapper; import com.njcn.device.pms.pojo.po.TreatTransientDetailData; -import com.njcn.device.pms.service.ITreatTransientDetailDataService; +import com.njcn.device.pms.service.majornetwork.ITreatTransientDetailDataService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/monitor/ITimes.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/monitor/ITimes.java index 1b9a62ed2..c907a4330 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/monitor/ITimes.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/monitor/ITimes.java @@ -1,7 +1,6 @@ package com.njcn.harmonic.pojo.excel.monitor; import cn.afterturn.easypoi.excel.annotation.Excel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/substation/SubstationExcel.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/substation/SubstationExcel.java index cf88b10be..5191bccdc 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/substation/SubstationExcel.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/substation/SubstationExcel.java @@ -1,7 +1,6 @@ package com.njcn.harmonic.pojo.excel.substation; import cn.afterturn.easypoi.excel.annotation.Excel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java index 215d581ed..be358ad7d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatOrgParam.java @@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.param; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.util.List; @@ -25,4 +24,13 @@ public class RStatOrgParam extends StatisticsBizBaseParam { @ApiModelProperty(name = "powerrIds",value = "变电站id") private List powerrIds; + @Data + public static class PwRStatOrgParam extends RStatOrgParam{ + + @ApiModelProperty(name = "monitorSort", value = "监测点类别") + private List monitorSort; + + @ApiModelProperty(name = "voltageLevels", value = "电压等级") + private List voltageLevels; + } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java index 7e0366801..0a7a19bd1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIMagReportD.java @@ -1,14 +1,12 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; - import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * 稳态监测点指标日报-日表(主配网表) /各次谐波电流有效值 * @author jianghf @@ -1071,4 +1069,4 @@ public class RMpHarmonicIMagReportD implements Serializable { private Double harmonicCurrentEffective5095; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java index e1440efd3..3f3e42248 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicIRateReportD.java @@ -1,14 +1,12 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -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 r_mp_harmonic_i_rate_report_d @@ -1026,4 +1024,4 @@ public class RMpHarmonicIRateReportD implements Serializable { private Double i50Cp95; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java index 72150bb77..d29f83aee 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java @@ -1,14 +1,12 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; - import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * * 稳态监测点指标日报-日表(主配网表) /各次谐波电压含有率 @@ -1072,4 +1070,4 @@ public class RMpHarmonicVRateReportD implements Serializable { private Double harmonicVoltageContent5095; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java index a45c9ecf4..9c2653835 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicIRateReportD.java @@ -1,15 +1,12 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -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 r_mp_inharmonic_i_rate_report_d @@ -1027,4 +1024,4 @@ public class RMpInharmonicIRateReportD implements Serializable { private Double inharmI50Cp95; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java index a3b42cd62..74408f3aa 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java @@ -1,17 +1,14 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -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 r_mp_inharmonic_v_rate_report_d */ @TableName(value ="r_mp_inharmonic_v_rate_report_d") @@ -1047,4 +1044,4 @@ public class RMpInharmonicVRateReportD implements Serializable { private Double inharmV50Cp95; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java index 4c2b0d055..937c28a17 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java @@ -1,17 +1,14 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -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 r_mp_measure_phase_report_d */ @TableName(value ="r_mp_measure_phase_report_d") @@ -249,4 +246,4 @@ public class RMpMeasurePhaseReportD implements Serializable { private Double spFundamentalPowerFactor95; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java index f7d2e87a6..aeee5a55c 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java @@ -1,17 +1,11 @@ package com.njcn.harmonic.pojo.po; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import javax.validation.constraints.NotNull; - -import java.io.Serializable; - -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.hibernate.validator.constraints.Length; + +import java.io.Serializable; +import java.util.Date; /** * 【稳态监测点非谐波不带相位指标日报-日表】 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java index 6763ae5ac..f46b17531 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailD.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java index 8cf5e73e2..a7cb37926 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java index 6a88e1312..be7e9c8b7 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java index 5e1206950..daedff7f6 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java index 57482b04f..be8b96ace 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java index b0cf41b74..fa636994d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java index f89784c4e..1afdd593d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java index 2e9e57c85..bf7c7ae41 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/10/10 19:59【需求编号】 @@ -20,6 +20,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 谐波畸变率排名 */ @@ -58,4 +59,4 @@ public class RMpVThd implements Serializable { private Double vThd; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java index 17d01b63a..86533a72b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java index 927dca5d3..eef08d127 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java index ae5ff048b..b6c6b18ac 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java index cb1e48b93..48bb2f195 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java index 2f873023e..35db0cf34 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java index ba331eb7a..72ef74ce0 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java index 988796a9b..86738b70e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java @@ -1,15 +1,16 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 区域分类统计月表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java index 8d8e8ea2a..956a8a997 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java @@ -1,15 +1,16 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 区域分类统计季表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java index 7956b9ed2..a29604a8f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java @@ -1,15 +1,16 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *

* 区域分类统计年表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java index 8b95e6cb1..82d5eecae 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:27【需求编号】 @@ -20,6 +20,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 单位污区图统计日表 */ @@ -58,4 +59,4 @@ public class RStatPollutionOrgDPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java index dd25158ce..6106d18ee 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/3 10:18【需求编号】 @@ -20,6 +20,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 单位污区图统计月表 */ @@ -58,4 +59,4 @@ public class RStatPollutionOrgMPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java index 34a71fa21..eb651db42 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:27【需求编号】 @@ -21,6 +20,7 @@ import lombok.NoArgsConstructor; * @author clam * @version V1.0.0 */ + /** * 单位污区图统计季表 */ @@ -59,4 +59,4 @@ public class RStatPollutionOrgQPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java index 44fc2c38d..8e876bada 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:28【需求编号】 @@ -21,6 +20,7 @@ import lombok.NoArgsConstructor; * @author clam * @version V1.0.0 */ + /** * 单位污区图统计年表 */ @@ -59,4 +59,4 @@ public class RStatPollutionOrgYPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java index 4fc3cc462..f9ee65654 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:28【需求编号】 @@ -21,6 +20,7 @@ import lombok.NoArgsConstructor; * @author clam * @version V1.0.0 */ + /** * 变电站污区图统计日表 */ @@ -59,4 +59,4 @@ public class RStatPollutionSubstationDPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java index 2936a93d6..5aec94dab 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:28【需求编号】 @@ -21,6 +20,7 @@ import lombok.NoArgsConstructor; * @author clam * @version V1.0.0 */ + /** * 变电站污区图统计季表 */ @@ -59,4 +59,4 @@ public class RStatPollutionSubstationQPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java index e46ffc5ff..d1978e1ee 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:28【需求编号】 @@ -21,6 +20,7 @@ import lombok.NoArgsConstructor; * @author clam * @version V1.0.0 */ + /** * 变电站污区图统计年表 */ @@ -59,4 +59,4 @@ public class RStatPollutionSubstationYPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java index e276aaad3..81386b6c1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java @@ -1,14 +1,14 @@ package com.njcn.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** - * + * * @TableName r_stat_pw_permeability_m */ @TableName(value ="r_stat_pw_permeability_m") @@ -79,4 +79,4 @@ public class RStatPwPermeabilityM implements Serializable { private String permeabilityType; -} \ No newline at end of file +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java index ea73dddc4..f3c89aede 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java index 5d1ee2efe..8213b4d56 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java index bb0933d4f..9bce4f285 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java index 0fe743cd2..f002c4289 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDate; + /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java index 252a8e184..ba06f5f52 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java @@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.vo; import lombok.Data; import java.io.Serializable; -import java.time.LocalDateTime; /** * @author denghuajun diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java index 47e43e6eb..618f45e03 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.List; -import java.util.Objects; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java index a01630fd4..28a6b558d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.List; -import java.util.Objects; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java index ec958e1a1..dbe6ce943 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.time.LocalTime; -import java.util.ArrayList; import java.util.List; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java index 672e8f05a..a4c00db08 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java @@ -6,9 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java index b664fcb07..3f5dc50e1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * @Title PwRMpBenchmarkLevelVO diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRStatOrgVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRStatOrgVO.java index b3764dfbb..7582181b5 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRStatOrgVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRStatOrgVO.java @@ -20,7 +20,7 @@ public class PwRStatOrgVO { private String orgName; @ApiModelProperty(value = "监测点类别") - private String measurementTypeClass; + private String monitorSort; @ApiModelProperty(value = "在线监测点数") private String allCount; @@ -34,4 +34,19 @@ public class PwRStatOrgVO { @ApiModelProperty(value = "闪变合格率") private Float flickerPassRate; + @Data + public static class PwRStatOrgDetailVO extends PwRStatOrgVO { + + @ApiModelProperty(value = "监测点ID") + private String measurementPointId; + + @ApiModelProperty(value = "监测点名称") + private String measurementPointName; + + @ApiModelProperty(value = "监测点电压等级名称") + private String monitorVoltageName; + + @ApiModelProperty(value = "电站名称") + private String powerName; + } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java index 997e3e086..2a5809ed8 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java @@ -1,8 +1,8 @@ package com.njcn.harmonic.pojo.vo; import lombok.Data; - import org.influxdb.dto.QueryResult; + import java.io.Serializable; import java.util.List; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java index 0f693bec9..8eaf8d47e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java @@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.vo; import com.njcn.harmonic.pojo.po.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.json.JSONObject; import java.io.Serializable; import java.util.Map; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java index a00b9f6ee..11639678a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java @@ -3,8 +3,6 @@ package com.njcn.harmonic.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDate; - /** * <功能描述> * diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java index e9e1b9960..5d2ea744e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java @@ -1,7 +1,5 @@ package com.njcn.harmonic.pojo.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -215,4 +213,13 @@ public class RMpPartHarmonicDetailVO { @ApiModelProperty(value = "闪变超标天数") private Integer flickerOverDay; + + @Data + public static class PwRMpPartHarmonicDetailDVO extends RMpPartHarmonicDetailVO { + /** + * 监测点类别 + */ + @ApiModelProperty(name = "monitorSort", value = "监测点类别") + private String monitorSort; + } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java index 84c7f6c9b..395843c2f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java @@ -1,15 +1,7 @@ package com.njcn.harmonic.pojo.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.time.LocalDate; /** *

diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java index 241f86401..6c4b01171 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java @@ -3,7 +3,6 @@ package com.njcn.harmonic.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java index cc83118d3..dad430a96 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java @@ -46,6 +46,9 @@ public class RStatOrgVO { public static class PwRStatOrgVO extends RStatOrgVO{ @ApiModelProperty(value = "单位id") private String orgNo; + + @ApiModelProperty(value = "监测点类别") + private String monitorSort; } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java index 0bf5248ff..bb1929a2b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java @@ -82,11 +82,7 @@ public class RStatSubstationOrg2VO implements Serializable { @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比") private Integer harmonicMeasurementRatioAccrued; - /** - * 暂态指标类型Id，字典表ID - */ - @ApiModelProperty(name = "eventType", value = "暂态指标类型Id，字典表ID") - private String harmonicType; + /** * 频率偏差 @@ -207,6 +203,14 @@ public class RStatSubstationOrg2VO implements Serializable { private Integer sameAccrued8; private Float averageOverDay8; + @Data + public static class PwRStatSubstationOrgVO extends RStatSubstationOrg2VO { + /** + * 监测点类别 + */ + @ApiModelProperty(name = "monitorSort", value = "监测点类别") + private String monitorSort; + } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java index a7877f467..8df2219b2 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.pojo.vo; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java index 0c8705c6b..550b62d4c 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java @@ -26,7 +26,7 @@ import java.util.List; @Component public class HarmonicComAssesUtil { // 日志记录 - private static final Logger logger = LoggerFactory.getLogger(com.njcn.harmonic.utils.HarmonicComAssesUtil.class); + private static final Logger logger = LoggerFactory.getLogger(HarmonicComAssesUtil.class); private static final int ST_QT_NUM = 6;//系统评价指标数目 private static final int GRADE_NUM = 5;//指标分级数目 private static final int METHOD_NUM = 5;//评估方法数 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java index 4c995bab6..f43830c72 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java @@ -4,6 +4,7 @@ package com.njcn.harmonic.controller.distribution; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.harmonic.pojo.param.RStatOrgParam; @@ -35,12 +36,7 @@ import java.util.List; public class PwRStatOrgController extends BaseController { private final PwRStatOrgService pwRStatOrgService; - private final RStatOrgYService rStatOrgYService; - private final RStatOrgBusbarVoltageService rStatOrgBusbarVoltageService; - private final RStatLoadTypeService rStatLoadTypeService; - private final RMpPartHarmonicDetailMService rMpPartHarmonicDetailMService; private final RMpPartHarmonicDetailDService rMpPartHarmonicDetailDService; - private final RMpPassRateService rMpPassRateService; /** @@ -56,118 +52,75 @@ public class PwRStatOrgController extends BaseController { } -// /** -// * 区域稳态指标超标分类统计表 -// */ -// @GetMapping("/getPwRStatSubstation") -// @OperateInfo(info = LogEnum.BUSINESS_COMMON) -// @ApiOperation("区域稳态指标超标分类统计表") -// public HttpResult> getRStatSubstation(StatisticsBizBaseParam param) { -// String methodDescribe = getMethodDescribe("getRStatSubstation"); -// List statSubstationIcon = rStatOrgYService.getRStatSubstationOrg(param); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe); -// } -// -// /** -// * 区域稳态指标超标分类统计表 -// */ -// @PostMapping("/getRStatOrgBusbarVoltage") -// @OperateInfo(info = LogEnum.BUSINESS_COMMON) -// @ApiOperation("区域电站母线电压类指标超标计") -// public HttpResult> getRStatOrgBusbarVoltage(@RequestBody StatSubstationBizBaseParam param) { -// String methodDescribe = getMethodDescribe("getRStatOrgBusbarVoltage"); -// List statSubstationIcon = rStatOrgBusbarVoltageService.getRStatOrgBusbarVoltage(param); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe); -// } -// -// /** -// * 区域干扰源电流类指标超标统计 -// * -// * @param param -// * @return -// */ -// @GetMapping("/getRStatLoadType") -// @OperateInfo(info = LogEnum.BUSINESS_COMMON) -// @ApiOperation("区域干扰源电流类指标超标统计") -// public HttpResult> getRStatLoadType(StatisticsBizBaseParam param) { -// String methodDescribe = getMethodDescribe("getRStatLoadType"); -// List rStatLoadType = rStatLoadTypeService.getRStatLoadType(param); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatLoadType, methodDescribe); -// } -// -// /** -// * 变电站（换流站）稳态指标超标分类统计表 -// * -// * @param param -// * @return -// */ -// @PostMapping("/getRStatSubstationOrg") -// @OperateInfo(info = LogEnum.BUSINESS_COMMON) -// @ApiOperation("变电站（换流站）稳态指标超标分类统计表") -// public HttpResult> getRStatSubstationOrg(@RequestBody StatSubstationBizBaseParam param -// ) { -// String methodDescribe = getMethodDescribe("getRStatSubstationOrg"); -// List rStatOrg = rStatOrgYService.getRStatSubstation(param); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe); -// } -// -// /** -// * 稳态指标超标明细表 -// * -// * @param param -// * @return -// */ -// @PostMapping("/getRMpPartHarmonicDetail") -// @OperateInfo(info = LogEnum.BUSINESS_COMMON) -// @ApiOperation("稳态指标超标明细表") -// public HttpResult> getRMpPartHarmonicDetail(@RequestBody RStatOrgParam param) { -// String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetail"); -// List rMpPartHarmonicDetail = rMpPartHarmonicDetailMService.getRMpPartHarmonicDetail(param); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe); -// } -// -// /** -// * 稳态指标超标明细表-指标趋势图 -// * -// * @param param -// * @return -// */ -// @GetMapping("/getRMpPartHarmonicDetailIcon") -// @OperateInfo(info = LogEnum.BUSINESS_COMMON) -// @ApiOperation("稳态指标超标明细表-指标趋势图") -// public HttpResult> getRMpPartHarmonicDetailIcon(StatisticsBizBaseParam param) { -// String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon"); -// List rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe); -// } + /** + * 配网区域稳态指标超标分类统计表 + */ + @PostMapping("/getPwRStatSubstation") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("区域稳态指标超标分类统计表") + public HttpResult> getPwRStatSubstation(@RequestBody StatSubstationBizBaseParam param) { + String methodDescribe = getMethodDescribe("getPwRStatSubstation"); + List statSubstationIcon = pwRStatOrgService.getRStatSubstationOrg(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe); + } /** - * 区域稳态指标合格率统计表-主网（稳态指标合格率统计） + * 配网稳态指标超标明细表 * * @param param * @return */ - @GetMapping("/getPwRStatOrgIndex") + @PostMapping("/getPwRMpPartHarmonicDetail") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("稳态指标超标明细表") + public HttpResult> getPwRMpPartHarmonicDetail(@RequestBody StatSubstationBizBaseParam param) { + String methodDescribe = getMethodDescribe("getPwRMpPartHarmonicDetail"); + List rMpPartHarmonicDetail = pwRStatOrgService.getRMpPartHarmonicDetail(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe); + } + + /** + * 配网稳态指标超标明细表-指标趋势图 + * + * @param param + * @return + */ + @PostMapping("/getRMpPartHarmonicDetailIcon") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("稳态指标超标明细表-指标趋势图") + public HttpResult> getRMpPartHarmonicDetailIcon(@RequestBody StatisticsBizBaseParam param) { + String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon"); + List rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe); + } + + /** + * 配网区域稳态指标合格率统计表-配网（稳态指标合格率统计） + * + * @param param、 + * @return + */ + @PostMapping("/getPwRStatOrgIndex") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("区域稳态指标合格率统计表") - public HttpResult>getRStatOrgIndex(StatSubstationBizBaseParam param) { - String methodDescribe = getMethodDescribe("getRStatOrgIndex"); + public HttpResult> getPwRStatOrgIndex(@RequestBody StatSubstationBizBaseParam param) { + String methodDescribe = getMethodDescribe("getPwRStatOrgIndex"); List rStatOrg = pwRStatOrgService.getRStatOrgIndex(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe); } /** - * 区域稳态指标合格率统计表-主网（稳态指标合格率统计） + * 区域稳态指标合格率统计表-配网（稳态指标合格率统计） * * @param param * @return */ - @PostMapping("/getRMpPassRateInfo") + @PostMapping("/getPwRMpPassRateInfo") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("稳态指标合格率明细表") - public HttpResult> getRMpPassRateInfo(@RequestBody RStatOrgParam param) { - String methodDescribe = getMethodDescribe("getRMpPassRateInfo"); - List rStatOrg = rMpPassRateService.getRMpPassRateInfo(param); + public HttpResult> getPwRMpPassRateInfo(@RequestBody RStatOrgParam.PwRStatOrgParam param) { + String methodDescribe = getMethodDescribe("getPwRMpPassRateInfo"); + List rStatOrg = pwRStatOrgService.getRMpPassRateInfo(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatOrg, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml index 26626bdb1..8e4044d63 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml @@ -1,6 +1,6 @@ - + - - - - - - + + + + + + SELECT - T3.*, - T5.id area, - T5.name areaName + T3.*, + T5.id area, + T5.NAME areaName FROM - ( - SELECT - @codes AS _ids, - ( - SELECT @codes := GROUP_CONCAT( id ) FROM sys_dept WHERE FIND_IN_SET( pid, @codes ) ) AS T1 - FROM - sys_dept s, - ( SELECT @codes := #{id} ) T4 - WHERE - @codes IS NOT NULL - - AND s.type in - - #{item} - - - ) T2, - sys_dept T3, - sys_area T5 + sys_dept T3, + sys_area T5 WHERE - FIND_IN_SET( T3.id, T2._ids ) - AND t3.area = t5.id - AND t3.State = 1 + FIND_IN_SET( #{id}, T3.pids ) + and t3.type in + + #{item} + + AND t3.area = t5.id + AND t3.State = 1 + UNION + SELECT + T3.*, + T5.id area, + T5.NAME areaName + FROM + sys_dept T3, + sys_area T5 + WHERE + t3.area = t5.id + and T3.id = #{id} + AND t3.State = 1 SELECT - T3.id, - T3.pid, - T3.pids, - T3.NAME, - T3.type, - T5.NAME area , - T3.Remark, - T3.sort + T3.id, + T3.pid, + T3.pids, + T3.NAME, + T3.code, + T3.type, + T5.NAME area , + T3.Remark, + T3.sort FROM - ( - SELECT - @codes AS _ids, - ( - SELECT @codes := GROUP_CONCAT( id ) FROM sys_dept WHERE FIND_IN_SET( pid, @codes ) ) AS T1 - FROM - sys_dept s, - ( SELECT @codes := #{id} ) T4 - WHERE - @codes IS NOT NULL - - AND s.type in - - #{item} - - - ) T2, - sys_dept T3, - sys_area T5 + ( + SELECT + @codes AS _ids, + ( + SELECT @codes := GROUP_CONCAT( id ) FROM sys_dept WHERE FIND_IN_SET( pid, @codes ) ) AS T1 + FROM + sys_dept s, + ( SELECT @codes := #{id} ) T4 WHERE - FIND_IN_SET( T3.id, T2._ids ) - AND t3.area = t5.id - AND t3.State = 1 + @codes IS NOT NULL + + AND s.type in + + #{item} + + + ) T2, + sys_dept T3, + sys_area T5 + WHERE + FIND_IN_SET( T3.id, T2._ids ) + AND t3.area = t5.id + AND t3.State = 1 Order by T3.sort asc