diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java index 5460f0b5f..71a6315db 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java @@ -23,8 +23,6 @@ public interface ServerInfo { String USER = "user-boot"; String JOB = "job-admin"; String QUALITY = "quality-boot"; - String HARMONIC_PREPARE = "harmonic-prepare"; - String EVENT_PREPARE = "event-prepare"; String PROCESS = "process-boot"; String PREPARE_BOOT = "prepare-boot"; diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java index 6c7bd1f9a..99d34733c 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/exception/BusinessException.java @@ -80,4 +80,8 @@ public class BusinessException extends RuntimeException { this.result = result; } + public BusinessException(String message) { + super(message); + this.message = message; + } } diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java b/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java index b9fe9076b..85eb8d4b6 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssRequestWrapper.java @@ -34,7 +34,7 @@ import java.util.stream.Stream; @Slf4j public class XssRequestWrapper extends HttpServletRequestWrapper { - private final static String[] WHITE_PARAMETER_NAME = {"password", "mxContent", "docContent", "bgImage"}; + private final static String[] WHITE_PARAMETER_NAME = {"password", "mxContent", "docContent", "bgImage","fileContent"}; public XssRequestWrapper(HttpServletRequest request) { diff --git a/pqs-device/common-device-biz/pom.xml b/pqs-device/common-device-biz/pom.xml index 34b1f8e28..191b423a8 100644 --- a/pqs-device/common-device-biz/pom.xml +++ b/pqs-device/common-device-biz/pom.xml @@ -43,6 +43,11 @@ org.influxdb influxdb-java + + com.njcn + system-api + ${project.version} + - \ No newline at end of file + diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java index 1fddf65f1..daf341de7 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java @@ -1,30 +1,43 @@ package com.njcn.device.biz.utils; + +import com.njcn.system.enums.DicDataEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; +import java.math.RoundingMode; + + +@Component 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 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, + 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, + 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 final double[][] ARR = { + {78, 62, 39, 62, 26, 44, 19, 21, 16, 28, 13, 24, 11, 12, 9.7, 18, 8.6, 16, 7.8, 8.9, 7.1, 14, 6.5, 12, 6.0, 6.9, 5.6, 11, 5.2, 10, 4.9, 5.6, 4.6, 8.9, 4.3, 8.4, 4.1, 4.8, 3.9, 7.6, 3.7, 7.2, 3.5, 4.1, 3.4, 6.6, 3.3, 6.3, 3.1}, + {43, 34, 21, 34, 14, 24, 11, 11, 8.5, 16, 7.1, 13, 6.1, 6.8, 5.3, 10, 4.7, 9, 4.3, 4.9, 3.9, 7.4, 3.6, 6.8, 3.3, 3.8, 3.1, 5.9, 2.9, 5.5, 2.7, 3.1, 2.5, 4.9, 2.4, 4.6, 2.3, 2.6, 2.2, 4.1, 2.0, 4.0, 2.0, 2.3, 1.9, 3.6, 1.8, 3.5, 1.7}, + {26, 20, 13, 20, 8.5, 15, 6.4, 6.8, 5.1, 9.3, 4.3, 7.9, 3.7, 4.1, 3.2, 6, 2.8, 5.4, 2.6, 2.9, 2.3, 4.5, 2.1, 4.1, 2.0, 2.2, 1.9, 3.4, 1.7, 3.2, 1.6, 1.8, 1.5, 2.9, 1.4, 2.7, 1.4, 1.5, 1.3, 2.4, 1.2, 2.3, 1.2, 1.3, 1.1, 2.1, 1.1, 2.0, 1.0}, + {15, 12, 7.7, 12, 5.1, 8.8, 3.8, 4.1, 3.1, 5.6, 2.6, 4.7, 2.2, 2.5, 1.9, 3.6, 1.7, 3.2, 1.5, 1.8, 1.4, 2.7, 1.3, 2.5, 1.2, 1.3, 1.1, 2.1, 1.0, 1.9, 0.9, 1.1, 0.9, 1.7, 0.8, 1.6, 0.8, 0.9, 0.8, 1.5, 0.7, 1.4, 0.7, 0.8, 0.7, 1.3, 0.6, 1.2, 0.6}, + {16, 13, 8.1, 13, 5.4, 9.3, 4.1, 4.3, 3.3, 5.9, 2.7, 5, 2.3, 2.6, 2, 3.8, 1.8, 3.4, 1.6, 1.9, 1.5, 2.8, 1.4, 2.6, 1.2, 1.4, 1.1, 2.2, 1.1, 2.1, 1.0, 1.2, 0.9, 1.9, 0.9, 1.8, 0.8, 1.0, 0.8, 1.6, 0.8, 1.5, 0.7, 0.9, 0.7, 1.4, 0.7, 1.3, 0.6}, + {12, 9.6, 6, 9.6, 4, 6.8, 3, 3.2, 2.4, 4.3, 2, 3.7, 1.7, 1.9, 1.5, 2.8, 1.3, 2.5, 1.2, 1.4, 1.1, 2.1, 1, 1.9, 0.9, 1.1, 0.9, 1.7, 0.8, 1.5, 0.8, 0.9, 0.7, 1.4, 0.7, 1.3, 0.6, 0.7, 0.6, 1.2, 0.6, 1.1, 0.5, 0.6, 0.5, 1.0, 0.5, 1.0, 0.5} }; + 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 }; @@ -39,12 +52,10 @@ public class COverlimit { private static float GetVoltageLimit(int nHarm, int iScaleSelect)//谐波含有率 { - if (nHarm < 0) { + if (nHarm < 0) return 0.0f; - } - if (iScaleSelect >= MAX_SCALE_NO) { + if (iScaleSelect >= MAX_SCALE_NO) return 0.0f; - } switch (iScaleSelect) { case 6: iScaleSelect = 4; @@ -56,16 +67,13 @@ public class COverlimit { iScaleSelect = 0; break; } - if (iScaleSelect < 2) { + if (iScaleSelect < 2) iScaleSelect = 0; - } - else { + else iScaleSelect--; - } int nSelect = iScaleSelect * 4 + 1; - if (nHarm % 2 == 0) { + if (nHarm % 2 == 0) nSelect = iScaleSelect * 4 + 2; - } return fULimit[nSelect]; } @@ -85,21 +93,18 @@ public class COverlimit { iScaleSelect = 0; break; } - if (iScaleSelect < 2) { + if (iScaleSelect < 2) iScaleSelect = 0; - } - else { + else iScaleSelect--; - } int nSelect = iScaleSelect * 4; return fULimit[nSelect]; } private static float GetVoltageDevationLimit(int iScaleSelect)//电压偏差 { - if (iScaleSelect >= MAX_SCALE_NO) { + if (iScaleSelect >= MAX_SCALE_NO) return 0.0f; - } switch (iScaleSelect) { case 6: iScaleSelect = 4; @@ -111,132 +116,165 @@ public class COverlimit { iScaleSelect = 0; break; } - if (iScaleSelect < 2) { + if (iScaleSelect < 2) iScaleSelect = 0; - } - else { + else iScaleSelect--; - } int nSelect = iScaleSelect * 4 + 3; return fULimit[nSelect]; } private static float GetVoltageDevationLimit_L(int iScaleSelect)//电压偏差负数 { - if (iScaleSelect >= MAX_SCALE_NO) { + if (iScaleSelect >= MAX_SCALE_NO) return 0.0f; - } int nReturn = 0; - if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6) { + if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6) nReturn = 1; - } - else if (iScaleSelect == -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; + private static float GetCurrentLimit(int nHarm, String voltageLevel, float fDLRL, float fJZRL, float fXYRL, float fSBRL) { + Double tag = getHarmTag(nHarm,voltageLevel); + Double limit = getHarmonicLimit(nHarm,tag,new BigDecimal(String.valueOf(fSBRL)).doubleValue(),new BigDecimal(String.valueOf(fXYRL)).doubleValue()); + BigDecimal bigDecimal = new BigDecimal(limit).setScale(4,RoundingMode.HALF_UP); + return bigDecimal.floatValue(); } - 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); + + //电流谐波限值 + private static Double getHarmTag(Integer iCount, String voltageLevel) { + int x, y; + if (DicDataEnum.KV038.getName().equalsIgnoreCase(voltageLevel) || DicDataEnum.V380.getName().equalsIgnoreCase(voltageLevel) || DicDataEnum.V400.getName().equalsIgnoreCase(voltageLevel) || DicDataEnum.KV04.getName().equalsIgnoreCase(voltageLevel)) { + x = 0; + } else if (DicDataEnum.KV6.getName().equalsIgnoreCase(voltageLevel)) { + x = 1; + } else if (DicDataEnum.KV10.getName().equalsIgnoreCase(voltageLevel) || DicDataEnum.KV20.getName().equalsIgnoreCase(voltageLevel)) { + x = 2; + } else if (DicDataEnum.KV35.getName().equalsIgnoreCase(voltageLevel)) { + x = 3; + } else if (DicDataEnum.KV66.getName().equalsIgnoreCase(voltageLevel)) { + x = 4; + } else { + x = 5; + } + y = iCount - 2; + return ARR[x][y]; } - public static float GetInHarm(int i, int iScaleSelect){ - if(iScaleSelect == 5){ - return InharmLimit1[i]; - }else{ - return InharmLimit2[i]; - } + ; + + public static Double getHarmonicLimit(Integer times, double iTag, double supply, double user) { + if (supply == 0) { + return 0.0; + } + double coefficient = 2.0; + if (times == 3) { + coefficient = 1.1; + } else if (times == 5) { + coefficient = 1.2; + } else if (times == 7) { + coefficient = 1.4; + } else if (times == 11) { + coefficient = 1.8; + } else if (times == 13) { + coefficient = 1.9; + } + BigDecimal bd = new BigDecimal(iTag * Math.pow((user / supply), (1 / coefficient))); + bd = bd.setScale(2, RoundingMode.HALF_UP); + return Double.parseDouble(bd.toString()); + } + + + + + 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; + case "500kV": + uL = 520.0f; + break; + case "515kV": + uL = 535.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")) { + if (strScale.equals("110kV")) return 1; - } - else if (strScale.equals("35kV") || strScale.equals("66kV")) { + else if (strScale.equals("35kV") || strScale.equals("66kV")) return 2; - } - else if (strScale.equals("10kV")) { + else if (strScale.equals("10kV")) return 3; - } - else if (strScale.equals("6kV")) { + else if (strScale.equals("6kV")) return 4; - } - else if (strScale.equals("0.38kV")) { + else if (strScale.equals("0.38kV")) return 5; - } - else if (strScale.equals("20kV")) { + else if (strScale.equals("20kV")) return 6; - } - else if (strScale.equals("220kV")) { + else if (strScale.equals("220kV") || strScale.equals("500kV")) return -1; - } + return 0; } + + /*单独处理闪变的*/ + public static float dealFlickerByScale(String strScale) { + if (strScale.equals("110kV") || strScale.equals("35kV") || strScale.equals("66kV") || strScale.equals("10kV") || strScale.equals("6kV") || strScale.equals("0.38kV") || strScale.equals("20kV")) { + return 1.0f; + } else if (strScale.equals("220kV") || strScale.equals("500kV")) { + return 0.8f; + } else { + return 1.0f; + } + } + + public static float[] GetOverLimit(String strScale, float fDLRL, float fJZRL, float fXYRL, float fSBRL) { int i = 0; @@ -250,52 +288,32 @@ public class COverlimit { //电压不平衡 fLimit[2] = 2.0f; //闪变 - if (nScale < 2) { - fLimit[3] = 1.0f; - } - else { - fLimit[3] = 0.8f; - } + fLimit[3] = dealFlickerByScale(strScale); //畸变率 fLimit[4] = GetVoltageJBLimit(nScale); //24谐波电压幅值 - for (i = 0; i < 24; i++) { + 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); - } + for (i = 0; i < 24; i++) + fLimit[5 + 24 + i] = GetCurrentLimit(i+2, strScale, fDLRL, fJZRL, fXYRL, fSBRL); /**************************** * Modify by yexb 20181015 *此项为电压下偏差 * 增加则MAXOVERLIMITNUM的值为54 * 不增加则MAXOVERLIMITNUM的值为53 ***************************/ - fLimit[COverlimit.MAXOVERLIMITNUM-2-16] = GetVoltageDevationLimit_L(nScale); + fLimit[COverlimit.MAXOVERLIMITNUM - 2 - 16] = GetVoltageDevationLimit_L(nScale); //负序电流 - fLimit[COverlimit.MAXOVERLIMITNUM-1-16] = GetFCurrentLimit(strScale,fDLRL); + fLimit[COverlimit.MAXOVERLIMITNUM - 1 - 16] = GetFCurrentLimit(strScale, fDLRL); //间谐波电压含有率 - for (i = 0; i < 16; i++) { + 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/pq-device/pq-device-api/pom.xml b/pqs-device/pq-device/pq-device-api/pom.xml index a1bc61708..298cb18f3 100644 --- a/pqs-device/pq-device/pq-device-api/pom.xml +++ b/pqs-device/pq-device/pq-device-api/pom.xml @@ -23,4 +23,4 @@ ${project.version} - \ No newline at end of file + diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Overlimit.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Overlimit.java index 608ef64cc..66d430282 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Overlimit.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Overlimit.java @@ -2,7 +2,7 @@ package com.njcn.device.pq.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.device.pq.utils.COverlimit; +import com.njcn.device.biz.utils.COverlimit; import lombok.Data; /** diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/COverlimit.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/COverlimit.java deleted file mode 100644 index 87eb1d442..000000000 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/COverlimit.java +++ /dev/null @@ -1,301 +0,0 @@ -package com.njcn.device.pq.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/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index ebc5679d8..d499f6e4a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -690,7 +690,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple if (Objects.isNull(scaleResult.getData())) { throw new BusinessException(CommonResponseEnum.DIC_DATA); } - Overlimit overlimit = new Overlimit(line.getId(), updateSubVoltageParam.getScale(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); + Overlimit overlimit = new Overlimit(line.getId(),scaleResult.getData().getName(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); overlimitMapper.insert(overlimit); } } diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetailNew.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetailNew.java index a88310bff..3c20a7693 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetailNew.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetailNew.java @@ -26,7 +26,7 @@ public class EventDetailNew { private String eventDescribe; @Column(name = "wave_type") - private Integer waveType; + private String waveType; @Column(name = "persist_time") private Double persistTime; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventM.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventM.java index a10d05f83..365f81560 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventM.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventM.java @@ -41,7 +41,7 @@ public class RStatEventM implements Serializable { private String eventType; @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）") private Integer eventMeasurementAccrued; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java index 5ac02925b..1ecbfcf0e 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java @@ -38,7 +38,7 @@ public class RStatEventOrgM implements Serializable { private String eventType; @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）") private Integer eventMeasurementAccrued; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java index 85bf81fbf..44a727a94 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java @@ -37,7 +37,7 @@ public class RStatEventOrgQ implements Serializable { private String eventType; @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）") private Integer eventMeasurementAccrued; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java index f9c494706..69325f515 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java @@ -37,7 +37,7 @@ public class RStatEventOrgY implements Serializable { private String eventType; @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）") private Integer eventMeasurementAccrued; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventQ.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventQ.java index f6116e4d3..2f593e575 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventQ.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventQ.java @@ -41,7 +41,7 @@ public class RStatEventQ implements Serializable { private String eventType; @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）") private Integer eventMeasurementAccrued; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventVoltageM.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventVoltageM.java index 79b381403..f23a0d911 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventVoltageM.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventVoltageM.java @@ -44,7 +44,7 @@ public class RStatEventVoltageM implements Serializable { private String voltageType; @ApiModelProperty(value = "日均发生暂态监测点数") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计发生暂态监测点数") private Integer eventMeasurementAccrued; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventY.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventY.java index d41a0b0ab..8a253009a 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventY.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventY.java @@ -41,7 +41,7 @@ public class RStatEventY implements Serializable { private String eventType; @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）") private Integer eventMeasurementAccrued; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java index 7461b39c8..75d7e330f 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java @@ -1,10 +1,20 @@ package com.njcn.event.pojo.po; +import cn.hutool.core.date.DateTime; +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 com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import org.influxdb.annotation.Column; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; /** @@ -14,57 +24,90 @@ import java.util.Date; * @since 2022-10-12 18:34:55 */ @Data +@EqualsAndHashCode(callSuper = false) +@TableName("r_mp_event_detail") +@ApiModel(value="RmpEventDetail对象", description="") public class RmpEventDetailPO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 暂时事件ID - */ - @ApiModelProperty(name = "eventId",value = "暂时事件ID") + + @ApiModelProperty(value = "暂时事件ID") + @TableId(value = "event_id", type = IdType.ASSIGN_ID) private String eventId; - /** - * 监测点ID - */ - @ApiModelProperty(name = "measurementPointId",value = "监测点ID") + + @ApiModelProperty(value = "监测点ID") private String measurementPointId; - /** - * 事件类型 - */ - @ApiModelProperty(name = "eventType",value = "事件类型") + @ApiModelProperty(value = "事件类型") private String eventType; - /** - * 开始时间 - */ - @ApiModelProperty(name = "startTime",value = "开始时间") + + @ApiModelProperty(value = "暂降原因（字典表PQS_Dicdata）") + @TableField("Event_Reason") + private String eventReason; + + @ApiModelProperty(value = "事件关联分析表Guid") + private String eventassIndex; + + @ApiModelProperty(value = "dq计算持续时间 ") + private Double dqTime; + + @ApiModelProperty(value = "特征值计算更新时间（外键PQS_Relevance的Time字段）") + private LocalDateTime dealTime; + + @ApiModelProperty(value = "默认事件个数为0") + private Integer num; + + @ApiModelProperty(value = "波形文件是否从装置招到本地(0：未招，1：已招)默认值为0") + private Integer fileFlag; + + @ApiModelProperty(value = "特征值计算标志（0，未处理；1，已处理; 2，已处理，无结果;3，计算失败）默认值为0") + private Integer dealFlag; + + @ApiModelProperty(value = "处理结果第一条事件发生时间(读comtra文件获取)") + private LocalDateTime firstTime; + + @ApiModelProperty(value = "处理结果第一条事件暂降类型（字典表PQS_Dicdata）") + private String firstType; + + @ApiModelProperty(value = "处理结果第一条事件发生时间毫秒(读comtra文件获取)") + private Double firstMs; + + @ApiModelProperty(value = "暂降能量") + private Double energy; + + @ApiModelProperty(value = "暂降严重度") + private Double severity; + + @ApiModelProperty(value = "暂降源与监测位置关系 Upper:上游；Lower :下游；Unknown :未知;为空则是未计算") + private String sagsource; + + @ApiModelProperty(value = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8") private Date startTime; - /** - * 持续时间 - */ - @ApiModelProperty(name = "duration",value = "持续时间") + + @ApiModelProperty(value = "持续时间，单位秒") private Double duration; - /** - * 特征幅值 - */ - @ApiModelProperty(name = "featureAmplitude",value = "特征幅值") + + @ApiModelProperty(value = "特征幅值") private Double featureAmplitude; - /** - * 相别 - */ - @ApiModelProperty(name = "phase",value = "相别") + + @ApiModelProperty(value = "相别") private String phase; - /** - * 事件描述 - */ - @ApiModelProperty(name = "eventDescribe",value = "事件描述") + @ApiModelProperty(value = "事件描述") private String eventDescribe; - /** - * 波形路径 - */ - @ApiModelProperty(name = "wavePath",value = "波形路径") + @ApiModelProperty(value = "波形路径") private String wavePath; + @ApiModelProperty(value = "波形名称") + @TableField("wave_path") + private String waveName; + + private String phasicType; + + private Double transientValue; + + + } diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java index d2d530c1c..99ae40f75 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java @@ -23,7 +23,7 @@ public class RStatEventMVO { private String eventName; @ApiModelProperty(value = "日均发生暂态监测点数") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计发生暂态监测点数") private Integer eventMeasurementAccrued; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/EventDetailMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/EventDetailMapper.java new file mode 100644 index 000000000..c3d75d57e --- /dev/null +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/EventDetailMapper.java @@ -0,0 +1,16 @@ +package com.njcn.event.mapper.majornetwork; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.event.pojo.po.RmpEventDetailPO; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wr + * @since 2023-03-27 + */ +public interface EventDetailMapper extends BaseMapper { + +} diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDetailMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDetailMapper.xml new file mode 100644 index 000000000..b8f4db2b8 --- /dev/null +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDetailMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventDetailService.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventDetailService.java index a54cbf4b9..ae92597e3 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventDetailService.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/EventDetailService.java @@ -1,6 +1,9 @@ package com.njcn.event.service.majornetwork; +import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.event.pojo.po.EventDetail; +import com.njcn.event.pojo.po.RStatEventOrgM; +import com.njcn.event.pojo.po.RmpEventDetailPO; import java.util.List; @@ -9,7 +12,7 @@ import java.util.List; * @version 1.0.0 * @date 2022年04月07日 09:39 */ -public interface EventDetailService { +public interface EventDetailService extends IService { /** * 根据监测点id获取暂降事件 * diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java index a046ee041..2a8243de4 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java @@ -1,6 +1,10 @@ package com.njcn.event.service.majornetwork.Impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM; import com.njcn.device.pq.api.GeneralDeviceInfoClient; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.api.TerminalBaseClient; @@ -10,20 +14,24 @@ import com.njcn.device.pq.pojo.vo.AreaLineInfoVO; import com.njcn.device.pq.pojo.vo.TerminalBaseVO; import com.njcn.event.pojo.constant.Param; import com.njcn.event.pojo.po.EventDetailNew; +import com.njcn.event.pojo.po.RmpEventDetailPO; import com.njcn.event.pojo.vo.AreaSubLineVO; import com.njcn.event.service.majornetwork.AreaInfoService; +import com.njcn.event.service.majornetwork.EventDetailService; import com.njcn.influxdb.mapper.InfluxDBResultMapperCn; import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDBCommUtils; import com.njcn.influxdb.utils.InfluxDbUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.influxdb.dto.QueryResult; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -45,7 +53,7 @@ public class AreaInfoServiceImpl implements AreaInfoService { private final LineFeignClient lineFeignClient; private final TerminalBaseClient terminalBaseClient; - + private final EventDetailService eventDetailService; @Override public List getAreaLineInfo(DeviceInfoParam.BusinessParam deviceInfoParam) { @@ -55,32 +63,60 @@ public class AreaInfoServiceImpl implements AreaInfoService { if (CollectionUtil.isNotEmpty(lineIds)) { List resList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData(); + //查询监测点未处理暂态事件 - StringBuilder lineIdsStr = InfluxDBCommUtils.assToInfluxParam(lineIds); + List eventDetails = eventDetailService.list(new LambdaQueryWrapper() + .in(RmpEventDetailPO::getMeasurementPointId, lineIds) + .ge(StringUtils.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime()))) + .le(StringUtils.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime()))) + ); + //根据监测点分组统计数量 + Map count = eventDetails.stream().collect(Collectors.groupingBy(RmpEventDetailPO::getMeasurementPointId, Collectors.counting())); - String stringResult = "SELECT count(eventass_index) FROM " + Param.EVENT_DETAIL + Param.WHERE + "time >= '" + deviceInfoParam.getSearchBeginTime() + InfluxDBPublicParam.START_TIME + "' and " + "time <= '" + deviceInfoParam.getSearchEndTime() + InfluxDBPublicParam.END_TIME + "' and " + lineIdsStr + " and eventass_index = '' group by line_id" + InfluxDBPublicParam.TIME_ZONE; - // 结果集 - QueryResult result = influxDbUtils.query(stringResult); - if (!result.hasError()) { - List list = result.getResults().get(0).getSeries(); - - for (AreaLineInfoVO areaLineInfoVO : resList) { - boolean flag = false; - if(CollectionUtil.isNotEmpty(list)) { - for (QueryResult.Series tem : list) { - String lineId = tem.getTags().get("line_id"); - if (areaLineInfoVO.getLineId().equals(lineId)) { - areaLineInfoVO.setNoDealCount(Double.valueOf(tem.getValues().get(0).get(1).toString()).intValue()); - flag = true; - break; - } + for (AreaLineInfoVO areaLineInfoVO : resList) { + boolean flag = false; + if(CollectionUtil.isNotEmpty(count)) { + for (String s : count.keySet()) { + if (count.containsKey(areaLineInfoVO.getLineId())) { + Long aLong = count.get(s); + areaLineInfoVO.setNoDealCount(Math.toIntExact(aLong)); + flag = true; + break; } } - if (!flag) { - areaLineInfoVO.setNoDealCount(0); - } + + } + if (!flag) { + areaLineInfoVO.setNoDealCount(0); } } + + //查询监测点未处理暂态事件 +// StringBuilder lineIdsStr = InfluxDBCommUtils.assToInfluxParam(lineIds); +// +// String stringResult = "SELECT count(eventass_index) FROM " + Param.EVENT_DETAIL + Param.WHERE + "time >= '" + deviceInfoParam.getSearchBeginTime() + InfluxDBPublicParam.START_TIME + "' and " + "time <= '" + deviceInfoParam.getSearchEndTime() + InfluxDBPublicParam.END_TIME + "' and " + lineIdsStr + " and eventass_index = '' group by line_id" + InfluxDBPublicParam.TIME_ZONE; +// // 结果集 +// QueryResult result = influxDbUtils.query(stringResult); +// if (!result.hasError()) { +// List list = result.getResults().get(0).getSeries(); +// +// for (AreaLineInfoVO areaLineInfoVO : resList) { +// boolean flag = false; +// if(CollectionUtil.isNotEmpty(list)) { +// for (QueryResult.Series tem : list) { +// String lineId = tem.getTags().get("line_id"); +// if (areaLineInfoVO.getLineId().equals(lineId)) { +// areaLineInfoVO.setNoDealCount(Double.valueOf(tem.getValues().get(0).get(1).toString()).intValue()); +// flag = true; +// break; +// } +// } +// } +// if (!flag) { +// areaLineInfoVO.setNoDealCount(0); +// } +// } +// } //组装成变电站 if (CollectionUtil.isNotEmpty(resList)) { Map> map = resList.stream().collect(Collectors.groupingBy(AreaLineInfoVO::getSubId)); @@ -117,50 +153,99 @@ public class AreaInfoServiceImpl implements AreaInfoService { if (CollectionUtil.isNotEmpty(lineIds)) { List lineList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData(); - //查询监测点未处理暂态事件 - StringBuilder lineIdsStr = InfluxDBCommUtils.assToInfluxParam(lineIds); + Map lineMap = lineList.stream().collect(Collectors.toMap(AreaLineInfoVO::getLineId, Function.identity(), (key1, kye2) -> key1)); - String stringResult = "SELECT * FROM " + Param.EVENT_DETAIL + Param.WHERE + lineIdsStr + "and eventass_index = '' order by time desc limit 100" + InfluxDBPublicParam.TIME_ZONE; - // 结果集 - QueryResult result = influxDbUtils.query(stringResult); - // 结果集映射到对象中 - InfluxDBResultMapperCn influxDBResultMapper = new InfluxDBResultMapperCn(); - resList = influxDBResultMapper.toPOJO(result, EventDetailNew.class); - //对未处理暂降事件的监测点替换成中文名称 - if (CollectionUtil.isNotEmpty(resList)) { - for (EventDetailNew eventDetail : resList) { - for (AreaLineInfoVO tem : lineList) { - if (eventDetail.getLineId().equals(tem.getLineId())) { - eventDetail.setLineName(tem.getLineName()); - eventDetail.setLng(tem.getLng()); - eventDetail.setLat(tem.getLat()); - break; - } - } + //查询监测点未处理暂态事件 + List eventDetails = eventDetailService.list(new LambdaQueryWrapper() + .in(RmpEventDetailPO::getMeasurementPointId, lineIds)); + EventDetailNew eventDetailNew; + for (RmpEventDetailPO eventDetail : eventDetails) { + eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetailNew.class); + //监测点id + eventDetailNew.setLineId(eventDetail.getMeasurementPointId()); + //持续时间 + eventDetailNew.setPersistTime(eventDetail.getDuration()); + //特征幅值 + eventDetailNew.setEventValue(eventDetail.getFeatureAmplitude()); + if(lineMap.containsKey(eventDetail.getMeasurementPointId())){ + AreaLineInfoVO areaLineInfoVO = lineMap.get(eventDetail.getMeasurementPointId()); + eventDetailNew.setLineName(areaLineInfoVO.getLineName()); + eventDetailNew.setLng(areaLineInfoVO.getLng()); + eventDetailNew.setLat(areaLineInfoVO.getLat()); + resList.add(eventDetailNew); } } + + +// //查询监测点未处理暂态事件 +// StringBuilder lineIdsStr = InfluxDBCommUtils.assToInfluxParam(lineIds); +// +// String stringResult = "SELECT * FROM " + Param.EVENT_DETAIL + Param.WHERE + lineIdsStr + "and eventass_index = '' order by time desc limit 100" + InfluxDBPublicParam.TIME_ZONE; +// // 结果集 +// QueryResult result = influxDbUtils.query(stringResult); +// // 结果集映射到对象中 +// InfluxDBResultMapperCn influxDBResultMapper = new InfluxDBResultMapperCn(); +// resList = influxDBResultMapper.toPOJO(result, EventDetailNew.class); +// //对未处理暂降事件的监测点替换成中文名称 +// if (CollectionUtil.isNotEmpty(resList)) { +// for (EventDetailNew eventDetail : resList) { +// for (AreaLineInfoVO tem : lineList) { +// if (eventDetail.getLineId().equals(tem.getLineId())) { +// eventDetail.setLineName(tem.getLineName()); +// eventDetail.setLng(tem.getLng()); +// eventDetail.setLat(tem.getLat()); +// break; +// } +// } +// } +// } } return resList; } @Override public List getNoDealEventsByLineId(String id) { - - String stringResult = "SELECT * FROM " + Param.EVENT_DETAIL + Param.WHERE + "line_id = '"+id+"' and eventass_index = '' order by time desc limit 100" + InfluxDBPublicParam.TIME_ZONE; - // 结果集 - QueryResult result = influxDbUtils.query(stringResult); - // 结果集映射到对象中 - InfluxDBResultMapperCn influxDBResultMapper = new InfluxDBResultMapperCn(); - List resList = influxDBResultMapper.toPOJO(result, EventDetailNew.class); - List lineList = lineFeignClient.getBaseLineAreaInfo(Stream.of(id).collect(Collectors.toList())).getData(); - if(CollectionUtil.isNotEmpty(lineList)){ - resList = resList.stream().peek(item->{ - item.setGdName(lineList.get(0).getGdName()); - item.setSubName(lineList.get(0).getSubName()); - item.setLineName(lineList.get(0).getLineName()); - }).collect(Collectors.toList()); + + List resList = new ArrayList<>(); + //查询监测点未处理暂态事件 + List eventDetails = eventDetailService.list(new LambdaQueryWrapper() + .eq(RmpEventDetailPO::getMeasurementPointId, id)); + EventDetailNew eventDetailNew; + for (RmpEventDetailPO eventDetail : eventDetails) { + eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetailNew.class); + //监测点id + eventDetailNew.setLineId(eventDetail.getMeasurementPointId()); + //持续时间 + eventDetailNew.setPersistTime(eventDetail.getDuration()); + //特征幅值 + eventDetailNew.setEventValue(eventDetail.getFeatureAmplitude()); + if(CollectionUtil.isNotEmpty(lineList)){ + resList = resList.stream().peek(item->{ + item.setGdName(lineList.get(0).getGdName()); + item.setSubName(lineList.get(0).getSubName()); + item.setLineName(lineList.get(0).getLineName()); + }).collect(Collectors.toList()); + resList.add(eventDetailNew); + } } + +// String stringResult = "SELECT * FROM " + Param.EVENT_DETAIL + Param.WHERE + "line_id = '"+id+"' and eventass_index = '' order by time desc limit 100" + InfluxDBPublicParam.TIME_ZONE; +// // 结果集 +// QueryResult result = influxDbUtils.query(stringResult); +// // 结果集映射到对象中 +// InfluxDBResultMapperCn influxDBResultMapper = new InfluxDBResultMapperCn(); +// List resList = influxDBResultMapper.toPOJO(result, EventDetailNew.class); + +// List lineList = lineFeignClient.getBaseLineAreaInfo(Stream.of(id).collect(Collectors.toList())).getData(); + +// if(CollectionUtil.isNotEmpty(lineList)){ +// resList = resList.stream().peek(item->{ +// item.setGdName(lineList.get(0).getGdName()); +// item.setSubName(lineList.get(0).getSubName()); +// item.setLineName(lineList.get(0).getLineName()); +// }).collect(Collectors.toList()); +// } return resList; } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java index 66307b25b..01b834875 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java @@ -1,7 +1,9 @@ package com.njcn.event.service.majornetwork.Impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.config.GeneralInfo; import com.njcn.common.pojo.exception.BusinessException; @@ -16,14 +18,17 @@ import com.njcn.event.pojo.dto.wave.WaveDataDTO; import com.njcn.event.pojo.param.*; import com.njcn.event.pojo.po.EventDetail; import com.njcn.event.pojo.po.EventDetailNew; +import com.njcn.event.pojo.po.RmpEventDetailPO; import com.njcn.event.pojo.vo.*; import com.njcn.event.service.majornetwork.EventAnalysisService; import com.njcn.event.service.majornetwork.EventDetailService; import com.njcn.influxdb.utils.InfluxDbUtils; 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 lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.stereotype.Service; @@ -35,6 +40,7 @@ import java.text.ParseException; import java.time.LocalDate; import java.time.temporal.ChronoUnit; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -59,6 +65,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { private final DicDataFeignClient dicDataFeignClient; + @Override public Page getEventAnalyse(EventBaseParam eventBaseParam) { @@ -138,10 +145,17 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { */ @Override public List getCoords(StatisticsParam statisticsParam) { - QueryResult query = MonitorQuery(statisticsParam); - InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); List result = new ArrayList<>(); - List info = influxDBResultMapper.toPOJO(query, EventDetail.class); +// QueryResult query = MonitorQuery(statisticsParam); +// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); +// List info = influxDBResultMapper.toPOJO(query, EventDetail.class); + + //查询监测点未处理暂态事件 + List info = eventDetailService.list(new LambdaQueryWrapper() + .in(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex()) + .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime()))) + .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime()))) + ); for (int i = 0; i < 10; i++) { for (int j = 0; j < 9; j++) { @@ -151,204 +165,204 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { for (int i = 0; i < info.size(); i++) { Integer index = null; CoordsVO dto = new CoordsVO(); - if (info.get(i).getEventValue() >= 0 && info.get(i).getEventValue() <= 0.1) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + if (info.get(i).getFeatureAmplitude() >= 0 && info.get(i).getFeatureAmplitude() <= 0.1) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 0; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 1; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 2; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 3; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 4; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 5; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 6; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 7; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 8; } - } else if (info.get(i).getEventValue() > 0.1 && info.get(i).getEventValue() <= 0.2) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + } else if (info.get(i).getFeatureAmplitude() > 0.1 && info.get(i).getFeatureAmplitude() <= 0.2) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 9; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 10; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 11; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 12; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 13; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 14; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 15; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 16; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 17; } - } else if (info.get(i).getEventValue() > 0.2 && info.get(i).getEventValue() <= 0.3) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + } else if (info.get(i).getFeatureAmplitude() > 0.2 && info.get(i).getFeatureAmplitude() <= 0.3) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 18; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 19; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 20; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 21; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 22; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 23; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 24; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 25; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 26; } - } else if (info.get(i).getEventValue() > 0.3 && info.get(i).getEventValue() <= 0.4) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + } else if (info.get(i).getFeatureAmplitude() > 0.3 && info.get(i).getFeatureAmplitude() <= 0.4) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 27; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 28; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 29; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 30; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 31; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 32; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 33; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 34; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 35; } - } else if (info.get(i).getEventValue() > 0.4 && info.get(i).getEventValue() <= 0.5) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + } else if (info.get(i).getFeatureAmplitude() > 0.4 && info.get(i).getFeatureAmplitude() <= 0.5) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 36; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 37; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 38; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 39; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 40; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 41; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 42; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 43; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 44; } - } else if (info.get(i).getEventValue() > 0.5 && info.get(i).getEventValue() <= 0.6) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + } else if (info.get(i).getFeatureAmplitude() > 0.5 && info.get(i).getFeatureAmplitude() <= 0.6) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 45; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 46; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 47; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 48; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 49; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 50; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 51; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 52; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 53; } - } else if (info.get(i).getEventValue() > 0.6 && info.get(i).getEventValue() <= 0.7) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + } else if (info.get(i).getFeatureAmplitude() > 0.6 && info.get(i).getFeatureAmplitude() <= 0.7) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 54; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 55; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 56; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 57; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 58; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 59; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 60; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 61; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 62; } - } else if (info.get(i).getEventValue() > 0.7 && info.get(i).getEventValue() <= 0.8) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + } else if (info.get(i).getFeatureAmplitude() > 0.7 && info.get(i).getFeatureAmplitude() <= 0.8) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 63; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 64; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 65; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 66; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 67; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 68; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 69; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 70; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 71; } - } else if (info.get(i).getEventValue() > 0.8 && info.get(i).getEventValue() <= 0.9) { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + } else if (info.get(i).getFeatureAmplitude() > 0.8 && info.get(i).getFeatureAmplitude() <= 0.9) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 72; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 73; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 74; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 75; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 76; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 77; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 78; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 79; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 80; } } else { - if (info.get(i).getPersistTime()/1000 > 0 && info.get(i).getPersistTime()/1000 <= 0.020) { + if (info.get(i).getDuration()/1000 > 0 && info.get(i).getDuration()/1000 <= 0.020) { index = 81; - } else if (info.get(i).getPersistTime()/1000 <= 0.040 && info.get(i).getPersistTime()/1000 > 0.020) { + } else if (info.get(i).getDuration()/1000 <= 0.040 && info.get(i).getDuration()/1000 > 0.020) { index = 82; - } else if (info.get(i).getPersistTime()/1000 <= 0.060 && info.get(i).getPersistTime()/1000 > 0.040) { + } else if (info.get(i).getDuration()/1000 <= 0.060 && info.get(i).getDuration()/1000 > 0.040) { index = 83; - } else if (info.get(i).getPersistTime()/1000 <= 0.080 && info.get(i).getPersistTime()/1000 > 0.060) { + } else if (info.get(i).getDuration()/1000 <= 0.080 && info.get(i).getDuration()/1000 > 0.060) { index = 84; - } else if (info.get(i).getPersistTime()/1000 <= 0.120 && info.get(i).getPersistTime()/1000 > 0.080) { + } else if (info.get(i).getDuration()/1000 <= 0.120 && info.get(i).getDuration()/1000 > 0.080) { index = 85; - } else if (info.get(i).getPersistTime()/1000 > 0.120 && info.get(i).getPersistTime()/1000 < 0.200) { + } else if (info.get(i).getDuration()/1000 > 0.120 && info.get(i).getDuration()/1000 < 0.200) { index = 86; - } else if (info.get(i).getPersistTime()/1000 >= 0.200 && info.get(i).getPersistTime()/1000 < 0.400) { + } else if (info.get(i).getDuration()/1000 >= 0.200 && info.get(i).getDuration()/1000 < 0.400) { index = 87; - } else if (info.get(i).getPersistTime()/1000 >= 0.400 && info.get(i).getPersistTime()/1000 < 0.600) { + } else if (info.get(i).getDuration()/1000 >= 0.400 && info.get(i).getDuration()/1000 < 0.600) { index = 88; - } else if (info.get(i).getPersistTime()/1000 >= 0.600 && info.get(i).getPersistTime()/1000 <= 1.200) { + } else if (info.get(i).getDuration()/1000 >= 0.600 && info.get(i).getDuration()/1000 <= 1.200) { index = 89; } } @@ -479,10 +493,17 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { @Override public List IEC411(StatisticsParam statisticsParam) { List result = new ArrayList<>(); - List info = new ArrayList<>(); - QueryResult query = MonitorQuery(statisticsParam); - InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); - info = influxDBResultMapper.toPOJO(query, EventDetail.class); +// List info = new ArrayList<>(); +// QueryResult query = MonitorQuery(statisticsParam); +// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); +// info = influxDBResultMapper.toPOJO(query, EventDetail.class); + + //查询监测点未处理暂态事件 + List info = eventDetailService.list(new LambdaQueryWrapper() + .in(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex()) + .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime()))) + .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime()))) + ); int[][] arr = new int[3][6]; for (int i = 0; i < 3; i++) { for (int j = 0; j < 6; j++) { @@ -490,8 +511,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { } } for (int i = 0; i < info.size(); i++) { - Double eventvalue = info.get(i).getEventValue(); - double persisttime = info.get(i).getPersistTime(); + Double eventvalue = info.get(i).getFeatureAmplitude(); + double persisttime = info.get(i).getDuration(); if (eventvalue * 100 < 1) { if (persisttime < 20 && persisttime >= 10) { arr[2][0]++; @@ -894,6 +915,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { */ @Override public List getReasonTypeTime(StatisticsParam statisticsParam) throws ParseException { + //获取暂降字典信息 + DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); List list = new ArrayList<>(); //参数 StringBuilder builder1 = new StringBuilder(); @@ -918,10 +941,16 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { } else { builder2.append(startYear).append("-").append(startMonth + 1).append("-").append(startDays); } - query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(),builder1.toString(), builder2.toString(), statisticsParam.getFlag())); - InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); - List eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class); - long count = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count(); +// query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(),builder1.toString(), builder2.toString(), statisticsParam.getFlag())); +// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); +// List eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class); +// long count = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count(); + List eventDetailList = eventDetailService.list(new LambdaQueryWrapper() + .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex()) + .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime()))) + .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime()))) + ); + long count = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())).count(); if (startMonth < 10) { list.add(new TimeVO(null, null,"", "0" + startMonth.toString(), count+"", startYear.toString(), startYear.toString()+"-"+"0"+startMonth.toString())); } else { @@ -937,10 +966,16 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { builder2.delete(0, builder2.length()); builder1.append(startYear).append("-").append(startMonth).append("-").append(startDays); builder2.append(startYear).append("-").append(startMonth).append("-").append(endDays); - query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(),builder1.toString(), builder2.toString(), statisticsParam.getFlag())); - InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); - List eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class); - long count1 = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count(); +// query = MonitorQuery(new StatisticsParam(statisticsParam.getLineIndex(),builder1.toString(), builder2.toString(), statisticsParam.getFlag())); +// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); +// List eventDetailList = influxDBResultMapper.toPOJO(query, EventDetail.class); +// long count1 = eventDetailList.stream().filter(x -> x.getWaveType() == 1).count(); + List eventDetailList = eventDetailService.list(new LambdaQueryWrapper() + .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex()) + .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime()))) + .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime()))) + ); + long count1 = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())).count(); if (startMonth < 10) { list.add(new TimeVO(null, null,"", "0" + startMonth.toString(), count1+"", startYear.toString(), startYear.toString()+"-"+"0"+startMonth.toString())); } else { @@ -949,18 +984,27 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { return list; } else { - QueryResult monitorQuery = MonitorQuery(statisticsParam); - InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); - List eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class); +// QueryResult monitorQuery = MonitorQuery(statisticsParam); +// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); +// List eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class); +// Map> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())).collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10))); - Map> map = eventDetailList.stream().filter(x -> x.getWaveType()==1).collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10))); + List eventDetailList = eventDetailService.list(new LambdaQueryWrapper() + .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex()) + .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime()))) + .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime()))) + ); + + Map> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())) + .collect(Collectors.groupingBy(s -> DateUtil.format(s.getStartTime(), "yyyy-MM-dd"))); Set keySet = map.keySet(); LocalDate parse1 = LocalDate.parse(startTime); LocalDate parse2 = LocalDate.parse(endTime); while (!parse1.equals(parse2.plus(1, ChronoUnit.DAYS))){ if (keySet.contains(parse1.toString())){ - List eventDetailNews = map.get(parse1.toString()); +// List eventDetailNews = map.get(parse1.toString()); + List eventDetailNews = map.get(parse1.toString()); TimeVO timeVO = new TimeVO(); timeVO.setTimes(eventDetailNews.size()+""); if (parse1.getDayOfMonth()<10){ @@ -1351,28 +1395,65 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { @Override public List getPlot(StatisticsParam statisticsParam) { List result = new ArrayList<>(); - QueryResult query = MonitorQuery(statisticsParam); - InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); - result = influxDBResultMapper.toPOJO(query, EventDetail.class); - HttpResult> reason = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()); - HttpResult> type = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()); - List reasonData = reason.getData(); - List typeData = type.getData(); - //添加detail - for (EventDetail detail : result) { - if (detail.getWaveType() == 1) { - for (DictData data : reasonData) { - if (detail.getEventReason().equals(data.getId())) { - detail.setEventReason(data.getName()); - } +// QueryResult query = MonitorQuery(statisticsParam); +// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); +// result = influxDBResultMapper.toPOJO(query, EventDetail.class); +// //添加detail +// for (EventDetail detail : result) { +// if (detail.getWaveType() == 1) { +// for (DictData data : reasonData) { +// if (detail.getEventReason().equals(data.getId())) { +// detail.setEventReason(data.getName()); +// } +// } +// for (DictData data : typeData) { +// if (detail.getEventType().equals(data.getId())) { +// detail.setEventType(data.getName()); +// } +// } +// } +// } + //查询监测点未处理暂态事件 + List eventDetails = eventDetailService.list(new LambdaQueryWrapper() + .in(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex()) + .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime()))) + .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime()))) + ); + + //获取字典属性 + List reasonData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_REASON.getCode()).getData(); + Map reasonMap = reasonData.stream().collect(Collectors.toMap(DictData::getId, Function.identity(), (kye1, key2) -> kye1)); + List typeData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_TYPE.getCode()).getData(); + Map typeMap = typeData.stream().collect(Collectors.toMap(DictData::getId, Function.identity(), (kye1, key2) -> kye1)); + //获取电压暂降信息 + DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); + EventDetail eventDetailNew; + for (RmpEventDetailPO eventDetail : eventDetails) { + eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetail.class); + //监测点id + eventDetailNew.setLineId(eventDetail.getMeasurementPointId()); + //持续时间 + eventDetailNew.setPersistTime(eventDetail.getDuration()); + //特征幅值 + eventDetailNew.setEventValue(eventDetail.getFeatureAmplitude()); + //波形路径 + eventDetailNew.setWaveName(eventDetail.getWavePath()); + if(data.getId().equals(eventDetail.getEventType())){ + if (reasonMap.containsKey(eventDetail.getEventReason())) { + //暂降原因 + DictData dictData = reasonMap.get(eventDetail.getEventReason()); + eventDetailNew.setEventReason(dictData.getName()); } - for (DictData data : typeData) { - if (detail.getEventType().equals(data.getId())) { - detail.setEventType(data.getName()); - } + if (typeMap.containsKey(eventDetail.getEventType())) { + //事件类型 + DictData dictData = typeMap.get(eventDetail.getEventType()); + eventDetailNew.setEventType(dictData.getName()); } } + + result.add(eventDetailNew); } + return result; } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java index 6d418ac47..e45ddeab0 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java @@ -1,9 +1,11 @@ package com.njcn.event.service.majornetwork.Impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.event.mapper.majornetwork.EventDetailMapper; import com.njcn.event.pojo.po.EventDetail; +import com.njcn.event.pojo.po.RmpEventDetailPO; import com.njcn.event.service.majornetwork.EventDetailService; -import com.njcn.influxdb.utils.AssembleSqlUtil; import com.njcn.influxdb.utils.InfluxDbUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,7 +25,7 @@ import java.util.Objects; @Slf4j @Service @RequiredArgsConstructor -public class EventDetailServiceImpl implements EventDetailService { +public class EventDetailServiceImpl extends ServiceImpl implements EventDetailService { private final InfluxDbUtils influxDbUtils; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventReportServiceImpl.java index d16a23922..952559ded 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventReportServiceImpl.java @@ -882,7 +882,7 @@ public class EventReportServiceImpl implements EventReportService { InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); List eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class); - Map> map = eventDetailList.stream().filter(x -> x.getWaveType()==1).collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10))); + Map> map = eventDetailList.stream().filter(x -> x.getWaveType()=="1").collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10))); Set keySet = map.keySet(); LocalDate parse1 = LocalDate.parse(startTime); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventMServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventMServiceImpl.java index c122b928b..9cd7d78da 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventMServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventMServiceImpl.java @@ -86,7 +86,7 @@ public class RStatEventMServiceImpl extends ServiceImpl idlist = new ArrayList<>(); for (EventDetailNew eventDetail : info) { for (String s : keySet) { - if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == 1) { + if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == "1") { countMap.put(s, countMap.get(s) + 1); } } @@ -581,7 +581,7 @@ public class ReportServiceImpl implements ReportService { ArrayList idlist = new ArrayList<>(); for (EventDetailNew eventDetail : info) { for (String s : keySet) { - if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == 2) { + if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == "2") { countMap.put(s, countMap.get(s) + 1); } } @@ -648,7 +648,7 @@ public class ReportServiceImpl implements ReportService { ArrayList idlist = new ArrayList<>(); for (EventDetailNew eventDetail : info) { for (String s : keySet) { - if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == 3) { + if (eventDetail.getLineId().equals(s) && eventDetail.getWaveType() == "3") { countMap.put(s, countMap.get(s) + 1); } } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java index 7f23c28cd..0fad45bbf 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java @@ -74,7 +74,7 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf @Override public List getRStatOrg(UniversalFrontEndParam param) { //获取所有子部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData(); if (CollectionUtil.isEmpty(deptDTOList)) { return Collections.emptyList(); } @@ -130,7 +130,7 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf @Override public List getRStatEventOrg(UniversalFrontEndParam param) { //获取所有子部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData(); if (CollectionUtil.isEmpty(deptDTOList)) { return Collections.emptyList(); } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java index 7377360af..9e07e62af 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java @@ -38,7 +38,7 @@ public class RStatHarmonicM { private String harmonicType; @ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）") private Integer overLimitMeasurementAccrued; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java index 782ffc096..5af49b78e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java @@ -31,7 +31,7 @@ public class RStatHarmonicOrgM implements Serializable { /** * 日均超标监测点数（根据 日表的超标监测点数 取平均值） */ - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; /** * 累计超标监测点数（监测点指标统计明细日表 统计） */ diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java index 0f44e76ac..2a45f1552 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java @@ -31,7 +31,7 @@ public class RStatHarmonicOrgQ implements Serializable { /** * 日均超标监测点数（根据 日表的超标监测点数 取平均值） */ - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; /** * 累计超标监测点数（监测点指标统计明细日表 统计） */ diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java index a8ed4276a..ecd8e45c0 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java @@ -31,7 +31,7 @@ public class RStatHarmonicOrgY implements Serializable { /** * 日均超标监测点数（根据 日表的超标监测点数 取平均值） */ - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; /** * 累计超标监测点数（监测点指标统计明细日表 统计） */ diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java index db475d241..f09e3e86e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java @@ -41,7 +41,7 @@ public class RStatHarmonicQ implements Serializable { private String harmonicType; @ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）") private Integer overLimitMeasurementAccrued; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java index b644fbedd..3eee4574c 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java @@ -41,7 +41,7 @@ public class RStatHarmonicVoltageM { private String voltageType; @ApiModelProperty(value = "日均超标监测点数") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value = "累计超标监测点数") private Integer overLimitMeasurementAccrued; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java index 237717808..3ad152500 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java @@ -41,7 +41,7 @@ public class RStatHarmonicY implements Serializable { private String harmonicType; @ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）") private Integer overLimitMeasurementAccrued; 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 86738b70e..099826934 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 @@ -41,13 +41,13 @@ public class RStatOrgM implements Serializable { private Integer allCount; @ApiModelProperty(value = "日均有效接入监测点数") - private Integer effectiveMeasurementAverage; + private Float effectiveMeasurementAverage; @ApiModelProperty(value = "累计有效接入监测点数") private Integer effectiveMeasurementAccrued; @ApiModelProperty(value = "日均稳态超标监测点数") - private Integer harmonicMeasurementAverage; + private Float harmonicMeasurementAverage; @ApiModelProperty(value = "累计稳态超标监测点数") private Integer harmonicMeasurementAccrued; @@ -68,7 +68,7 @@ public class RStatOrgM implements Serializable { private Float flickerPassRate; @ApiModelProperty(value = "日均监测到暂态指标的监测点数") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计监测到暂态指标的监测点数") private Integer eventMeasurementAccrued; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java index d1a6fe09a..f80969668 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java @@ -56,7 +56,7 @@ public class RStatOrgMPO { * 日均有效接入监测点数 */ @TableField(value = "effective_measurement_average") - private Integer effectiveMeasurementAverage; + private Float effectiveMeasurementAverage; /** * 累计有效接入监测点数 @@ -68,7 +68,7 @@ public class RStatOrgMPO { * 日均稳态超标监测点数 */ @TableField(value = "harmonic_measurement_average") - private Integer harmonicMeasurementAverage; + private Float harmonicMeasurementAverage; /** * 累计稳态超标监测点数 @@ -110,7 +110,7 @@ public class RStatOrgMPO { * 日均监测到暂态指标的监测点数 */ @TableField(value = "event_measurement_average") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; /** * 累计监测到暂态指标的监测点数 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 956a8a997..89c2625ca 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 @@ -41,13 +41,13 @@ public class RStatOrgQ implements Serializable { private Integer allCount; @ApiModelProperty(value = "日均有效接入监测点数") - private Integer effectiveMeasurementAverage; + private Float effectiveMeasurementAverage; @ApiModelProperty(value = "累计有效接入监测点数") private Integer effectiveMeasurementAccrued; @ApiModelProperty(value = "日均稳态超标监测点数") - private Integer harmonicMeasurementAverage; + private Float harmonicMeasurementAverage; @ApiModelProperty(value = "累计稳态超标监测点数") private Integer harmonicMeasurementAccrued; @@ -68,7 +68,7 @@ public class RStatOrgQ implements Serializable { private Float flickerPassRate; @ApiModelProperty(value = "日均监测到暂态指标的监测点数") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计监测到暂态指标的监测点数") private Integer eventMeasurementAccrued; 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 a29604a8f..ab4edd2ed 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 @@ -41,13 +41,13 @@ public class RStatOrgY implements Serializable { private Integer allCount; @ApiModelProperty(value = "日均有效接入监测点数") - private Integer effectiveMeasurementAverage; + private Float effectiveMeasurementAverage; @ApiModelProperty(value = "累计有效接入监测点数") private Integer effectiveMeasurementAccrued; @ApiModelProperty(value = "日均稳态超标监测点数") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value = "累计稳态超标监测点数") private Integer overLimitMeasurementAccrued; @@ -68,7 +68,7 @@ public class RStatOrgY implements Serializable { private Float flickerPassRate; @ApiModelProperty(value = "日均监测到暂态指标的监测点数") - private Integer eventMeasurementAverage; + private Float eventMeasurementAverage; @ApiModelProperty(value = "累计监测到暂态指标的监测点数") private Integer eventMeasurementAccrued; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java index 964f94014..14b962669 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java @@ -20,7 +20,7 @@ public class RIconVO { private Integer sort; @ApiModelProperty(value ="日均监测点数") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value ="累计监测点数") private Integer overLimitMeasurementAccrued; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java index ca52ec297..e170bfeae 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java @@ -23,7 +23,7 @@ public class RStatHarmonicMVO { private String harmonicName; @ApiModelProperty(value = "日均超标监测点数") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value = "累计超标监测点数") private Integer overLimitMeasurementAccrued; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicVO.java index 3e5da3e96..05389ba22 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicVO.java @@ -23,7 +23,7 @@ public class RStatHarmonicVO { private String harmonicType; @ApiModelProperty(value = "日均超标监测点数") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value = "累计超标监测点数") private Integer overLimitMeasurementAccrued; 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 dad430a96..0ce4f667a 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 @@ -21,13 +21,13 @@ public class RStatOrgVO { private String orgName; @ApiModelProperty(value = "日均有效接入监测点数") - private Integer effectiveMeasurementAverage; + private Float effectiveMeasurementAverage; @ApiModelProperty(value = "累计有效接入监测点数") private Integer effectiveMeasurementAccrued; @ApiModelProperty(value = "日均稳态超标监测点数") - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; @ApiModelProperty(value = "累计稳态超标监测点数") private Integer overLimitMeasurementAccrued; 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 bb1929a2b..9c7b13110 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 @@ -50,7 +50,7 @@ public class RStatSubstationOrg2VO implements Serializable { * 日均有效接入监测点数 */ @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数") - private Integer effectiveMeasurementAverage; + private Float effectiveMeasurementAverage; /** * 累计有效接入监测点数 @@ -62,7 +62,7 @@ public class RStatSubstationOrg2VO implements Serializable { * 日均稳态超标监测点数 */ @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数") - private Integer harmonicMeasurementAverage; + private Float harmonicMeasurementAverage; /** * 累计稳态超标监测点数 @@ -87,7 +87,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** * 频率偏差 */ - private Integer tAverage; + private Float tAverage; private Integer tAccrued; private Float oAverage; private Float oAccrued; @@ -100,7 +100,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** * 电压偏差 */ - private Integer tAverage1; + private Float tAverage1; private Integer tAccrued1; private Float oAverage1; private Float oAccrued1; @@ -113,7 +113,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** * 闪变 */ - private Integer tAverage2; + private Float tAverage2; private Integer tAccrued2; private Float oAverage2; private Float oAccrued2; @@ -126,7 +126,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** * 谐波电压 */ - private Integer tAverage3; + private Float tAverage3; private Integer tAccrued3; private Float oAverage3; private Float oAccrued3; @@ -139,7 +139,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** *谐波电流 */ - private Integer tAverage4; + private Float tAverage4; private Integer tAccrued4; private Float oAverage4; private Float oAccrued4; @@ -153,7 +153,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** *间谐波电压 */ - private Integer tAverage5; + private Float tAverage5; private Integer tAccrued5; private Float oAverage5; private Float oAccrued5; @@ -167,7 +167,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** *三相电压不平衡度 */ - private Integer tAverage6; + private Float tAverage6; private Integer tAccrued6; private Float oAverage6; private Float oAccrued6; @@ -180,7 +180,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** *负序电流 */ - private Integer tAverage7; + private Float tAverage7; private Integer tAccrued7; private Float oAverage7; private Float oAccrued7; @@ -193,7 +193,7 @@ public class RStatSubstationOrg2VO implements Serializable { /** *总稳态指标 */ - private Integer tAverage8; + private Float tAverage8; private Integer tAccrued8; private Float oAverage8; private Float oAccrued8; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java index 2f7b1d340..faa5c7a17 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java @@ -56,7 +56,7 @@ public class RStatSubstationOrgVO implements Serializable { * 日均有效接入监测点数 */ @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数") - private Integer effectiveMeasurementAverage; + private Float effectiveMeasurementAverage; /** * 累计有效接入监测点数 @@ -68,7 +68,7 @@ public class RStatSubstationOrgVO implements Serializable { * 日均稳态超标监测点数 */ @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数") - private Integer harmonicMeasurementAverage; + private Float harmonicMeasurementAverage; /** * 累计稳态超标监测点数 @@ -97,7 +97,7 @@ public class RStatSubstationOrgVO implements Serializable { /** * 日均超标监测点数（根据 日表的超标监测点数 取平均值） */ - private Integer overLimitMeasurementAverage; + private Float overLimitMeasurementAverage; /** * 累计超标监测点数（监测点指标统计明细日表 统计） */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java index 6f48da80a..4e01a0816 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java @@ -94,7 +94,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl dayDataHanlder(@RequestBody LineParam jobParam); + @PostMapping("/dataToDay") + HttpResult dataToDayHandler(@RequestBody LineParam jobParam); + } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java index 300711029..53cf7938a 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @createTime 2022/11/4 15:58 */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE, + value = ServerInfo.PREPARE_BOOT, path = "/distortion", fallbackFactory = DistortionRateFeignClientFallbackFactory.class ) diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java index 783fef079..8baa1005c 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE, + value = ServerInfo.PREPARE_BOOT, path = "/general", fallbackFactory = DistortionRateFeignClientFallbackFactory.class ) @@ -25,4 +25,7 @@ public interface HarmonicGeneralFeignClient { @PostMapping("/generalData") HttpResult generalData(@RequestBody @Validated LineParam lineParam); + + @PostMapping("/generalDataToMysql") + HttpResult generalDataToMysql(@RequestBody @Validated LineParam lineParam); } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java index 9733f79de..35fe7df27 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE, + value = ServerInfo.PREPARE_BOOT, path = "/metric", fallbackFactory = HarmonicMetricFeignClientFallbackFactory.class ) @@ -24,4 +24,7 @@ public interface HarmonicMetricFeignClient { @PostMapping("/metricData") HttpResult metricData(@RequestBody @Validated LineParam lineParam); + + @PostMapping("/metricDataToMysql") + HttpResult metricDataToMysql(@RequestBody @Validated LineParam lineParam); } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java index d0bfd73a4..2b745fbfb 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @date 2022/10/20 */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + value = ServerInfo.PREPARE_BOOT,//对应模块名 path = "/integrity",//对应controller请求类 fallbackFactory = IntegrityFeignClientFallbackFactory.class//服务降级处理类 ) @@ -29,4 +29,7 @@ public interface IntegrityFeignClient { @PostMapping("/computeDataIntegrity") HttpResult computeDataIntegrity(@RequestBody @Validated LineParam lineParam); + @PostMapping("/dataIntegrity") + HttpResult dataIntegrity(@RequestBody @Validated LineParam lineParam); + } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java index 51341caa4..b90088894 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @date 2022/10/20 */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + value = ServerInfo.PREPARE_BOOT,//对应模块名 path = "/limitTarget",//对应controller请求类 fallbackFactory = LimitTargetFeignClientFallbackFactory.class//服务降级处理类 ) @@ -29,4 +29,7 @@ public interface LimitTargetFeignClient { @PostMapping("/getLimitTargetData") HttpResult getLimitTargetData(@RequestBody @Validated LineParam lineParam); + @PostMapping("/limitTargetData") + HttpResult limitTargetData(@RequestBody @Validated LineParam lineParam); + } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java index b6135bd1c..c694826b0 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @date 2022/10/20 */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + value = ServerInfo.PREPARE_BOOT,//对应模块名 path = "/limitrate",//对应controller请求类 fallbackFactory = LimitrateFeignClientFallbackFactory.class//服务降级处理类 ) @@ -26,4 +26,7 @@ public interface LimitrateFeignClient { @PostMapping("/LimitRateHanlder") HttpResult limitRateHanlder(@RequestBody LineParam limitRateHanlderParam ); + @PostMapping("/LimitRate") + HttpResult limitRate(@RequestBody LineParam limitRateHanlderParam ); + } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java index dd3b1a80a..585c6a967 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @date 2022/10/20 */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + value = ServerInfo.PREPARE_BOOT,//对应模块名 path = "/normalLimit",//对应controller请求类 fallbackFactory = NormalFeignClientFallbackFactory.class//服务降级处理类 ) diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java index 586c7d11e..9fda2e8c7 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @date 2022/10/20 */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + value = ServerInfo.PREPARE_BOOT,//对应模块名 path = "/onlineRate",//对应controller请求类 fallbackFactory = OnlineRateFeignClientFallbackFactory.class//服务降级处理类 ) @@ -27,4 +27,7 @@ public interface OnlineRateFeignClient { @PostMapping("/getOnlineRateData") HttpResult getOnlineRateData(@RequestBody @Validated LineParam lineParam); + @PostMapping("/onlineRateData") + HttpResult onlineRateData(@RequestBody @Validated LineParam lineParam); + } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java index 3cccf3d4d..519408c10 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java @@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** - * 自定义报表 + * 污区数据（日,月,年） * @author qijian * @date 2022/10/20 */ @FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + value = ServerInfo.PREPARE_BOOT,//对应模块名 path = "/pollution",//对应controller请求类 fallbackFactory = PollutionFeignClientFallbackFactory.class//服务降级处理类 ) diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java index 0e772755f..7c5ac22f1 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java @@ -37,6 +37,12 @@ public class DayDataFeignClientFallbackFactory implements FallbackFactory dataToDayHandler(LineParam jobParam) { + log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java index 01c971378..12f7048a2 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java @@ -35,6 +35,12 @@ public class HarmonicGeneralFeignClientFallbackFactory implements FallbackFactor log.error("{}异常，降级处理，异常为：{}", "稳态综合评估: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } + + @Override + public HttpResult generalDataToMysql(LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "稳态综合评估: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java index 0acf887c1..26664f3b0 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java @@ -35,6 +35,12 @@ public class HarmonicMetricFeignClientFallbackFactory implements FallbackFactory log.error("{}异常，降级处理，异常为：{}", "稳态指标评估: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } + + @Override + public HttpResult metricDataToMysql(LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "稳态指标评估: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java index bdd909121..9a6552fd1 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java @@ -34,6 +34,12 @@ public class IntegrityFeignClientFallbackFactory implements FallbackFactory dataIntegrity(LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "数据完整性处理: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java index 2c6844bd3..5cc1384be 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java @@ -38,6 +38,12 @@ public class LimitTargetFeignClientFallbackFactory implements FallbackFactory
  • limitTargetData(LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "越限数据: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java index 93780ce7f..2780e5743 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java @@ -37,6 +37,12 @@ public class LimitrateFeignClientFallbackFactory implements FallbackFactory limitRate(LineParam limitRateHanlderParam) { + log.error("{}异常，降级处理，异常为：{}", "越限数据处理: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java index b3f509d66..31258f085 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java @@ -34,6 +34,12 @@ public class OnlineRateFeignClientFallbackFactory implements FallbackFactory onlineRateData(LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "在线率: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/SuperviseDto.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/SuperviseDto.java new file mode 100644 index 000000000..9fa7f5e2e --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/SuperviseDto.java @@ -0,0 +1,13 @@ +package com.njcn.prepare.harmonic.pojo.dto; + +import com.njcn.web.pojo.param.BaseParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class SuperviseDto extends BaseParam { + @ApiModelProperty("删除的技术监督id集合") + private List deleteIds; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/UploadSuperviceTicketDto.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/UploadSuperviceTicketDto.java new file mode 100644 index 000000000..ada35a196 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/UploadSuperviceTicketDto.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.pojo.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class UploadSuperviceTicketDto { + @ApiModelProperty("告警/预警监测点记录id") + private String id; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java index 4da48bffe..d8dfe9a8f 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java @@ -29,7 +29,7 @@ public class LineParam { @NotBlank(message = "时间不可为空") private String dataDate; - @ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb）") + @ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb 2:mysql）") @NotNull(message = "数据源不可为空") private Integer dataSource; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SuperviseParam.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SuperviseParam.java index 32836ca86..4750d97a1 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SuperviseParam.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SuperviseParam.java @@ -1,6 +1,7 @@ package com.njcn.prepare.harmonic.pojo.param; import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; +import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,4 +18,12 @@ public class SuperviseParam { private String deptId; @ApiModelProperty(name = "overRunLog", value = "监测点集合") private List overRunLog; + @ApiModelProperty(name = "supIndex", value = "技术监督Guid") + private String supIndex; + @ApiModelProperty(name = "name", value = "技术监督名称") + private String name; + @ApiModelProperty(name = "description", value = "描述") + private String description; + @ApiModelProperty(name = "thsSupervise", value = "技术监督参数") + private ThsSupervise thsSupervise; } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAssesDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAssesDPO.java new file mode 100644 index 000000000..59fc8f3bb --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatAssesDPO.java @@ -0,0 +1,44 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/27 15:20 + */ +@Data +@TableName(value = "r_stat_asses_d") +public class RStatAssesDPO implements Serializable { + + @MppMultiId + @TableField(value = "time_id") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @TableField(value = "vu_dev") + private Double vuDev; + + @TableField(value = "freq_dev") + private Double freqDev; + + @TableField(value = "data_plt") + private Double dataPlt; + + @TableField(value = "v_unbalance_cp95") + private Double vUnbalanceCp95; + + @TableField(value = "v_thd_cp95") + private Double vThdCp95; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java new file mode 100644 index 000000000..2c96e8498 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatComassesDPO.java @@ -0,0 +1,120 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/27 15:20 + */ +@Data +@TableName(value = "r_stat_comasses_d") +public class RStatComassesDPO implements Serializable { + + @MppMultiId + @TableField(value = "time_id") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @TableField(value = "freq_dev1") + private Double freqDev1; + + @TableField(value = "freq_dev2") + private Double freqDev2; + + @TableField(value = "freq_dev3") + private Double freqDev3; + + @TableField(value = "freq_dev4") + private Double freqDev4; + + @TableField(value = "freq_dev5") + private Double freqDev5; + + @TableField(value = "vu_dev1") + private Double vuDev1; + + @TableField(value = "vu_dev2") + private Double vuDev2; + + @TableField(value = "vu_dev3") + private Double vuDev3; + + @TableField(value = "vu_dev4") + private Double vuDev4; + + @TableField(value = "vu_dev5") + private Double vuDev5; + + @TableField(value = "data_pst1") + private Double dataPst1; + + @TableField(value = "data_pst2") + private Double dataPst2; + + @TableField(value = "data_pst3") + private Double dataPst3; + + @TableField(value = "data_pst4") + private Double dataPst4; + + @TableField(value = "data_pst5") + private Double dataPst5; + + @TableField(value = "v_unbalance1") + private Double vUnbalance1; + + @TableField(value = "v_unbalance2") + private Double vUnbalance2; + + @TableField(value = "v_unbalance3") + private Double vUnbalance3; + + @TableField(value = "v_unbalance4") + private Double vUnbalance4; + + @TableField(value = "v_unbalance5") + private Double vUnbalance5; + + @TableField(value = "v_thd1") + private Double vThd1; + + @TableField(value = "v_thd2") + private Double vThd2; + + @TableField(value = "v_thd3") + private Double vThd3; + + @TableField(value = "v_thd4") + private Double vThd4; + + @TableField(value = "v_thd5") + private Double vThd5; + + @TableField(value = "event1") + private Double event1; + + @TableField(value = "event2") + private Double event2; + + @TableField(value = "event3") + private Double event3; + + @TableField(value = "event4") + private Double event4; + + @TableField(value = "event5") + private Double event5; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlickerDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlickerDPO.java new file mode 100644 index 000000000..b1d1b27ad --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlickerDPO.java @@ -0,0 +1,51 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/22 19:07 + */ +@Data +@TableName(value = "r_stat_data_flicker_d") +public class RStatDataFlickerDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "fluc") + private Double fluc; + + @TableField(value = "plt") + private Double plt; + + @TableField(value = "pst") + private Double pst; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlucDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlucDPO.java new file mode 100644 index 000000000..fe132ea9f --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataFlucDPO.java @@ -0,0 +1,46 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 11:21 + */ +@Data +@TableName(value = "r_stat_data_fluc_d") +public class RStatDataFlucDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "fluc") + private Double fluc; + + @TableField(value = "fluccf") + private Double fluccf; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicIDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicIDPO.java new file mode 100644 index 000000000..92ba9399f --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicIDPO.java @@ -0,0 +1,190 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 11:39 + */ +@Data +@TableName(value = "r_stat_data_harmphasic_i_d") +public class RStatDataHarmphasicIDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "i_1") + private Double i1; + + @TableField(value = "i_2") + private Double i2; + + @TableField(value = "i_3") + private Double i3; + + @TableField(value = "i_4") + private Double i4; + + @TableField(value = "i_5") + private Double i5; + + @TableField(value = "i_6") + private Double i6; + + @TableField(value = "i_7") + private Double i7; + + @TableField(value = "i_8") + private Double i8; + + @TableField(value = "i_9") + private Double i9; + + @TableField(value = "i_10") + private Double i10; + + @TableField(value = "i_11") + private Double i11; + + @TableField(value = "i_12") + private Double i12; + + @TableField(value = "i_13") + private Double i13; + + @TableField(value = "i_14") + private Double i14; + + @TableField(value = "i_15") + private Double i15; + + @TableField(value = "i_16") + private Double i16; + + @TableField(value = "i_17") + private Double i17; + + @TableField(value = "i_18") + private Double i18; + + @TableField(value = "i_19") + private Double i19; + + @TableField(value = "i_20") + private Double i20; + + @TableField(value = "i_21") + private Double i21; + + @TableField(value = "i_22") + private Double i22; + + @TableField(value = "i_23") + private Double i23; + + @TableField(value = "i_24") + private Double i24; + + @TableField(value = "i_25") + private Double i25; + + @TableField(value = "i_26") + private Double i26; + + @TableField(value = "i_27") + private Double i27; + + @TableField(value = "i_28") + private Double i28; + + @TableField(value = "i_29") + private Double i29; + + @TableField(value = "i_30") + private Double i30; + + @TableField(value = "i_31") + private Double i31; + + @TableField(value = "i_32") + private Double i32; + + @TableField(value = "i_33") + private Double i33; + + @TableField(value = "i_34") + private Double i34; + + @TableField(value = "i_35") + private Double i35; + + @TableField(value = "i_36") + private Double i36; + + @TableField(value = "i_37") + private Double i37; + + @TableField(value = "i_38") + private Double i38; + + @TableField(value = "i_39") + private Double i39; + + @TableField(value = "i_40") + private Double i40; + + @TableField(value = "i_41") + private Double i41; + + @TableField(value = "i_42") + private Double i42; + + @TableField(value = "i_43") + private Double i43; + + @TableField(value = "i_44") + private Double i44; + + @TableField(value = "i_45") + private Double i45; + + @TableField(value = "i_46") + private Double i46; + + @TableField(value = "i_47") + private Double i47; + + @TableField(value = "i_48") + private Double i48; + + @TableField(value = "i_49") + private Double i49; + + @TableField(value = "i_50") + private Double i50; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicVDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicVDPO.java new file mode 100644 index 000000000..0181eacfa --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmphasicVDPO.java @@ -0,0 +1,190 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 11:39 + */ +@Data +@TableName(value = "r_stat_data_harmphasic_v_d") +public class RStatDataHarmphasicVDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "v_1") + private Double v1; + + @TableField(value = "v_2") + private Double v2; + + @TableField(value = "v_3") + private Double v3; + + @TableField(value = "v_4") + private Double v4; + + @TableField(value = "v_5") + private Double v5; + + @TableField(value = "v_6") + private Double v6; + + @TableField(value = "v_7") + private Double v7; + + @TableField(value = "v_8") + private Double v8; + + @TableField(value = "v_9") + private Double v9; + + @TableField(value = "v_10") + private Double v10; + + @TableField(value = "v_11") + private Double v11; + + @TableField(value = "v_12") + private Double v12; + + @TableField(value = "v_13") + private Double v13; + + @TableField(value = "v_14") + private Double v14; + + @TableField(value = "v_15") + private Double v15; + + @TableField(value = "v_16") + private Double v16; + + @TableField(value = "v_17") + private Double v17; + + @TableField(value = "v_18") + private Double v18; + + @TableField(value = "v_19") + private Double v19; + + @TableField(value = "v_20") + private Double v20; + + @TableField(value = "v_21") + private Double v21; + + @TableField(value = "v_22") + private Double v22; + + @TableField(value = "v_23") + private Double v23; + + @TableField(value = "v_24") + private Double v24; + + @TableField(value = "v_25") + private Double v25; + + @TableField(value = "v_26") + private Double v26; + + @TableField(value = "v_27") + private Double v27; + + @TableField(value = "v_28") + private Double v28; + + @TableField(value = "v_29") + private Double v29; + + @TableField(value = "v_30") + private Double v30; + + @TableField(value = "v_31") + private Double v31; + + @TableField(value = "v_32") + private Double v32; + + @TableField(value = "v_33") + private Double v33; + + @TableField(value = "v_34") + private Double v34; + + @TableField(value = "v_35") + private Double v35; + + @TableField(value = "v_36") + private Double v36; + + @TableField(value = "v_37") + private Double v37; + + @TableField(value = "v_38") + private Double v38; + + @TableField(value = "v_39") + private Double v39; + + @TableField(value = "v_40") + private Double v40; + + @TableField(value = "v_41") + private Double v41; + + @TableField(value = "v_42") + private Double v42; + + @TableField(value = "v_43") + private Double v43; + + @TableField(value = "v_44") + private Double v44; + + @TableField(value = "v_45") + private Double v45; + + @TableField(value = "v_46") + private Double v46; + + @TableField(value = "v_47") + private Double v47; + + @TableField(value = "v_48") + private Double v48; + + @TableField(value = "v_49") + private Double v49; + + @TableField(value = "v_50") + private Double v50; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerPDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerPDPO.java new file mode 100644 index 000000000..4c76ad230 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerPDPO.java @@ -0,0 +1,200 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; +import org.influxdb.annotation.Column; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 13:31 + */ +@Data +@TableName(value = "r_stat_data_harmpower_p_d") +public class RStatDataHarmpowerPDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "df") + private Double df; + + @TableField(value = "pf") + private Double pf; + + @TableField(value = "p") + private Double p; + + @TableField(value = "p_1") + private Double p1; + + @TableField(value = "p_2") + private Double p2; + + @TableField(value = "p_3") + private Double p3; + + @TableField(value = "p_4") + private Double p4; + + @TableField(value = "p_5") + private Double p5; + + @TableField(value = "p_6") + private Double p6; + + @TableField(value = "p_7") + private Double p7; + + @TableField(value = "p_8") + private Double p8; + + @TableField(value = "p_9") + private Double p9; + + @TableField(value = "p_10") + private Double p10; + + @TableField(value = "p_11") + private Double p11; + + @TableField(value = "p_12") + private Double p12; + + @TableField(value = "p_13") + private Double p13; + + @TableField(value = "p_14") + private Double p14; + + @TableField(value = "p_15") + private Double p15; + + @TableField(value = "p_16") + private Double p16; + + @TableField(value = "p_17") + private Double p17; + + @TableField(value = "p_18") + private Double p18; + + @TableField(value = "p_19") + private Double p19; + + @TableField(value = "p_20") + private Double p20; + + @TableField(value = "p_21") + private Double p21; + + @TableField(value = "p_22") + private Double p22; + + @TableField(value = "p_23") + private Double p23; + + @TableField(value = "p_24") + private Double p24; + + @TableField(value = "p_25") + private Double p25; + + @TableField(value = "p_26") + private Double p26; + + @TableField(value = "p_27") + private Double p27; + + @TableField(value = "p_28") + private Double p28; + + @TableField(value = "p_29") + private Double p29; + + @TableField(value = "p_30") + private Double p30; + + @TableField(value = "p_31") + private Double p31; + + @TableField(value = "p_32") + private Double p32; + + @TableField(value = "p_33") + private Double p33; + + @TableField(value = "p_34") + private Double p34; + + @TableField(value = "p_35") + private Double p35; + + @TableField(value = "p_36") + private Double p36; + + @TableField(value = "p_37") + private Double p37; + + @TableField(value = "p_38") + private Double p38; + + @TableField(value = "p_39") + private Double p39; + + @TableField(value = "p_40") + private Double p40; + + @TableField(value = "p_41") + private Double p41; + + @TableField(value = "p_42") + private Double p42; + + @TableField(value = "p_43") + private Double p43; + + @TableField(value = "p_44") + private Double p44; + + @TableField(value = "p_45") + private Double p45; + + @TableField(value = "p_46") + private Double p46; + + @TableField(value = "p_47") + private Double p47; + + @TableField(value = "p_48") + private Double p48; + + @TableField(value = "p_49") + private Double p49; + + @TableField(value = "p_50") + private Double p50; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerQDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerQDPO.java new file mode 100644 index 000000000..3a3670dca --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerQDPO.java @@ -0,0 +1,193 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 13:31 + */ +@Data +@TableName(value = "r_stat_data_harmpower_q_d") +public class RStatDataHarmpowerQDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "q") + private Double q; + + @TableField(value = "q_1") + private Double q1; + + @TableField(value = "q_2") + private Double q2; + + @TableField(value = "q_3") + private Double q3; + + @TableField(value = "q_4") + private Double q4; + + @TableField(value = "q_5") + private Double q5; + + @TableField(value = "q_6") + private Double q6; + + @TableField(value = "q_7") + private Double q7; + + @TableField(value = "q_8") + private Double q8; + + @TableField(value = "q_9") + private Double q9; + + @TableField(value = "q_10") + private Double q10; + + @TableField(value = "q_11") + private Double q11; + + @TableField(value = "q_12") + private Double q12; + + @TableField(value = "q_13") + private Double q13; + + @TableField(value = "q_14") + private Double q14; + + @TableField(value = "q_15") + private Double q15; + + @TableField(value = "q_16") + private Double q16; + + @TableField(value = "q_17") + private Double q17; + + @TableField(value = "q_18") + private Double q18; + + @TableField(value = "q_19") + private Double q19; + + @TableField(value = "q_20") + private Double q20; + + @TableField(value = "q_21") + private Double q21; + + @TableField(value = "q_22") + private Double q22; + + @TableField(value = "q_23") + private Double q23; + + @TableField(value = "q_24") + private Double q24; + + @TableField(value = "q_25") + private Double q25; + + @TableField(value = "q_26") + private Double q26; + + @TableField(value = "q_27") + private Double q27; + + @TableField(value = "q_28") + private Double q28; + + @TableField(value = "q_29") + private Double q29; + + @TableField(value = "q_30") + private Double q30; + + @TableField(value = "q_31") + private Double q31; + + @TableField(value = "q_32") + private Double q32; + + @TableField(value = "q_33") + private Double q33; + + @TableField(value = "q_34") + private Double q34; + + @TableField(value = "q_35") + private Double q35; + + @TableField(value = "q_36") + private Double q36; + + @TableField(value = "q_37") + private Double q37; + + @TableField(value = "q_38") + private Double q38; + + @TableField(value = "q_39") + private Double q39; + + @TableField(value = "q_40") + private Double q40; + + @TableField(value = "q_41") + private Double q41; + + @TableField(value = "q_42") + private Double q42; + + @TableField(value = "q_43") + private Double q43; + + @TableField(value = "q_44") + private Double q44; + + @TableField(value = "q_45") + private Double q45; + + @TableField(value = "q_46") + private Double q46; + + @TableField(value = "q_47") + private Double q47; + + @TableField(value = "q_48") + private Double q48; + + @TableField(value = "q_49") + private Double q49; + + @TableField(value = "q_50") + private Double q50; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerSDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerSDPO.java new file mode 100644 index 000000000..ee4a7c1f2 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmpowerSDPO.java @@ -0,0 +1,193 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 13:31 + */ +@Data +@TableName(value = "r_stat_data_harmpower_s_d") +public class RStatDataHarmpowerSDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "s") + private Double s; + + @TableField(value = "s_1") + private Double s1; + + @TableField(value = "s_2") + private Double s2; + + @TableField(value = "s_3") + private Double s3; + + @TableField(value = "s_4") + private Double s4; + + @TableField(value = "s_5") + private Double s5; + + @TableField(value = "s_6") + private Double s6; + + @TableField(value = "s_7") + private Double s7; + + @TableField(value = "s_8") + private Double s8; + + @TableField(value = "s_9") + private Double s9; + + @TableField(value = "s_10") + private Double s10; + + @TableField(value = "s_11") + private Double s11; + + @TableField(value = "s_12") + private Double s12; + + @TableField(value = "s_13") + private Double s13; + + @TableField(value = "s_14") + private Double s14; + + @TableField(value = "s_15") + private Double s15; + + @TableField(value = "s_16") + private Double s16; + + @TableField(value = "s_17") + private Double s17; + + @TableField(value = "s_18") + private Double s18; + + @TableField(value = "s_19") + private Double s19; + + @TableField(value = "s_20") + private Double s20; + + @TableField(value = "s_21") + private Double s21; + + @TableField(value = "s_22") + private Double s22; + + @TableField(value = "s_23") + private Double s23; + + @TableField(value = "s_24") + private Double s24; + + @TableField(value = "s_25") + private Double s25; + + @TableField(value = "s_26") + private Double s26; + + @TableField(value = "s_27") + private Double s27; + + @TableField(value = "s_28") + private Double s28; + + @TableField(value = "s_29") + private Double s29; + + @TableField(value = "s_30") + private Double s30; + + @TableField(value = "s_31") + private Double s31; + + @TableField(value = "s_32") + private Double s32; + + @TableField(value = "s_33") + private Double s33; + + @TableField(value = "s_34") + private Double s34; + + @TableField(value = "s_35") + private Double s35; + + @TableField(value = "s_36") + private Double s36; + + @TableField(value = "s_37") + private Double s37; + + @TableField(value = "s_38") + private Double s38; + + @TableField(value = "s_39") + private Double s39; + + @TableField(value = "s_40") + private Double s40; + + @TableField(value = "s_41") + private Double s41; + + @TableField(value = "s_42") + private Double s42; + + @TableField(value = "s_43") + private Double s43; + + @TableField(value = "s_44") + private Double s44; + + @TableField(value = "s_45") + private Double s45; + + @TableField(value = "s_46") + private Double s46; + + @TableField(value = "s_47") + private Double s47; + + @TableField(value = "s_48") + private Double s48; + + @TableField(value = "s_49") + private Double s49; + + @TableField(value = "s_50") + private Double s50; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateIDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateIDPO.java new file mode 100644 index 000000000..2ab255ede --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateIDPO.java @@ -0,0 +1,191 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 14:18 + */ +@Data +@TableName(value = "r_stat_data_harmrate_i_d") +public class RStatDataHarmrateIDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "i_1") + private Double i1; + + @TableField(value = "i_2") + private Double i2; + + @TableField(value = "i_3") + private Double i3; + + @TableField(value = "i_4") + private Double i4; + + @TableField(value = "i_5") + private Double i5; + + @TableField(value = "i_6") + private Double i6; + + @TableField(value = "i_7") + private Double i7; + + @TableField(value = "i_8") + private Double i8; + + @TableField(value = "i_9") + private Double i9; + + @TableField(value = "i_10") + private Double i10; + + @TableField(value = "i_11") + private Double i11; + + @TableField(value = "i_12") + private Double i12; + + @TableField(value = "i_13") + private Double i13; + + @TableField(value = "i_14") + private Double i14; + + @TableField(value = "i_15") + private Double i15; + + @TableField(value = "i_16") + private Double i16; + + @TableField(value = "i_17") + private Double i17; + + @TableField(value = "i_18") + private Double i18; + + @TableField(value = "i_19") + private Double i19; + + @TableField(value = "i_20") + private Double i20; + + @TableField(value = "i_21") + private Double i21; + + @TableField(value = "i_22") + private Double i22; + + @TableField(value = "i_23") + private Double i23; + + @TableField(value = "i_24") + private Double i24; + + @TableField(value = "i_25") + private Double i25; + + @TableField(value = "i_26") + private Double i26; + + @TableField(value = "i_27") + private Double i27; + + @TableField(value = "i_28") + private Double i28; + + @TableField(value = "i_29") + private Double i29; + + @TableField(value = "i_30") + private Double i30; + + @TableField(value = "i_31") + private Double i31; + + @TableField(value = "i_32") + private Double i32; + + @TableField(value = "i_33") + private Double i33; + + @TableField(value = "i_34") + private Double i34; + + @TableField(value = "i_35") + private Double i35; + + @TableField(value = "i_36") + private Double i36; + + @TableField(value = "i_37") + private Double i37; + + @TableField(value = "i_38") + private Double i38; + + @TableField(value = "i_39") + private Double i39; + + @TableField(value = "i_40") + private Double i40; + + @TableField(value = "i_41") + private Double i41; + + @TableField(value = "i_42") + private Double i42; + + @TableField(value = "i_43") + private Double i43; + + @TableField(value = "i_44") + private Double i44; + + @TableField(value = "i_45") + private Double i45; + + @TableField(value = "i_46") + private Double i46; + + @TableField(value = "i_47") + private Double i47; + + @TableField(value = "i_48") + private Double i48; + + @TableField(value = "i_49") + private Double i49; + + @TableField(value = "i_50") + private Double i50; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateVDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateVDPO.java new file mode 100644 index 000000000..af8217445 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataHarmrateVDPO.java @@ -0,0 +1,191 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 14:18 + */ +@Data +@TableName(value = "r_stat_data_harmrate_v_d") +public class RStatDataHarmrateVDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "v_1") + private Double v1; + + @TableField(value = "v_2") + private Double v2; + + @TableField(value = "v_3") + private Double v3; + + @TableField(value = "v_4") + private Double v4; + + @TableField(value = "v_5") + private Double v5; + + @TableField(value = "v_6") + private Double v6; + + @TableField(value = "v_7") + private Double v7; + + @TableField(value = "v_8") + private Double v8; + + @TableField(value = "v_9") + private Double v9; + + @TableField(value = "v_10") + private Double v10; + + @TableField(value = "v_11") + private Double v11; + + @TableField(value = "v_12") + private Double v12; + + @TableField(value = "v_13") + private Double v13; + + @TableField(value = "v_14") + private Double v14; + + @TableField(value = "v_15") + private Double v15; + + @TableField(value = "v_16") + private Double v16; + + @TableField(value = "v_17") + private Double v17; + + @TableField(value = "v_18") + private Double v18; + + @TableField(value = "v_19") + private Double v19; + + @TableField(value = "v_20") + private Double v20; + + @TableField(value = "v_21") + private Double v21; + + @TableField(value = "v_22") + private Double v22; + + @TableField(value = "v_23") + private Double v23; + + @TableField(value = "v_24") + private Double v24; + + @TableField(value = "v_25") + private Double v25; + + @TableField(value = "v_26") + private Double v26; + + @TableField(value = "v_27") + private Double v27; + + @TableField(value = "v_28") + private Double v28; + + @TableField(value = "v_29") + private Double v29; + + @TableField(value = "v_30") + private Double v30; + + @TableField(value = "v_31") + private Double v31; + + @TableField(value = "v_32") + private Double v32; + + @TableField(value = "v_33") + private Double v33; + + @TableField(value = "v_34") + private Double v34; + + @TableField(value = "v_35") + private Double v35; + + @TableField(value = "v_36") + private Double v36; + + @TableField(value = "v_37") + private Double v37; + + @TableField(value = "v_38") + private Double v38; + + @TableField(value = "v_39") + private Double v39; + + @TableField(value = "v_40") + private Double v40; + + @TableField(value = "v_41") + private Double v41; + + @TableField(value = "v_42") + private Double v42; + + @TableField(value = "v_43") + private Double v43; + + @TableField(value = "v_44") + private Double v44; + + @TableField(value = "v_45") + private Double v45; + + @TableField(value = "v_46") + private Double v46; + + @TableField(value = "v_47") + private Double v47; + + @TableField(value = "v_48") + private Double v48; + + @TableField(value = "v_49") + private Double v49; + + @TableField(value = "v_50") + private Double v50; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataIDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataIDPO.java new file mode 100644 index 000000000..a709ef67c --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataIDPO.java @@ -0,0 +1,209 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 14:29 + */ +@Data +@TableName(value = "r_stat_data_i_d") +public class RStatDataIDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "i_neg") + private Double iNeg; + + @TableField(value = "i_pos") + private Double iPos; + + @TableField(value = "i_thd") + private Double iThd; + + @TableField(value = "i_unbalance") + private Double iUnbalance; + + @TableField(value = "i_zero") + private Double iZero; + + @TableField(value = "rms") + private Double rms; + + @TableField(value = "i_1") + private Double i1; + + @TableField(value = "i_2") + private Double i2; + + @TableField(value = "i_3") + private Double i3; + + @TableField(value = "i_4") + private Double i4; + + @TableField(value = "i_5") + private Double i5; + + @TableField(value = "i_6") + private Double i6; + + @TableField(value = "i_7") + private Double i7; + + @TableField(value = "i_8") + private Double i8; + + @TableField(value = "i_9") + private Double i9; + + @TableField(value = "i_10") + private Double i10; + + @TableField(value = "i_11") + private Double i11; + + @TableField(value = "i_12") + private Double i12; + + @TableField(value = "i_13") + private Double i13; + + @TableField(value = "i_14") + private Double i14; + + @TableField(value = "i_15") + private Double i15; + + @TableField(value = "i_16") + private Double i16; + + @TableField(value = "i_17") + private Double i17; + + @TableField(value = "i_18") + private Double i18; + + @TableField(value = "i_19") + private Double i19; + + @TableField(value = "i_20") + private Double i20; + + @TableField(value = "i_21") + private Double i21; + + @TableField(value = "i_22") + private Double i22; + + @TableField(value = "i_23") + private Double i23; + + @TableField(value = "i_24") + private Double i24; + + @TableField(value = "i_25") + private Double i25; + + @TableField(value = "i_26") + private Double i26; + + @TableField(value = "i_27") + private Double i27; + + @TableField(value = "i_28") + private Double i28; + + @TableField(value = "i_29") + private Double i29; + + @TableField(value = "i_30") + private Double i30; + + @TableField(value = "i_31") + private Double i31; + + @TableField(value = "i_32") + private Double i32; + + @TableField(value = "i_33") + private Double i33; + + @TableField(value = "i_34") + private Double i34; + + @TableField(value = "i_35") + private Double i35; + + @TableField(value = "i_36") + private Double i36; + + @TableField(value = "i_37") + private Double i37; + + @TableField(value = "i_38") + private Double i38; + + @TableField(value = "i_39") + private Double i39; + + @TableField(value = "i_40") + private Double i40; + + @TableField(value = "i_41") + private Double i41; + + @TableField(value = "i_42") + private Double i42; + + @TableField(value = "i_43") + private Double i43; + + @TableField(value = "i_44") + private Double i44; + + @TableField(value = "i_45") + private Double i45; + + @TableField(value = "i_46") + private Double i46; + + @TableField(value = "i_47") + private Double i47; + + @TableField(value = "i_48") + private Double i48; + + @TableField(value = "i_49") + private Double i49; + + @TableField(value = "i_50") + private Double i50; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmIDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmIDPO.java new file mode 100644 index 000000000..e0ed40f03 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmIDPO.java @@ -0,0 +1,191 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 14:36 + */ +@Data +@TableName(value = "r_stat_data_inharm_i_d") +public class RStatDataInharmIDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "i_1") + private Double i1; + + @TableField(value = "i_2") + private Double i2; + + @TableField(value = "i_3") + private Double i3; + + @TableField(value = "i_4") + private Double i4; + + @TableField(value = "i_5") + private Double i5; + + @TableField(value = "i_6") + private Double i6; + + @TableField(value = "i_7") + private Double i7; + + @TableField(value = "i_8") + private Double i8; + + @TableField(value = "i_9") + private Double i9; + + @TableField(value = "i_10") + private Double i10; + + @TableField(value = "i_11") + private Double i11; + + @TableField(value = "i_12") + private Double i12; + + @TableField(value = "i_13") + private Double i13; + + @TableField(value = "i_14") + private Double i14; + + @TableField(value = "i_15") + private Double i15; + + @TableField(value = "i_16") + private Double i16; + + @TableField(value = "i_17") + private Double i17; + + @TableField(value = "i_18") + private Double i18; + + @TableField(value = "i_19") + private Double i19; + + @TableField(value = "i_20") + private Double i20; + + @TableField(value = "i_21") + private Double i21; + + @TableField(value = "i_22") + private Double i22; + + @TableField(value = "i_23") + private Double i23; + + @TableField(value = "i_24") + private Double i24; + + @TableField(value = "i_25") + private Double i25; + + @TableField(value = "i_26") + private Double i26; + + @TableField(value = "i_27") + private Double i27; + + @TableField(value = "i_28") + private Double i28; + + @TableField(value = "i_29") + private Double i29; + + @TableField(value = "i_30") + private Double i30; + + @TableField(value = "i_31") + private Double i31; + + @TableField(value = "i_32") + private Double i32; + + @TableField(value = "i_33") + private Double i33; + + @TableField(value = "i_34") + private Double i34; + + @TableField(value = "i_35") + private Double i35; + + @TableField(value = "i_36") + private Double i36; + + @TableField(value = "i_37") + private Double i37; + + @TableField(value = "i_38") + private Double i38; + + @TableField(value = "i_39") + private Double i39; + + @TableField(value = "i_40") + private Double i40; + + @TableField(value = "i_41") + private Double i41; + + @TableField(value = "i_42") + private Double i42; + + @TableField(value = "i_43") + private Double i43; + + @TableField(value = "i_44") + private Double i44; + + @TableField(value = "i_45") + private Double i45; + + @TableField(value = "i_46") + private Double i46; + + @TableField(value = "i_47") + private Double i47; + + @TableField(value = "i_48") + private Double i48; + + @TableField(value = "i_49") + private Double i49; + + @TableField(value = "i_50") + private Double i50; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmVDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmVDPO.java new file mode 100644 index 000000000..00cbe8f1a --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataInharmVDPO.java @@ -0,0 +1,191 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 14:36 + */ +@Data +@TableName(value = "r_stat_data_inharm_v_d") +public class RStatDataInharmVDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "v_1") + private Double v1; + + @TableField(value = "v_2") + private Double v2; + + @TableField(value = "v_3") + private Double v3; + + @TableField(value = "v_4") + private Double v4; + + @TableField(value = "v_5") + private Double v5; + + @TableField(value = "v_6") + private Double v6; + + @TableField(value = "v_7") + private Double v7; + + @TableField(value = "v_8") + private Double v8; + + @TableField(value = "v_9") + private Double v9; + + @TableField(value = "v_10") + private Double v10; + + @TableField(value = "v_11") + private Double v11; + + @TableField(value = "v_12") + private Double v12; + + @TableField(value = "v_13") + private Double v13; + + @TableField(value = "v_14") + private Double v14; + + @TableField(value = "v_15") + private Double v15; + + @TableField(value = "v_16") + private Double v16; + + @TableField(value = "v_17") + private Double v17; + + @TableField(value = "v_18") + private Double v18; + + @TableField(value = "v_19") + private Double v19; + + @TableField(value = "v_20") + private Double v20; + + @TableField(value = "v_21") + private Double v21; + + @TableField(value = "v_22") + private Double v22; + + @TableField(value = "v_23") + private Double v23; + + @TableField(value = "v_24") + private Double v24; + + @TableField(value = "v_25") + private Double v25; + + @TableField(value = "v_26") + private Double v26; + + @TableField(value = "v_27") + private Double v27; + + @TableField(value = "v_28") + private Double v28; + + @TableField(value = "v_29") + private Double v29; + + @TableField(value = "v_30") + private Double v30; + + @TableField(value = "v_31") + private Double v31; + + @TableField(value = "v_32") + private Double v32; + + @TableField(value = "v_33") + private Double v33; + + @TableField(value = "v_34") + private Double v34; + + @TableField(value = "v_35") + private Double v35; + + @TableField(value = "v_36") + private Double v36; + + @TableField(value = "v_37") + private Double v37; + + @TableField(value = "v_38") + private Double v38; + + @TableField(value = "v_39") + private Double v39; + + @TableField(value = "v_40") + private Double v40; + + @TableField(value = "v_41") + private Double v41; + + @TableField(value = "v_42") + private Double v42; + + @TableField(value = "v_43") + private Double v43; + + @TableField(value = "v_44") + private Double v44; + + @TableField(value = "v_45") + private Double v45; + + @TableField(value = "v_46") + private Double v46; + + @TableField(value = "v_47") + private Double v47; + + @TableField(value = "v_48") + private Double v48; + + @TableField(value = "v_49") + private Double v49; + + @TableField(value = "v_50") + private Double v50; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataPltDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataPltDPO.java new file mode 100644 index 000000000..2c80c385f --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataPltDPO.java @@ -0,0 +1,44 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 14:46 + */ +@Data +@TableName(value = "r_stat_data_plt_d") +public class RStatDataPltDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "plt") + private Double plt; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataVDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataVDPO.java new file mode 100644 index 000000000..fb98c1a2f --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDataVDPO.java @@ -0,0 +1,224 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 14:29 + */ +@Data +@TableName(value = "r_stat_data_v_d") +public class RStatDataVDPO implements Serializable { + + @MppMultiId + @TableField(value = "time") + private Date time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phaseType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "freq") + private Double freq; + + @TableField(value = "freq_dev") + private Double freqDev; + + @TableField(value = "rms") + private Double rms; + + @TableField(value = "rms_lvr") + private Double rmsLvr; + + @TableField(value = "v_neg") + private Double vNeg; + + @TableField(value = "v_pos") + private Double vPos; + + @TableField(value = "v_thd") + private Double vThd; + + @TableField(value = "v_unbalance") + private Double vUnbalance; + + @TableField(value = "v_zero") + private Double vZero; + + @TableField(value = "vl_dev") + private Double vlDev; + + @TableField(value = "vu_dev") + private Double vuDev; + + @TableField(value = "v_1") + private Double v1; + + @TableField(value = "v_2") + private Double v2; + + @TableField(value = "v_3") + private Double v3; + + @TableField(value = "v_4") + private Double v4; + + @TableField(value = "v_5") + private Double v5; + + @TableField(value = "v_6") + private Double v6; + + @TableField(value = "v_7") + private Double v7; + + @TableField(value = "v_8") + private Double v8; + + @TableField(value = "v_9") + private Double v9; + + @TableField(value = "v_10") + private Double v10; + + @TableField(value = "v_11") + private Double v11; + + @TableField(value = "v_12") + private Double v12; + + @TableField(value = "v_13") + private Double v13; + + @TableField(value = "v_14") + private Double v14; + + @TableField(value = "v_15") + private Double v15; + + @TableField(value = "v_16") + private Double v16; + + @TableField(value = "v_17") + private Double v17; + + @TableField(value = "v_18") + private Double v18; + + @TableField(value = "v_19") + private Double v19; + + @TableField(value = "v_20") + private Double v20; + + @TableField(value = "v_21") + private Double v21; + + @TableField(value = "v_22") + private Double v22; + + @TableField(value = "v_23") + private Double v23; + + @TableField(value = "v_24") + private Double v24; + + @TableField(value = "v_25") + private Double v25; + + @TableField(value = "v_26") + private Double v26; + + @TableField(value = "v_27") + private Double v27; + + @TableField(value = "v_28") + private Double v28; + + @TableField(value = "v_29") + private Double v29; + + @TableField(value = "v_30") + private Double v30; + + @TableField(value = "v_31") + private Double v31; + + @TableField(value = "v_32") + private Double v32; + + @TableField(value = "v_33") + private Double v33; + + @TableField(value = "v_34") + private Double v34; + + @TableField(value = "v_35") + private Double v35; + + @TableField(value = "v_36") + private Double v36; + + @TableField(value = "v_37") + private Double v37; + + @TableField(value = "v_38") + private Double v38; + + @TableField(value = "v_39") + private Double v39; + + @TableField(value = "v_40") + private Double v40; + + @TableField(value = "v_41") + private Double v41; + + @TableField(value = "v_42") + private Double v42; + + @TableField(value = "v_43") + private Double v43; + + @TableField(value = "v_44") + private Double v44; + + @TableField(value = "v_45") + private Double v45; + + @TableField(value = "v_46") + private Double v46; + + @TableField(value = "v_47") + private Double v47; + + @TableField(value = "v_48") + private Double v48; + + @TableField(value = "v_49") + private Double v49; + + @TableField(value = "v_50") + private Double v50; + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatIntegrityDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatIntegrityDPO.java new file mode 100644 index 000000000..7496fb0a4 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatIntegrityDPO.java @@ -0,0 +1,36 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/26 22:04 + */ +@Data +@TableName(value = "r_stat_integrity_d") +public class RStatIntegrityDPO implements Serializable { + + @MppMultiId + @TableField(value = "time_id") + private Date time; + + @MppMultiId + @TableField(value = "line_index") + private String lineId; + + @TableField(value = "due_time") + private Integer dueTime; + + @TableField(value = "real_time") + private Integer realTime; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java new file mode 100644 index 000000000..09e05d14f --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java @@ -0,0 +1,465 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "r_stat_limit_rate_d") +public class RStatLimitRateDPO { + /** + * 监测点ID合格率的变电站/装置/母线/线路序号 + */ + @TableField(value = "my_index") + private String lineId; + + /** + * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示ABC三项总和，T’表示总 + */ + @TableField(value = "phasic_type") + private String phasicType; + + /** + * 合格率时间 + */ + @TableField(value = "time_id") + private Date time; + + /** + * 总计算次数 + */ + @TableField(value = "all_time") + private Integer allTime; + + /** + * 闪变总计算次数 + */ + @TableField(value = "flicker_overtime") + private Integer flickerOvertime; + + /** + * 频率偏差越限次数 + */ + @TableField(value = "flicker_all_time") + private Integer flickerAllTime; + + /** + * 电压偏差越限次数 + */ + @TableField(value = "freq_dev_overtime") + private Integer freqDevOvertime; + + /** + * 电压不平衡度越限次数 + */ + @TableField(value = "voltage_dev_overtime") + private Integer voltageDevOvertime; + + /** + * 闪变越限次数 + */ + @TableField(value = "ubalance_overtime") + private Integer ubalanceOvertime; + + /** + * 电压谐波畸变率越限次数 + */ + @TableField(value = "uaberrance_overtime") + private Integer uaberranceOvertime; + + /** + * 负序电流限值次数 + */ + @TableField(value = "i_neg_overtime") + private Integer iNegOvertime; + + /** + * 2次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_2_overtime") + private Integer uharm2Overtime; + + /** + * 3次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_3_overtime") + private Integer uharm3Overtime; + + /** + * 4次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_4_overtime") + private Integer uharm4Overtime; + + /** + * 5次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_5_overtime") + private Integer uharm5Overtime; + + /** + * 6次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_6_overtime") + private Integer uharm6Overtime; + + /** + * 7次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_7_overtime") + private Integer uharm7Overtime; + + /** + * 8次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_8_overtime") + private Integer uharm8Overtime; + + /** + * 9次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_9_overtime") + private Integer uharm9Overtime; + + /** + * 10次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_10_overtime") + private Integer uharm10Overtime; + + /** + * 11次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_11_overtime") + private Integer uharm11Overtime; + + /** + * 12次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_12_overtime") + private Integer uharm12Overtime; + + /** + * 13次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_13_overtime") + private Integer uharm13Overtime; + + /** + * 14次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_14_overtime") + private Integer uharm14Overtime; + + /** + * 15次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_15_overtime") + private Integer uharm15Overtime; + + /** + * 16次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_16_overtime") + private Integer uharm16Overtime; + + /** + * 17次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_17_overtime") + private Integer uharm17Overtime; + + /** + * 18次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_18_overtime") + private Integer uharm18Overtime; + + /** + * 19次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_19_overtime") + private Integer uharm19Overtime; + + /** + * 20次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_20_overtime") + private Integer uharm20Overtime; + + /** + * 21次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_21_overtime") + private Integer uharm21Overtime; + + /** + * 22次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_22_overtime") + private Integer uharm22Overtime; + + /** + * 23次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_23_overtime") + private Integer uharm23Overtime; + + /** + * 24次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_24_overtime") + private Integer uharm24Overtime; + + /** + * 25次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_25_overtime") + private Integer uharm25Overtime; + + /** + * 2次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_2_overtime") + private Integer iharm2Overtime; + + /** + * 3次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_3_overtime") + private Integer iharm3Overtime; + + /** + * 4次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_4_overtime") + private Integer iharm4Overtime; + + /** + * 5次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_5_overtime") + private Integer iharm5Overtime; + + /** + * 6次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_6_overtime") + private Integer iharm6Overtime; + + /** + * 7次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_7_overtime") + private Integer iharm7Overtime; + + /** + * 8次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_8_overtime") + private Integer iharm8Overtime; + + /** + * 9次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_9_overtime") + private Integer iharm9Overtime; + + /** + * 10次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_10_overtime") + private Integer iharm10Overtime; + + /** + * 11次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_11_overtime") + private Integer iharm11Overtime; + + /** + * 12次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_12_overtime") + private Integer iharm12Overtime; + + /** + * 13次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_13_overtime") + private Integer iharm13Overtime; + + /** + * 14次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_14_overtime") + private Integer iharm14Overtime; + + /** + * 15次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_15_overtime") + private Integer iharm15Overtime; + + /** + * 16次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_16_overtime") + private Integer iharm16Overtime; + + /** + * 17次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_17_overtime") + private Integer iharm17Overtime; + + /** + * 18次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_18_overtime") + private Integer iharm18Overtime; + + /** + * 19次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_19_overtime") + private Integer iharm19Overtime; + + /** + * 20次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_20_overtime") + private Integer iharm20Overtime; + + /** + * 21次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_21_overtime") + private Integer iharm21Overtime; + + /** + * 22次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_22_overtime") + private Integer iharm22Overtime; + + /** + * 23次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_23_overtime") + private Integer iharm23Overtime; + + /** + * 24次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_24_overtime") + private Integer iharm24Overtime; + + /** + * 25次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_25_overtime") + private Integer iharm25Overtime; + + /** + * 0.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_1_overtime") + private Integer inuharm1Overtime; + + /** + * 1.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_2_overtime") + private Integer inuharm2Overtime; + + /** + * 2.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_3_overtime") + private Integer inuharm3Overtime; + + /** + * 3.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_4_overtime") + private Integer inuharm4Overtime; + + /** + * 4.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_5_overtime") + private Integer inuharm5Overtime; + + /** + * 5.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_6_overtime") + private Integer inuharm6Overtime; + + /** + * 6.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_7_overtime") + private Integer inuharm7Overtime; + + /** + * 7.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_8_overtime") + private Integer inuharm8Overtime; + + /** + * 8.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_9_overtime") + private Integer inuharm9Overtime; + + /** + * 9.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_10_overtime") + private Integer inuharm10Overtime; + + /** + * 10.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_11_overtime") + private Integer inuharm11Overtime; + + /** + * 11.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_12_overtime") + private Integer inuharm12Overtime; + + /** + * 12.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_13_overtime") + private Integer inuharm13Overtime; + + /** + * 13.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_14_overtime") + private Integer inuharm14Overtime; + + /** + * 14.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_15_overtime") + private Integer inuharm15Overtime; + + /** + * 15.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_16_overtime") + private Integer inuharm16Overtime; +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java new file mode 100644 index 000000000..faabb53bf --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java @@ -0,0 +1,466 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.harmonic.pojo.po.LimitRate; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "r_stat_limit_target_d") +public class RStatLimitTargetDPO{ + /** + * 监测点ID合格率的变电站/装置/母线/线路序号 + */ + @TableField(value = "my_index") + private String lineId; + + /** + * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示ABC三项总和，T’表示总 + */ + @TableField(value = "phasic_type") + private String phasicType; + + /** + * 合格率时间 + */ + @TableField(value = "time_id") + private Date time; + + /** + * 总计算次数 + */ + @TableField(value = "all_time") + private Integer allTime; + + /** + * 闪变总计算次数 + */ + @TableField(value = "flicker_overtime") + private Integer flickerOvertime; + + /** + * 频率偏差越限次数 + */ + @TableField(value = "flicker_all_time") + private Integer flickerAllTime; + + /** + * 电压偏差越限次数 + */ + @TableField(value = "freq_dev_overtime") + private Integer freqDevOvertime; + + /** + * 电压不平衡度越限次数 + */ + @TableField(value = "voltage_dev_overtime") + private Integer voltageDevOvertime; + + /** + * 闪变越限次数 + */ + @TableField(value = "ubalance_overtime") + private Integer ubalanceOvertime; + + /** + * 电压谐波畸变率越限次数 + */ + @TableField(value = "uaberrance_overtime") + private Integer uaberranceOvertime; + + /** + * 负序电流限值次数 + */ + @TableField(value = "i_neg_overtime") + private Integer iNegOvertime; + + /** + * 2次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_2_overtime") + private Integer uharm2Overtime; + + /** + * 3次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_3_overtime") + private Integer uharm3Overtime; + + /** + * 4次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_4_overtime") + private Integer uharm4Overtime; + + /** + * 5次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_5_overtime") + private Integer uharm5Overtime; + + /** + * 6次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_6_overtime") + private Integer uharm6Overtime; + + /** + * 7次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_7_overtime") + private Integer uharm7Overtime; + + /** + * 8次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_8_overtime") + private Integer uharm8Overtime; + + /** + * 9次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_9_overtime") + private Integer uharm9Overtime; + + /** + * 10次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_10_overtime") + private Integer uharm10Overtime; + + /** + * 11次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_11_overtime") + private Integer uharm11Overtime; + + /** + * 12次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_12_overtime") + private Integer uharm12Overtime; + + /** + * 13次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_13_overtime") + private Integer uharm13Overtime; + + /** + * 14次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_14_overtime") + private Integer uharm14Overtime; + + /** + * 15次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_15_overtime") + private Integer uharm15Overtime; + + /** + * 16次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_16_overtime") + private Integer uharm16Overtime; + + /** + * 17次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_17_overtime") + private Integer uharm17Overtime; + + /** + * 18次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_18_overtime") + private Integer uharm18Overtime; + + /** + * 19次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_19_overtime") + private Integer uharm19Overtime; + + /** + * 20次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_20_overtime") + private Integer uharm20Overtime; + + /** + * 21次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_21_overtime") + private Integer uharm21Overtime; + + /** + * 22次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_22_overtime") + private Integer uharm22Overtime; + + /** + * 23次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_23_overtime") + private Integer uharm23Overtime; + + /** + * 24次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_24_overtime") + private Integer uharm24Overtime; + + /** + * 25次电压谐波含有率越限次数 + */ + @TableField(value = "uharm_25_overtime") + private Integer uharm25Overtime; + + /** + * 2次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_2_overtime") + private Integer iharm2Overtime; + + /** + * 3次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_3_overtime") + private Integer iharm3Overtime; + + /** + * 4次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_4_overtime") + private Integer iharm4Overtime; + + /** + * 5次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_5_overtime") + private Integer iharm5Overtime; + + /** + * 6次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_6_overtime") + private Integer iharm6Overtime; + + /** + * 7次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_7_overtime") + private Integer iharm7Overtime; + + /** + * 8次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_8_overtime") + private Integer iharm8Overtime; + + /** + * 9次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_9_overtime") + private Integer iharm9Overtime; + + /** + * 10次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_10_overtime") + private Integer iharm10Overtime; + + /** + * 11次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_11_overtime") + private Integer iharm11Overtime; + + /** + * 12次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_12_overtime") + private Integer iharm12Overtime; + + /** + * 13次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_13_overtime") + private Integer iharm13Overtime; + + /** + * 14次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_14_overtime") + private Integer iharm14Overtime; + + /** + * 15次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_15_overtime") + private Integer iharm15Overtime; + + /** + * 16次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_16_overtime") + private Integer iharm16Overtime; + + /** + * 17次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_17_overtime") + private Integer iharm17Overtime; + + /** + * 18次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_18_overtime") + private Integer iharm18Overtime; + + /** + * 19次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_19_overtime") + private Integer iharm19Overtime; + + /** + * 20次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_20_overtime") + private Integer iharm20Overtime; + + /** + * 21次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_21_overtime") + private Integer iharm21Overtime; + + /** + * 22次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_22_overtime") + private Integer iharm22Overtime; + + /** + * 23次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_23_overtime") + private Integer iharm23Overtime; + + /** + * 24次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_24_overtime") + private Integer iharm24Overtime; + + /** + * 25次电流谐波幅值越限次数 + */ + @TableField(value = "iharm_25_overtime") + private Integer iharm25Overtime; + + /** + * 0.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_1_overtime") + private Integer inuharm1Overtime; + + /** + * 1.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_2_overtime") + private Integer inuharm2Overtime; + + /** + * 2.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_3_overtime") + private Integer inuharm3Overtime; + + /** + * 3.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_4_overtime") + private Integer inuharm4Overtime; + + /** + * 4.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_5_overtime") + private Integer inuharm5Overtime; + + /** + * 5.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_6_overtime") + private Integer inuharm6Overtime; + + /** + * 6.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_7_overtime") + private Integer inuharm7Overtime; + + /** + * 7.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_8_overtime") + private Integer inuharm8Overtime; + + /** + * 8.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_9_overtime") + private Integer inuharm9Overtime; + + /** + * 9.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_10_overtime") + private Integer inuharm10Overtime; + + /** + * 10.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_11_overtime") + private Integer inuharm11Overtime; + + /** + * 11.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_12_overtime") + private Integer inuharm12Overtime; + + /** + * 12.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_13_overtime") + private Integer inuharm13Overtime; + + /** + * 13.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_14_overtime") + private Integer inuharm14Overtime; + + /** + * 14.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_15_overtime") + private Integer inuharm15Overtime; + + /** + * 15.5次间谐波电压限值次数 + */ + @TableField(value = "inuharm_16_overtime") + private Integer inuharm16Overtime; +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatOnlineRateDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatOnlineRateDPO.java new file mode 100644 index 000000000..bb89582e1 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatOnlineRateDPO.java @@ -0,0 +1,35 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/26 22:04 + */ +@Data +@TableName(value = "r_stat_onlinerate_d") +public class RStatOnlineRateDPO implements Serializable { + + @MppMultiId + @TableField(value = "time_id") + private Date time; + + @MppMultiId + @TableField(value = "dev_index") + private String devId; + + @TableField(value = "online_min") + private Integer onlineMin; + + @TableField(value = "offline_min") + private Integer offlineMin; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsOverRunLog.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsOverRunLog.java index fd70d5e69..141a0d7b1 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsOverRunLog.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsOverRunLog.java @@ -55,26 +55,31 @@ public class ThsOverRunLog { /** * 预/告警单 */ + @ApiModelProperty(name = "alarmTicket", value = "预/告警单") private String alarmTicket; /** * 反馈单 */ + @ApiModelProperty(name = "feedback", value = "反馈单") private String feedback; /** * 测试报告 */ + @ApiModelProperty(name = "testReport", value = "测试报告") private String testReport; /** * 整改通知单 */ + @ApiModelProperty(name = "reviseNotice", value = "整改通知单") private String reviseNotice; /** * 整改通知反馈单 */ + @ApiModelProperty(name = "reviseFeedback", value = "整改通知反馈单") private String reviseFeedback; /** * 越限时间（yyyy-MM-dd） diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java index 3f3789202..f6bd20372 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java @@ -1,6 +1,7 @@ package com.njcn.prepare.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -22,15 +23,18 @@ public class ThsSupervise { /** * 技术监督Guid */ + @ApiModelProperty(name = "supIndex", value = "技术监督Guid", required = true) private String supIndex; /** * 部门id */ + @ApiModelProperty(name = "deptId", value = "部门id", required = true) private String deptId; /** * 技术监督名称 */ + @ApiModelProperty(name = "name", value = "技术监督名称", required = true) private String name; /** @@ -52,6 +56,7 @@ public class ThsSupervise { /** * 类型（0：预警；1：告警） */ + @ApiModelProperty(name = "type", value = "类型（0：预警；1：告警）", required = true) private Integer type; /** @@ -67,11 +72,13 @@ public class ThsSupervise { /** * 进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始 */ + @ApiModelProperty(name = "progress", value = "进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始", required = true) private Integer progress; /** * 描述 */ + @ApiModelProperty(name = "description", value = "描述") private String description; /** * 创建时间 @@ -82,7 +89,4 @@ public class ThsSupervise { */ private Integer createType; - - - } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviceRunLogVo.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviceRunLogVo.java new file mode 100644 index 000000000..b65e22d70 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviceRunLogVo.java @@ -0,0 +1,20 @@ +package com.njcn.prepare.harmonic.pojo.vo; + +import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; +import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class SuperviceRunLogVo { + @ApiModelProperty(name = "thsSupervise", value = "技术监督参数", required = true) + private ThsSupervise thsSupervise; + @ApiModelProperty(name = "overRunLog", value = "监测点集合", required = true) + private List overRunLog; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviseVo.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviseVo.java new file mode 100644 index 000000000..8f23b2935 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviseVo.java @@ -0,0 +1,114 @@ +package com.njcn.prepare.harmonic.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class SuperviseVo { + + private static final long serialVersionUID = 1L; + + /** + * 技术监督Guid + */ + @ApiModelProperty(name = "supIndex", value = "技术监督Guid") + private String supIndex; + /** + * 部门id + */ + @ApiModelProperty(name = "deptId", value = "部门id") + private String deptId; + + /** + * 技术监督名称 + */ + @ApiModelProperty(name = "name", value = "技术监督名称") + private String name; + + /** + * 创建用户(pqs_user外键) + */ + @ApiModelProperty(name = "createUser", value = "创建用户") + private String createUser; + + + /** + * 处理用户 + */ + @ApiModelProperty(name = "modifyUser", value = "处理用户") + private String modifyUser; + + /** + * 处理时间 + */ + @ApiModelProperty(name = "modifyTime", value = "处理时间") + private Date modifyTime; + + /** + * 类型（0：预警；1：告警） + */ + @ApiModelProperty(name = "type", value = "类型（0：预警；1：告警）") + private Integer type; + + /** + * 上一级处理处理人员 + */ + @ApiModelProperty(name = "upUser", value = "上一级处理处理人员") + private String upUser; + + /** + * 下一级处理人员 + */ + @ApiModelProperty(name = "nextUser", value = "下一级处理人员") + private String nextUser; + + /** + * 进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始 + */ + @ApiModelProperty(name = "progress", value = "进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始") + private Integer progress; + + /** + * 描述 + */ + @ApiModelProperty(name = "description", value = "描述") + private String description; + /** + * 创建时间 + */ + @ApiModelProperty(name = "createTime", value = "创建时间") + private Date createTime; + /** + * 创建类型(0：自动；1 手动) + */ + private Integer createType; + + + /** + * 是否已经上传 预/告警单 + */ + @ApiModelProperty(name = "haveAlarmticket", value = "是否已经上传 预/告警单") + private boolean haveAlarmticket; + /** + * 反馈单 + */ + @ApiModelProperty(name = "haveFeedback", value = "是否已经上传 反馈单") + private boolean haveFeedback; + /** + * 测试报告 + */ + @ApiModelProperty(name = "haveTestReport", value = "是否已经上传 测试报告") + private boolean haveTestReport; + /** + * 整改通知单 + */ + @ApiModelProperty(name = "haveReviseNotice", value = "是否已经上传 整改通知单") + private boolean haveReviseNotice; + /** + * 整改通知反馈单 + */ + @ApiModelProperty(name = "haveReviseFeedback", value = "是否已经上传 整改通知反馈单") + private boolean haveReviseFeedback; +} diff --git a/pqs-prepare/prepare-boot/Dockerfile b/pqs-prepare/prepare-boot/Dockerfile index 422e49141..2f5582cfe 100644 --- a/pqs-prepare/prepare-boot/Dockerfile +++ b/pqs-prepare/prepare-boot/Dockerfile @@ -1,5 +1,5 @@ FROM openjdk:8-jdk-alpine -ADD target/harmonicprepare.jar harmonicprepare.jar -ENTRYPOINT ["java","-jar","/harmonicprepare.jar"] +ADD target/prepareboot.jar prepareboot.jar +ENTRYPOINT ["java","-jar","/prepareboot.jar"] EXPOSE 10221 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone \ No newline at end of file +RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml index ae71fce67..144e9a60f 100644 --- a/pqs-prepare/prepare-boot/pom.xml +++ b/pqs-prepare/prepare-boot/pom.xml @@ -162,7 +162,7 @@ - harmonicprepare + prepareboot org.apache.maven.plugins diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/SteadyIndicatorEnum.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/SteadyIndicatorEnum.java index 4ab2e21c0..2f02f3866 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/SteadyIndicatorEnum.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/SteadyIndicatorEnum.java @@ -9,14 +9,14 @@ import org.apache.commons.lang3.StringUtils; @Getter public enum SteadyIndicatorEnum { - Negative_Voltage("Negative_Voltage", "负序电压不平衡度越限"), - Interhar_Voltage("Interhar_Voltage", "间谐波电压越限"), - Neg_Current("Neg_Current", "负序电流越限"), - Fre_Deviation("Fre_Deviation", "频率偏差越限"), - Voltage_Dev("Voltage_Dev", "电压偏差越限"), - Har_Current("Har_Current", "谐波电流越限"), - Voltage_Fluc("Voltage_Fluc", "电压波动与闪变越限"), - Har_Voltage("Har_Voltage", "谐波电压越限"); + Negative_Voltage("Negative_Voltage", "负序电压不平衡度超标"), + Interhar_Voltage("Interhar_Voltage", "间谐波电压超标"), + Neg_Current("Neg_Current", "负序电流超标"), + Fre_Deviation("Fre_Deviation", "频率偏差超标"), + Voltage_Dev("Voltage_Dev", "电压偏差超标"), + Har_Current("Har_Current", "谐波电流超标"), + Voltage_Fluc("Voltage_Fluc", "电压波动与闪变超标"), + Har_Voltage("Har_Voltage", "谐波电压超标"); private final String code; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/TicketTypeEnum.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/TicketTypeEnum.java new file mode 100644 index 000000000..cc3a0734a --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/TicketTypeEnum.java @@ -0,0 +1,34 @@ +package com.njcn.prepare.enums; + +import lombok.Getter; +import org.apache.commons.lang3.StringUtils; + +@Getter +public enum TicketTypeEnum { + + + ALARM_TICKET("alarm_ticket", "预/告警单"), + FEEDBACK("feedback", "反馈单"), + TEST_REPORT("test_report", "测试报告"), + REVISE_NOTICE("revise_notice", "整改通知单"), + REVISE_FEEDBACK("revise_feedback", "整改通知反馈单"); + + private final String code; + + private final String message; + + TicketTypeEnum(String code, String message) { + this.code = code; + this.message = message; + } + + public static TicketTypeEnum getTicketTypeEnumByCode(String code) { + for (TicketTypeEnum ticketTypeEnum : TicketTypeEnum.values()) { + if (StringUtils.equals(code, ticketTypeEnum.getCode())) { + return ticketTypeEnum; + } + } + return null; + } + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java index 26a5b0e06..6f367682c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java @@ -68,4 +68,23 @@ public class DayDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe); } } + + @ApiOperation("day表定时任务(MySQL库)") + @ApiImplicitParam(value = "jobParam",name = "jobParam",required = true) + @PostMapping("dataToDay") + @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) + public HttpResult dataToDayHandler(@RequestBody LineParam jobParam ){ + log.info(LocalDateTime.now()+"dataToDayHandler开始执行"); + String methodDescribe = getMethodDescribe("dataToDayHandler"); + List indexLists = new ArrayList<> (); + if(CollectionUtils.isEmpty (jobParam.getLineIds())){ + indexLists = lineFeignClient.getLineList().getData(); + }else{ + indexLists = jobParam.getLineIds(); + } + String startTime = jobParam.getDataDate()+" "+"00:00:00"; + String endTime = jobParam.getDataDate()+" "+"23:59:59"; + dayDataService.dataToDayHandler(indexLists,startTime,endTime); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java index f10fbeabd..39f077afb 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; + /** * @author xiaoyao * @version 1.0.0 @@ -42,4 +44,15 @@ public class HarmonicGeneralController extends BaseController { harmonicGeneralService.generalData(lineParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/generalDataToMysql") + @ApiOperation("稳态综合评估日数据计算(MySQL入库)") + @ApiImplicitParam(name = "lineParam", value = "参数", required = true) + public HttpResult generalDataToMysql(@RequestBody @Validated LineParam lineParam){ + log.info(LocalDateTime.now()+"generalDataToMysql开始执行"); + String methodDescribe = getMethodDescribe("generalDataToMysql"); + harmonicGeneralService.generalDataToMysql(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java index 74e0048c8..8b5560342 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; + /** * @author xiaoyao * @version 1.0.0 @@ -43,4 +45,15 @@ public class HarmonicMetricController extends BaseController { harmonicMetricService.metricData(lineParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/metricDataToMysql") + @ApiOperation("稳态指标评估日数据计算(MySQL入库)") + @ApiImplicitParam(name = "lineParam", value = "参数", required = true) + public HttpResult metricDataToMysql(@RequestBody @Validated LineParam lineParam){ + log.info(LocalDateTime.now()+"metricDataToMysql开始执行"); + String methodDescribe = getMethodDescribe("metricDataToMysql"); + harmonicMetricService.metricDataToMysql(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java index 4ade79d25..4074e0ac6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; + /** * @author xiaoyao * @version 1.0.0 @@ -43,4 +45,15 @@ public class IntegrityController extends BaseController { String out = integrityService.computeDataIntegrity(lineParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/dataIntegrity") + @ApiOperation("数据完整性统计(MySQL库)") + @ApiImplicitParam(name = "lineParam", value = "参数", required = true) + public HttpResult dataIntegrity(@RequestBody @Validated LineParam lineParam){ + log.info(LocalDateTime.now()+"dataIntegrity开始执行"); + String methodDescribe = getMethodDescribe("dataIntegrity"); + integrityService.dataIntegrity(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, CommonResponseEnum.SUCCESS.getMessage(), methodDescribe); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java index 35476a974..8bca1acd9 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; + /** * @author xiaoyao * @version 1.0.0 @@ -43,4 +45,15 @@ public class LimitTargetController extends BaseController { limitTargetService.getLimitTargetData(lineParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/limitTargetData") + @ApiOperation("生成limit_target表(MySQL入库)") + @ApiImplicitParam(name = "lineParam", value = "参数", required = true) + public HttpResult limitTargetData(@RequestBody @Validated LineParam lineParam){ + log.info(LocalDateTime.now()+"limitTargetData开始执行"); + String methodDescribe = getMethodDescribe("limitTargetData"); + limitTargetService.limitTargetData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java index e28f48ee2..a17e16297 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -67,4 +68,23 @@ public class LimitrateController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe); } } + + @ApiOperation("生成limitRate表(MySQL入库)") + @ApiImplicitParam(value = "limitRateHanlderParam",name = "limitRateHanlderParam",required = true) + @PostMapping("LimitRate") + @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) + public HttpResult limitRate(@RequestBody LineParam limitRateHanlderParam ){ + log.info(LocalDateTime.now()+"limitRate开始执行"); + String methodDescribe = getMethodDescribe("limitRate"); + List indexLists = new ArrayList<> (); + if(CollectionUtils.isEmpty (limitRateHanlderParam.getLineIds ())){ + indexLists = lineFeignClient.getLineList ( ).getData ( ); + }else{ + indexLists = limitRateHanlderParam.getLineIds (); + } + String startTime = limitRateHanlderParam.getDataDate ()+" "+"00:00:00"; + String endTime = limitRateHanlderParam.getDataDate ()+" "+"23:59:59"; + limitRateService.limitRate(indexLists,startTime,endTime); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java index f71167f1b..69ad40c73 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; + /** * 生成在线率数据表 * @@ -46,4 +48,15 @@ public class OnlineRateController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/onlineRateData") + @ApiOperation("生成在线率数据(MySQL入库)") + @ApiImplicitParam(name = "lineParam", value = "参数", required = true) + public HttpResult onlineRateData(@RequestBody @Validated LineParam lineParam){ + log.info(LocalDateTime.now()+"onlineRateData开始执行"); + String methodDescribe = getMethodDescribe("onlineRateData"); + onlineRateService.onlineRateData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java index eca9597e9..028d8df0e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java @@ -1,25 +1,27 @@ package com.njcn.prepare.harmonic.controller.line; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; -import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; +import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo; +import com.njcn.prepare.harmonic.pojo.vo.SuperviseVo; import com.njcn.prepare.harmonic.service.mysql.line.ThsOverRunLogService; import com.njcn.prepare.harmonic.service.mysql.line.ThsSuperviseService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; 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 org.springframework.web.multipart.MultipartFile; -import java.util.List; +import javax.servlet.http.HttpServletResponse; /** *

    @@ -41,18 +43,55 @@ public class ThsSuperviseController extends BaseController { @ApiOperation("预警/告警事务生成") @ApiImplicitParam(name = "superviseParam", value = "创建技术监督参数", required = true) @PostMapping("/initSupervise") - public HttpResult> initSupervise(@RequestBody @Validated SuperviseParam superviseParam) { + public HttpResult initSupervise(@RequestBody @Validated SuperviseParam superviseParam) { return thsSuperviseService.initSupervise(superviseParam); } @ApiOperation("保存技术监督监测点") - @ApiImplicitParam(name = "superviseParam", value = "技术监督监测点参数", required = true) + @ApiImplicitParam(name = "superviceRunLogVo", value = "技术监督监测点参数", required = true) @PostMapping("/saveOverRunLog") - public HttpResult saveOverRunLog(@RequestBody SuperviseParam superviseParam) { - thsOverRunLogService.saveOverRunLog(superviseParam); - String methodDescribe = getMethodDescribe("superviseParam"); + public HttpResult saveOverRunLog(@RequestBody SuperviceRunLogVo superviceRunLogVo) { + thsSuperviseService.saveOverRunLog(superviceRunLogVo); + String methodDescribe = getMethodDescribe("saveOverRunLog"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @ApiOperation("技术监督详情") + @ApiImplicitParam(name = "supIndex", value = "技术监督id", required = true) + @PostMapping("/superviseDetail") + public HttpResult superviseDetail(@RequestParam String supIndex) { + SuperviceRunLogVo result = thsOverRunLogService.superviseDetail(supIndex); + String methodDescribe = getMethodDescribe("superviseDetail"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @ApiOperation("删除技术监督") + @ApiImplicitParam(name = "superviseDto", value = "删除技术监督请求体", required = true) + @PostMapping("/deleteSupervise") + public HttpResult deleteSupervise(@RequestBody SuperviseDto superviseDto) { + return thsSuperviseService.deleteSupervise(superviseDto); + } + + @ApiOperation("查询技术监督列表") + @ApiImplicitParam(name = "superviseDto", value = "查询技术监督列表参数", required = true) + @PostMapping("/querySuperviseList") + public HttpResult> querySuperviseList(@RequestBody SuperviseDto superviseDto) { + Page pageResult = thsSuperviseService.querySuperviseList(superviseDto); + String methodDescribe = getMethodDescribe("querySuperviseList"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pageResult, methodDescribe); + } + + @ApiOperation("上传技术监督单据") + @PostMapping("/uploadSuperviseTicket") + public HttpResult uploadSuperviseTicket(@ApiParam(value = "文件", required = true) + @RequestPart(value = "files") MultipartFile[] files, + @ApiParam(name = "越限监测点记录id", value = "id", required = true) @RequestParam("id") String id, + @ApiParam(name = "上传单据类型", value = "ticketType", required = true) @RequestParam("ticketType") String ticketType, + HttpServletResponse response) { + thsSuperviseService.uploadSuperviseTicket(id, ticketType, files, response); + String methodDescribe = getMethodDescribe("uploadSuperviseTicket"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatAssesDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatAssesDMapper.java new file mode 100644 index 000000000..ec1a0bfd3 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatAssesDMapper.java @@ -0,0 +1,9 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatAssesDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatOnlineRateDPO; + +public interface RStatAssesDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatComassesDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatComassesDMapper.java new file mode 100644 index 000000000..1398f7528 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatComassesDMapper.java @@ -0,0 +1,9 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatAssesDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatComassesDPO; + +public interface RStatComassesDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlickerDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlickerDMapper.java new file mode 100644 index 000000000..f63c4c414 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlickerDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO; + +public interface RStatDataFlickerDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlucDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlucDMapper.java new file mode 100644 index 000000000..e821700c2 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataFlucDMapper.java @@ -0,0 +1,7 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlucDPO; + +public interface RStatDataFlucDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateIDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateIDMapper.java new file mode 100644 index 000000000..e41637a89 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateIDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO; + +public interface RStatDataHarmRateIDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateVDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateVDMapper.java new file mode 100644 index 000000000..4182e08d2 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmRateVDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateVDPO; + +public interface RStatDataHarmRateVDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicIDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicIDMapper.java new file mode 100644 index 000000000..7cbef0a01 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicIDMapper.java @@ -0,0 +1,9 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicIDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO; + +public interface RStatDataHarmphasicIDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicVDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicVDMapper.java new file mode 100644 index 000000000..4d32a03a6 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmphasicVDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicVDPO; + +public interface RStatDataHarmphasicVDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerPDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerPDMapper.java new file mode 100644 index 000000000..9130b0590 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerPDMapper.java @@ -0,0 +1,9 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerPDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO; + +public interface RStatDataHarmpowerPDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerQDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerQDMapper.java new file mode 100644 index 000000000..071c3fd1e --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerQDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerQDPO; + +public interface RStatDataHarmpowerQDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerSDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerSDMapper.java new file mode 100644 index 000000000..7c2bd74a6 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataHarmpowerSDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerSDPO; + +public interface RStatDataHarmpowerSDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataIDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataIDMapper.java new file mode 100644 index 000000000..22c52e606 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataIDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataIDPO; + +public interface RStatDataIDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmIDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmIDMapper.java new file mode 100644 index 000000000..36e8bfe1f --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmIDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmIDPO; + +public interface RStatDataInHarmIDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmVDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmVDMapper.java new file mode 100644 index 000000000..0c85c0f3a --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataInHarmVDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmVDPO; + +public interface RStatDataInHarmVDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataPltDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataPltDMapper.java new file mode 100644 index 000000000..7b9fe3d07 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataPltDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataPltDPO; + +public interface RStatDataPltDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataVDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataVDMapper.java new file mode 100644 index 000000000..c22e63f40 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataVDMapper.java @@ -0,0 +1,9 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO; + +public interface RStatDataVDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatIntegrityDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatIntegrityDMapper.java new file mode 100644 index 000000000..7a2cf4925 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatIntegrityDMapper.java @@ -0,0 +1,7 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatIntegrityDPO; + +public interface RStatIntegrityDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitRateDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitRateDMapper.java new file mode 100644 index 000000000..b792d3368 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitRateDMapper.java @@ -0,0 +1,9 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatLimitTargetDPO; + +public interface RStatLimitRateDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitTargetDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitTargetDMapper.java new file mode 100644 index 000000000..f3b2dc632 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatLimitTargetDMapper.java @@ -0,0 +1,8 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatLimitTargetDPO; + +public interface RStatLimitTargetDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatOnlineRateDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatOnlineRateDMapper.java new file mode 100644 index 000000000..332327679 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatOnlineRateDMapper.java @@ -0,0 +1,9 @@ +package com.njcn.prepare.harmonic.mapper.mysql.day; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatIntegrityDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatOnlineRateDPO; + +public interface RStatOnlineRateDMapper extends MppBaseMapper { +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatAssesDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatAssesDMapper.xml new file mode 100644 index 000000000..31b3157d7 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatAssesDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatComassesDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatComassesDMapper.xml new file mode 100644 index 000000000..fa64b2af1 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatComassesDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataFlickerDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataFlickerDMapper.xml new file mode 100644 index 000000000..d94c381c7 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataFlickerDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataFlucDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataFlucDMapper.xml new file mode 100644 index 000000000..afaecb69e --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataFlucDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmRateIDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmRateIDMapper.xml new file mode 100644 index 000000000..f0d7b005c --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmRateIDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmRateVDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmRateVDMapper.xml new file mode 100644 index 000000000..0f0ad1cf8 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmRateVDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmphasicIDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmphasicIDMapper.xml new file mode 100644 index 000000000..4f17a53ec --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmphasicIDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmphasicVDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmphasicVDMapper.xml new file mode 100644 index 000000000..5dccf09a1 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmphasicVDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerPDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerPDMapper.xml new file mode 100644 index 000000000..ddb4dd60b --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerPDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerQDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerQDMapper.xml new file mode 100644 index 000000000..c30b9f948 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerQDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerSDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerSDMapper.xml new file mode 100644 index 000000000..e5cc30a3b --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataHarmpowerSDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataIDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataIDMapper.xml new file mode 100644 index 000000000..0d9cb540b --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataIDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataInHarmIDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataInHarmIDMapper.xml new file mode 100644 index 000000000..2729d193b --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataInHarmIDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataInHarmVDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataInHarmVDMapper.xml new file mode 100644 index 000000000..528a8f677 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataInHarmVDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataIntegrityDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataIntegrityDMapper.xml new file mode 100644 index 000000000..74738c730 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataIntegrityDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataPltDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataPltDMapper.xml new file mode 100644 index 000000000..c6dc2a909 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataPltDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml new file mode 100644 index 000000000..2a953176c --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatLimitRateDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatLimitRateDMapper.xml new file mode 100644 index 000000000..feae0b79b --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatLimitRateDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatLimitTargetDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatLimitTargetDMapper.xml new file mode 100644 index 000000000..399e3173c --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatLimitTargetDMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatOnlineRateMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatOnlineRateMapper.xml new file mode 100644 index 000000000..004ac166f --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatOnlineRateMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsSuperviseMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsSuperviseMapper.java index 6f601a961..b79ed0c91 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsSuperviseMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsSuperviseMapper.java @@ -2,8 +2,12 @@ package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto; import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; +import com.njcn.prepare.harmonic.pojo.vo.SuperviseVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** *

    @@ -16,5 +20,11 @@ import org.apache.ibatis.annotations.Mapper; @DS("process") @Mapper public interface ThsSuperviseMapper extends BaseMapper { - + /** + * 查询技术监督列表 + * + * @param superviseDto + * @return + */ + Page querySuperviseList(Page page, @Param("param") SuperviseDto superviseDto); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java index d40dac8c7..e59847ea1 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ThsWarnStrategyMapper.java @@ -3,6 +3,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.harmonic.pojo.vo.ThsStrategyVo; +import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.process.pojo.po.ThsWarnStrategy; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +27,5 @@ public interface ThsWarnStrategyMapper extends BaseMapper { */ List selectStrategyList(@Param("param") SuperviseParam superviseParam); + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml index 61751ed4b..5af886dad 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml @@ -1,5 +1,19 @@ - + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml index 9c3b03de2..b4b3d3acb 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsWarnStrategyMapper.xml @@ -29,7 +29,15 @@ and tda.Dept_Id=#{param.deptId} + + AND tda.Monitor_Id IN + + #{item.lineIndex} + + and tws.Big_Type=1 + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlickerDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlickerDServiceImpl.java new file mode 100644 index 000000000..f12b256d0 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlickerDServiceImpl.java @@ -0,0 +1,25 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataFlickerDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataFlickerDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataFlickerDServiceImpl extends MppServiceImpl implements IRStatDataFlickerDService { + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlucDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlucDServiceImpl.java new file mode 100644 index 000000000..4d087f88c --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataFlucDServiceImpl.java @@ -0,0 +1,25 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataFlucDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlucDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataFlucDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataFlucDServiceImpl extends MppServiceImpl implements IRStatDataFlucDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateIDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateIDServiceImpl.java new file mode 100644 index 000000000..273565cff --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateIDServiceImpl.java @@ -0,0 +1,30 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmRateIDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmpowerSDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerSDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmRateIDService; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmpowerSDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataHarmRateIDServiceImpl extends MppServiceImpl implements IRStatDataHarmRateIDService { + + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateVDServiceImpl.java new file mode 100644 index 000000000..95d013f8c --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmRateVDServiceImpl.java @@ -0,0 +1,28 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmRateVDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateVDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmRateVDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataHarmRateVDServiceImpl extends MppServiceImpl implements IRStatDataHarmRateVDService { + + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicIDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicIDServiceImpl.java new file mode 100644 index 000000000..d9c4f27d5 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicIDServiceImpl.java @@ -0,0 +1,26 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmphasicIDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicIDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmphasicIDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataHarmphasicIDServiceImpl extends MppServiceImpl implements IRStatDataHarmphasicIDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicVDServiceImpl.java new file mode 100644 index 000000000..2ff329113 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmphasicVDServiceImpl.java @@ -0,0 +1,26 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmphasicVDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicVDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmphasicVDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataHarmphasicVDServiceImpl extends MppServiceImpl implements IRStatDataHarmphasicVDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerPDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerPDServiceImpl.java new file mode 100644 index 000000000..95b586cb2 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerPDServiceImpl.java @@ -0,0 +1,27 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmpowerPDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerPDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmpowerPDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataHarmpowerPDServiceImpl extends MppServiceImpl implements IRStatDataHarmpowerPDService { + + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerQDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerQDServiceImpl.java new file mode 100644 index 000000000..9642c5dd3 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerQDServiceImpl.java @@ -0,0 +1,26 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmpowerQDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerQDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmpowerQDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataHarmpowerQDServiceImpl extends MppServiceImpl implements IRStatDataHarmpowerQDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerSDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerSDServiceImpl.java new file mode 100644 index 000000000..62e05f3c6 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataHarmpowerSDServiceImpl.java @@ -0,0 +1,27 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataHarmpowerSDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerSDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataHarmpowerSDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataHarmpowerSDServiceImpl extends MppServiceImpl implements IRStatDataHarmpowerSDService { + + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataIDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataIDServiceImpl.java new file mode 100644 index 000000000..94ab9f212 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataIDServiceImpl.java @@ -0,0 +1,26 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataIDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataIDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataIDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataIDServiceImpl extends MppServiceImpl implements IRStatDataIDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmIDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmIDServiceImpl.java new file mode 100644 index 000000000..048337954 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmIDServiceImpl.java @@ -0,0 +1,30 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataIDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataInHarmIDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataIDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmIDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataIDService; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataInharmIDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataInharmIDServiceImpl extends MppServiceImpl implements IRStatDataInharmIDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmVDServiceImpl.java new file mode 100644 index 000000000..06caaafe5 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataInharmVDServiceImpl.java @@ -0,0 +1,29 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataInHarmIDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataInHarmVDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmIDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmVDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataInharmIDService; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataInharmVDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataInharmVDServiceImpl extends MppServiceImpl implements IRStatDataInharmVDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataPltDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataPltDServiceImpl.java new file mode 100644 index 000000000..b0ecfb498 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataPltDServiceImpl.java @@ -0,0 +1,29 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataFlickerDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataPltDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataPltDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataFlickerDService; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataPltDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataPltDServiceImpl extends MppServiceImpl implements IRStatDataPltDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java new file mode 100644 index 000000000..ad0b8f51d --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatDataVDServiceImpl.java @@ -0,0 +1,26 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataVDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataVDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatDataVDServiceImpl extends MppServiceImpl implements IRStatDataVDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatch(list,50); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatLimitRateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatLimitRateDServiceImpl.java new file mode 100644 index 000000000..75fe2866d --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/day/RStatLimitRateDServiceImpl.java @@ -0,0 +1,38 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.day; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.device.pq.pojo.po.AlarmStrategy; +import com.njcn.energy.pojo.po.EleEvtParm; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatLimitRateDMapper; +import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/3/24 9:53 + */ +@Service +public class RStatLimitRateDServiceImpl extends MppServiceImpl implements IRStatLimitRateDService { + + @Override + public void insert(List list) { + this.saveOrUpdateBatchByMultiId(list,50); + } + + @Override + public List findList(List list, String time) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(CollUtil.isNotEmpty(list),RStatLimitRateDPO::getLineId,list).eq(RStatLimitRateDPO::getTime,time).eq(RStatLimitRateDPO::getPhasicType,"T"); + return this.list(lambdaQueryWrapper); + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java index 60ae0f9e8..aeb41970b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java @@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpFlickerReportDPO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpHarmonicPReportDPO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpInharmonicIMagReportDPO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPltReportDPO; +import com.njcn.prepare.harmonic.pojo.po.*; +import com.njcn.prepare.harmonic.service.mysql.day.*; import com.njcn.prepare.harmonic.service.mysql.line.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -44,7 +46,7 @@ import java.util.stream.Collectors; @Slf4j @Component @RequiredArgsConstructor -public class DayDataServiceImpl implements DayDataService { +public class DayDataServiceImpl implements DayDataService { private final RMpHarmonicVRateReportDPOService rMpHarmonicVRateReportDPOService; private final RMpHarmonicIMagReportDPOService rMpHarmonicIMagReportDPOService; @@ -58,6 +60,21 @@ public class DayDataServiceImpl implements DayDataService { private final RMpMeasurePhaseReportDPOService rMpMeasurePhaseReportDPOService; private final RMpMeasureReportDPOService rMpMeasureReportDPOService; + //MySQL + private final IRStatDataFlickerDService statDataFlickerDService; + private final IRStatDataVDService statDataVDService; + private final IRStatDataIDService statDataIDService; + private final IRStatDataFlucDService statDataFlucDService; + private final IRStatDataHarmphasicIDService statDataHarmphasicIDService; + private final IRStatDataHarmphasicVDService statDataHarmphasicVDService; + private final IRStatDataHarmpowerPDService statDataHarmpowerPDService; + private final IRStatDataHarmpowerQDService statDataHarmpowerQDService; + private final IRStatDataHarmpowerSDService statDataHarmpowerSDService; + private final IRStatDataHarmRateIDService statDataHarmRateIDService; + private final IRStatDataHarmRateVDService statDataHarmRateVDService; + private final IRStatDataInharmIDService statDataInharmIDService; + private final IRStatDataInharmVDService statDataInharmVDService; + private final IRStatDataPltDService statDataPltDService; private final InfluxDbUtils influxDbUtils; @@ -517,6 +534,232 @@ public class DayDataServiceImpl implements DayDataService { } + @Override + @Transactional(rollbackFor = {Exception.class}) + @Async("asyncExecutor") + public void dataToDayHandler(List indexLists, String startTime, String endTime) { + Date time = null; + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + time = simpleDateFormat.parse(startTime); + } catch (ParseException e) { + e.printStackTrace(); + } + List dataFlickerPOList = new ArrayList<> (); + List dataVPOList = new ArrayList<> (); + List dataIPOList = new ArrayList<> (); + List dataFlucPOList = new ArrayList<> (); + List dataHarmPhasicIPOList = new ArrayList<> (); + List dataHarmPhasicVPOList = new ArrayList<> (); + List dataHarmPowerPPOList = new ArrayList<> (); + List dataHarmPowerQPOList = new ArrayList<> (); + List dataHarmPowerSPOList = new ArrayList<> (); + List dataHarmRateIPOList = new ArrayList<> (); + List dataHarmRateVPOList = new ArrayList<> (); + List dataInHarmIPOList = new ArrayList<> (); + List dataInHarmVPOList = new ArrayList<> (); + List dataPltPOList = new ArrayList<> (); + + for (String lineIndex : indexLists) { + /*生成dayV表*/ + List dataV = getDataV(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataV)) { + for (DataVPO item : dataV) { + RStatDataVDPO po1 = new RStatDataVDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataVPOList.add(po1); + } + } + /*生成dayI表*/ + List dataI = getDataI(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataI)) { + for (DataIPO item : dataI) { + RStatDataIDPO po1 = new RStatDataIDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataIPOList.add(po1); + } + } + /*生成dayFlicker表*/ + List dataFlickerPO = getDataFlicker(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataFlickerPO)) { + for (DataFlickerPO item : dataFlickerPO) { + RStatDataFlickerDPO po1 = new RStatDataFlickerDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataFlickerPOList.add(po1); + } + } + /*生成dayFluc表*/ + List dataFlucPO = getDataFluc(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataFlucPO)) { + for (DataFlucPO item : dataFlucPO) { + RStatDataFlucDPO po1 = new RStatDataFlucDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataFlucPOList.add(po1); + } + } + /*生成dayHarmphasicI表*/ + List dataHarmphasicIPO = getDataHarmphasicI(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataHarmphasicIPO)) { + for (DataHarmPhasicIPO item : dataHarmphasicIPO) { + RStatDataHarmphasicIDPO po1 = new RStatDataHarmphasicIDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataHarmPhasicIPOList.add(po1); + } + } + /*生成dayHarmphasicV表*/ + List dataHarmphasicVPO = getDataHarmphasicV(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataHarmphasicVPO)) { + for (DataHarmPhasicVPO item : dataHarmphasicVPO) { + RStatDataHarmphasicVDPO po1 = new RStatDataHarmphasicVDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataHarmPhasicVPOList.add(po1); + } + } + /*生成dayHarmPowerP表*/ + List dataHarmPowerPPO = getDataHarmPowerP(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataHarmPowerPPO)) { + for (DataHarmPowerPPO item : dataHarmPowerPPO) { + RStatDataHarmpowerPDPO po1 = new RStatDataHarmpowerPDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataHarmPowerPPOList.add(po1); + } + } + /*生成dayHarmPowerQ表*/ + List dataHarmPowerQPO = getDataHarmPowerQ(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataHarmPowerQPO)) { + for (DataHarmPowerQPO item : dataHarmPowerQPO) { + RStatDataHarmpowerQDPO po1 = new RStatDataHarmpowerQDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataHarmPowerQPOList.add(po1); + } + } + /*生成dayHarmPowerS表*/ + List dataHarmPowers = getDataHarmPowerS(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataHarmPowers)) { + for (DataHarmPowerSPO item : dataHarmPowers) { + RStatDataHarmpowerSDPO po1 = new RStatDataHarmpowerSDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataHarmPowerSPOList.add(po1); + } + } + /*生成dayHarmRateI*/ + List dataHarmRateI = getDataHarmRateI(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataHarmRateI)) { + for (DataHarmRateIPO item : dataHarmRateI) { + RStatDataHarmrateIDPO po1 = new RStatDataHarmrateIDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataHarmRateIPOList.add(po1); + } + } + /*生成dayHarmRateV*/ + List dataHarmRateVPO = getDataHarmRateV(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataHarmRateVPO)) { + for (DataHarmRateVPO item : dataHarmRateVPO) { + RStatDataHarmrateVDPO po1 = new RStatDataHarmrateVDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataHarmRateVPOList.add(po1); + } + } + /*生成dayInHarmI*/ + List dataInHarmIPO = getDataInHarmI(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataInHarmIPO)) { + for (DataInHarmIPO item : dataInHarmIPO) { + RStatDataInharmIDPO po1 = new RStatDataInharmIDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataInHarmIPOList.add(po1); + } + } + /*生成dayInHarmV*/ + List dataInHarmVPO = getDataInHarmV(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataInHarmVPO)) { + for (DataInHarmVPO item : dataInHarmVPO) { + RStatDataInharmVDPO po1 = new RStatDataInharmVDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataInHarmVPOList.add(po1); + } + } + /*生成dayPlt*/ + List dataPlt = getDataPlt(lineIndex, startTime, endTime); + if (!CollectionUtils.isEmpty(dataPlt)) { + for (DataPltPO item : dataPlt) { + RStatDataPltDPO po1 = new RStatDataPltDPO(); + BeanUtils.copyProperties(item,po1); + po1.setTime(time); + po1.setQualityFlag(Integer.parseInt(item.getQualityFlag())); + dataPltPOList.add(po1); + } + } + } + + if (!CollectionUtils.isEmpty(dataVPOList)){ + statDataVDService.insert(dataVPOList); + } + if (!CollectionUtils.isEmpty(dataIPOList)){ + statDataIDService.insert(dataIPOList); + } + if (!CollectionUtils.isEmpty(dataFlickerPOList)){ + statDataFlickerDService.insert(dataFlickerPOList); + } + if (!CollectionUtils.isEmpty(dataFlucPOList)){ + statDataFlucDService.insert(dataFlucPOList); + } + if (!CollectionUtils.isEmpty(dataHarmPhasicIPOList)){ + statDataHarmphasicIDService.insert(dataHarmPhasicIPOList); + } + if (!CollectionUtils.isEmpty(dataHarmPhasicVPOList)){ + statDataHarmphasicVDService.insert(dataHarmPhasicVPOList); + } + if (!CollectionUtils.isEmpty(dataHarmPowerPPOList)){ + statDataHarmpowerPDService.insert(dataHarmPowerPPOList); + } + if (!CollectionUtils.isEmpty(dataHarmPowerQPOList)){ + statDataHarmpowerQDService.insert(dataHarmPowerQPOList); + } + if (!CollectionUtils.isEmpty(dataHarmPowerSPOList)){ + statDataHarmpowerSDService.insert(dataHarmPowerSPOList); + } + if (!CollectionUtils.isEmpty(dataHarmRateIPOList)){ + statDataHarmRateIDService.insert(dataHarmRateIPOList); + } + if (!CollectionUtils.isEmpty(dataHarmRateVPOList)){ + statDataHarmRateVDService.insert(dataHarmRateVPOList); + } + if (!CollectionUtils.isEmpty(dataInHarmIPOList)){ + statDataInharmIDService.insert(dataInHarmIPOList); + } + if (!CollectionUtils.isEmpty(dataInHarmVPOList)){ + statDataInharmVDService.insert(dataInHarmVPOList); + } + if (!CollectionUtils.isEmpty(dataPltPOList)){ + statDataPltDService.insert(dataPltPOList); + } + } /** @@ -741,6 +984,7 @@ public class DayDataServiceImpl implements DayDataService { return result; } + /** * 功能描述:获取dataFluc数据 * @author xy @@ -3601,7 +3845,4 @@ public class DayDataServiceImpl implements DayDataService { } - - - } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java index 20f7ae4e0..08debc917 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java @@ -2,12 +2,15 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.po.Overlimit; import com.njcn.influxdb.utils.InfluxDbUtils; -import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatComassesDMapper; import com.njcn.prepare.harmonic.pojo.influxdb.po.DataFlickerPO; import com.njcn.prepare.harmonic.pojo.influxdb.po.DataVPO; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.pojo.po.RStatComassesDPO; import com.njcn.prepare.harmonic.service.mysql.line.HarmonicGeneralService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,7 +37,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class HarmonicGeneralServiceImpl implements HarmonicGeneralService { +public class HarmonicGeneralServiceImpl extends MppServiceImpl implements HarmonicGeneralService { private final InfluxDbUtils influxDbUtils; @@ -67,6 +70,62 @@ public class HarmonicGeneralServiceImpl implements HarmonicGeneralService { influxDbUtils.batchInsert(influxDbUtils.getDbName(),"", InfluxDB.ConsistencyLevel.ALL, records); } + @Override + public void generalDataToMysql(LineParam lineParam) { + List list = new ArrayList<>(); + List lineIdOutList; + if (CollUtil.isEmpty(lineParam.getLineIds())){ + List overLimitList = getAllLineOutData(); + lineIdOutList = overLimitList.stream().map(Overlimit::getId).collect(Collectors.toList()); + }else { + lineIdOutList = new ArrayList<>(lineParam.getLineIds()); + } + Date dateOut = DateUtil.parse(lineParam.getDataDate()); + for (String lineId : lineIdOutList){ + RStatComassesDPO rStatComassesDpo = new RStatComassesDPO(); + rStatComassesDpo.setTime(dateOut); + rStatComassesDpo.setLineId(lineId); + Map fields = getGeneralData(lineId,lineParam.getDataDate()); + rStatComassesDpo.setFreqDev1(Objects.isNull(fields.get("freq_dev1"))?0.0:Double.parseDouble(fields.get("freq_dev1").toString())); + rStatComassesDpo.setFreqDev2(Objects.isNull(fields.get("freq_dev2"))?0.0:Double.parseDouble(fields.get("freq_dev2").toString())); + rStatComassesDpo.setFreqDev3(Objects.isNull(fields.get("freq_dev3"))?0.0:Double.parseDouble(fields.get("freq_dev3").toString())); + rStatComassesDpo.setFreqDev4(Objects.isNull(fields.get("freq_dev4"))?0.0:Double.parseDouble(fields.get("freq_dev4").toString())); + rStatComassesDpo.setFreqDev5(Objects.isNull(fields.get("freq_dev5"))?0.0:Double.parseDouble(fields.get("freq_dev5").toString())); + + rStatComassesDpo.setVuDev1(Objects.isNull(fields.get("vu_dev1"))?0.0:Double.parseDouble(fields.get("vu_dev1").toString())); + rStatComassesDpo.setVuDev2(Objects.isNull(fields.get("vu_dev2"))?0.0:Double.parseDouble(fields.get("vu_dev2").toString())); + rStatComassesDpo.setVuDev3(Objects.isNull(fields.get("vu_dev3"))?0.0:Double.parseDouble(fields.get("vu_dev3").toString())); + rStatComassesDpo.setVuDev4(Objects.isNull(fields.get("vu_dev4"))?0.0:Double.parseDouble(fields.get("vu_dev4").toString())); + rStatComassesDpo.setVuDev5(Objects.isNull(fields.get("vu_dev5"))?0.0:Double.parseDouble(fields.get("vu_dev5").toString())); + + rStatComassesDpo.setDataPst1(Objects.isNull(fields.get("data_pst1"))?0.0:Double.parseDouble(fields.get("data_pst1").toString())); + rStatComassesDpo.setDataPst2(Objects.isNull(fields.get("data_pst2"))?0.0:Double.parseDouble(fields.get("data_pst2").toString())); + rStatComassesDpo.setDataPst3(Objects.isNull(fields.get("data_pst3"))?0.0:Double.parseDouble(fields.get("data_pst3").toString())); + rStatComassesDpo.setDataPst4(Objects.isNull(fields.get("data_pst4"))?0.0:Double.parseDouble(fields.get("data_pst4").toString())); + rStatComassesDpo.setDataPst5(Objects.isNull(fields.get("data_pst5"))?0.0:Double.parseDouble(fields.get("data_pst5").toString())); + + rStatComassesDpo.setVUnbalance1(Objects.isNull(fields.get("v_unbalance1"))?0.0:Double.parseDouble(fields.get("v_unbalance1").toString())); + rStatComassesDpo.setVUnbalance2(Objects.isNull(fields.get("v_unbalance2"))?0.0:Double.parseDouble(fields.get("v_unbalance2").toString())); + rStatComassesDpo.setVUnbalance3(Objects.isNull(fields.get("v_unbalance3"))?0.0:Double.parseDouble(fields.get("v_unbalance3").toString())); + rStatComassesDpo.setVUnbalance4(Objects.isNull(fields.get("v_unbalance4"))?0.0:Double.parseDouble(fields.get("v_unbalance4").toString())); + rStatComassesDpo.setVUnbalance5(Objects.isNull(fields.get("v_unbalance5"))?0.0:Double.parseDouble(fields.get("v_unbalance5").toString())); + + rStatComassesDpo.setVThd1(Objects.isNull(fields.get("v_thd1"))?0.0:Double.parseDouble(fields.get("v_thd1").toString())); + rStatComassesDpo.setVThd2(Objects.isNull(fields.get("v_thd2"))?0.0:Double.parseDouble(fields.get("v_thd2").toString())); + rStatComassesDpo.setVThd3(Objects.isNull(fields.get("v_thd3"))?0.0:Double.parseDouble(fields.get("v_thd3").toString())); + rStatComassesDpo.setVThd4(Objects.isNull(fields.get("v_thd4"))?0.0:Double.parseDouble(fields.get("v_thd4").toString())); + rStatComassesDpo.setVThd5(Objects.isNull(fields.get("v_thd5"))?0.0:Double.parseDouble(fields.get("v_thd5").toString())); + + rStatComassesDpo.setEvent1(Objects.isNull(fields.get("event1"))?0.0:Double.parseDouble(fields.get("event1").toString())); + rStatComassesDpo.setEvent2(Objects.isNull(fields.get("event2"))?0.0:Double.parseDouble(fields.get("event2").toString())); + rStatComassesDpo.setEvent3(Objects.isNull(fields.get("event3"))?0.0:Double.parseDouble(fields.get("event3").toString())); + rStatComassesDpo.setEvent4(Objects.isNull(fields.get("event4"))?0.0:Double.parseDouble(fields.get("event4").toString())); + rStatComassesDpo.setEvent5(Objects.isNull(fields.get("event5"))?0.0:Double.parseDouble(fields.get("event5").toString())); + list.add(rStatComassesDpo); + } + this.saveOrUpdateBatchByMultiId(list,50); + } + private Map getGeneralData(String lineId, String date){ InfluxDBResultMapper mapper = new InfluxDBResultMapper(); BigDecimal hundred = BigDecimal.valueOf(100); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java index 41c6d6355..e9cc09b9b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java @@ -2,12 +2,15 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.po.Overlimit; import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatAssesDMapper; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.pojo.influxdb.po.DataPltPO; import com.njcn.prepare.harmonic.pojo.influxdb.po.DataVPO; +import com.njcn.prepare.harmonic.pojo.po.RStatAssesDPO; import com.njcn.prepare.harmonic.service.mysql.line.HarmonicMetricService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -32,7 +35,7 @@ import java.util.stream.Collectors; @Slf4j @Service @AllArgsConstructor -public class HarmonicMetricServiceImpl implements HarmonicMetricService { +public class HarmonicMetricServiceImpl extends MppServiceImpl implements HarmonicMetricService { private final InfluxDbUtils influxDbUtils; @@ -62,6 +65,33 @@ public class HarmonicMetricServiceImpl implements HarmonicMetricService { influxDbUtils.batchInsert(influxDbUtils.getDbName(),"", InfluxDB.ConsistencyLevel.ALL, records); } + @Override + @Async("asyncExecutor") + public void metricDataToMysql(LineParam lineParam) { + List list = new ArrayList<>(); + List lineIdList; + if (CollUtil.isEmpty(lineParam.getLineIds())){ + List overLimitList = getAllLineData(); + lineIdList = overLimitList.stream().map(Overlimit::getId).collect(Collectors.toList()); + }else { + lineIdList = new ArrayList<>(lineParam.getLineIds()); + } + Date dateOut = DateUtil.parse(lineParam.getDataDate()); + for (String lineId : lineIdList){ + RStatAssesDPO rStatAssesDpo = new RStatAssesDPO(); + rStatAssesDpo.setTime(dateOut); + rStatAssesDpo.setLineId(lineId); + Map fields = getMetricData(lineId,lineParam.getDataDate()); + rStatAssesDpo.setVuDev(Double.parseDouble(fields.get("vu_dev").toString())); + rStatAssesDpo.setFreqDev(Double.parseDouble(fields.get("freq_dev").toString())); + rStatAssesDpo.setDataPlt(Double.parseDouble(fields.get("data_plt").toString())); + rStatAssesDpo.setVUnbalanceCp95(Double.parseDouble(fields.get("v_unbalance_cp95").toString())); + rStatAssesDpo.setVThdCp95(Double.parseDouble(fields.get("v_thd_cp95").toString())); + list.add(rStatAssesDpo); + } + this.saveOrUpdateBatchByMultiId(list,50); + } + private Map getMetricData(String lineId,String date){ String processParam = " and line_id = '"+lineId+"' and time >= '"+date+" 00:00:00' and time <= '"+date+" 23:59:59' tz('Asia/Shanghai')"; QueryResult vuDevResult = influxDbUtils.query("select abs(vu_dev) as vu_dev from data_v where phasic_type != 'T' and value_type = 'AVG'"+processParam); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index f9bfa7cdb..2bdfaf756 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java @@ -2,12 +2,15 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.po.LineDetail; import com.njcn.device.pq.pojo.po.Overlimit; import com.njcn.influxdb.utils.InfluxDbUtils; -import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper; import com.njcn.prepare.harmonic.pojo.influxdb.po.DataVPO; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.pojo.po.RStatIntegrityDPO; import com.njcn.prepare.harmonic.service.mysql.line.IntegrityService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,6 +21,7 @@ import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.*; import java.util.concurrent.TimeUnit; @@ -36,7 +40,7 @@ import static com.njcn.influxdb.param.InfluxDBPublicParam.DAY_MINUTE; @Slf4j @Service @AllArgsConstructor -public class IntegrityServiceImpl implements IntegrityService { +public class IntegrityServiceImpl extends MppServiceImpl implements IntegrityService{ private final InfluxDbUtils influxDbUtils; @@ -75,11 +79,40 @@ public class IntegrityServiceImpl implements IntegrityService { return "成功！"; } + @Override + @Async("asyncExecutor") + public void dataIntegrity(LineParam lineParam) { + List lineDetailList = new ArrayList<>(); + if (CollUtil.isEmpty(lineParam.getLineIds())){ + List overLimitList = getAllLinesLimitData(); + List lineList = overLimitList.stream().map(Overlimit::getId).collect(Collectors.toList()); + lineDetailList = lineFeignClient.getLineDetail(lineList).getData(); + }else { + lineDetailList = lineFeignClient.getLineDetail(lineParam.getLineIds()).getData(); + } + Date dateOut = DateUtil.parse(lineParam.getDataDate()); + List list = new ArrayList<>(); + for (LineDetail lineDetail :lineDetailList){ + int dataCount = getDataCount(lineDetail.getId(),lineParam.getDataDate()); + RStatIntegrityDPO integrityDpo = new RStatIntegrityDPO(); + integrityDpo.setTime(dateOut); + integrityDpo.setLineId(lineDetail.getId()); + integrityDpo.setDueTime(DAY_MINUTE/lineDetail.getTimeInterval()); + integrityDpo.setRealTime(dataCount); + list.add(integrityDpo); + } + this.saveOrUpdateBatchByMultiId(list,500); + } + private int getDataCount(String lineId,String date){ QueryResult sqlResult = influxDbUtils.query("SELECT * FROM data_v WHERE time >= '" + date + " 00:00:00' and time <= '" + date + " 23:59:59' and line_id = '" + lineId + "' and phasic_type = 'T' tz('Asia/Shanghai')"); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataVPO.class); - return list.size(); + if (CollectionUtils.isEmpty(list)){ + return 0; + } else { + return list.size(); + } } private List getAllLinesLimitData() { diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java index 7c7a1001c..5e43cba8b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java @@ -10,6 +10,8 @@ import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.line.LimitRatePOMapper; import com.njcn.prepare.harmonic.pojo.influxdb.po.*; +import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -24,6 +26,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.Instant; import java.util.*; @@ -44,15 +47,11 @@ import java.util.stream.Collectors; @AllArgsConstructor public class LimitRateService extends MppServiceImpl { - private final InfluxDbUtils influxDbUtils; private final LineFeignClient lineFeignClient; - - private final LimitRatePOMapper limitRatePOMapper; - - + private final IRStatLimitRateDService statLimitRateDService; /** * @Description: 处理 limitrate批处理逻辑 @@ -66,15 +65,12 @@ public class LimitRateService extends MppServiceImpl limitRateJobHandler(List lineList, String startTime, String endTime) { + public void limitRateJobHandler(List lineList, String startTime, String endTime) { List limitRates = new ArrayList<> (); List limitRateList = new ArrayList<> (); - Instant instant = new SimpleDateFormat ("yyyy-MM-dd").parse (startTime).toInstant ( ); Long time= instant.toEpochMilli(); - for (int i = 0; i collect = result.stream ( ).map (t -> { LimitRatePO limitRatePO = new LimitRatePO ( ); NjcnBeanUtil.copyPropertiesIgnoreCase (t,limitRatePO); - limitRatePO.setTime (instant); - return limitRatePO; }).collect (Collectors.toList ( )); limitRates.addAll (collect); @@ -111,9 +105,54 @@ public class LimitRateService extends MppServiceImpl lineList, String startTime, String endTime) { + List list = new ArrayList<>(); + List limitRateList = new ArrayList<> (); + Date date = null; + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + date = simpleDateFormat.parse(startTime); + } catch (ParseException e) { + e.printStackTrace(); + } + for (int i = 0; i map1 = getAllTime(lineIndex,startTime,endTime); + List map2 = getFlickerAllTime(lineIndex,startTime,endTime); + List map3 = getDataHarmRateV(lineIndex,startTime,endTime); + List map4 = getDataI(lineIndex,startTime,endTime); + List map5 = getDataInHarmV(lineIndex,startTime,endTime); + List map6 = getDataV(lineIndex,startTime,endTime); + List map7 = getDataVUnbalance(lineIndex,startTime,endTime); + List map8 = getDataINeg(lineIndex,startTime,endTime); + List map9 = getDataVFreq(lineIndex,startTime,endTime); + List map10 = getDataVDev(lineIndex,startTime,endTime); + List map11 = getDataPlt(lineIndex,startTime,endTime); + List result = getData(overlimit,map1,map2,map3,map4,map5,map6,map7,map8,map9,map10,map11); + limitRateList.addAll (result); + Date finalDate = date; + List collect = result.stream ( ).map (t -> { + RStatLimitRateDPO po = new RStatLimitRateDPO ( ); + NjcnBeanUtil.copyPropertiesIgnoreCase (t,po); + po.setTime(finalDate); + return po; + }).collect (Collectors.toList ( )); + list.addAll(collect); + } + if (!CollectionUtils.isEmpty(limitRateList)){ + /*插入mysql*/ + statLimitRateDService.insert(list); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java index e423c6dfb..da0e97963 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java @@ -3,9 +3,15 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.harmonic.pojo.po.LimitRate; import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatLimitTargetDMapper; import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatLimitTargetDPO; +import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService; import com.njcn.prepare.harmonic.service.mysql.line.LimitTargetService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -16,6 +22,7 @@ import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.*; import java.util.concurrent.TimeUnit; @@ -30,10 +37,12 @@ import java.util.concurrent.TimeUnit; @Slf4j @Service @AllArgsConstructor -public class LimitTargetServiceImpl implements LimitTargetService { +public class LimitTargetServiceImpl extends MppServiceImpl implements LimitTargetService { private final InfluxDbUtils influxDbUtils; + private final IRStatLimitRateDService statLimitRateDService; + @Override @Async("asyncExecutor") public void getLimitTargetData(LineParam lineParam) { @@ -53,6 +62,30 @@ public class LimitTargetServiceImpl implements LimitTargetService { influxDbUtils.batchInsert(influxDbUtils.getDbName(),"", InfluxDB.ConsistencyLevel.ALL, records); } + @Override + @Async("asyncExecutor") + public void limitTargetData(LineParam lineParam) { + List list = new ArrayList<>(); + Date dateOut = DateUtil.parse(lineParam.getDataDate()); + List limitRateData = new ArrayList<>(); + if (CollUtil.isEmpty(lineParam.getLineIds())){ + limitRateData = getLimitRateDataFromMysql(null,lineParam.getDataDate()); + } else { + limitRateData = getLimitRateDataFromMysql(lineParam.getLineIds(),lineParam.getDataDate()); + } + if (!CollectionUtils.isEmpty(limitRateData)){ + for (RStatLimitRateDPO limitRate : limitRateData){ + RStatLimitTargetDPO limitTarget = new RStatLimitTargetDPO(); + limitTarget.setTime(dateOut); + limitTarget.setLineId(limitRate.getLineId()); + limitTarget.setPhasicType(limitRate.getPhasicType()); + chanelData(limitRate,limitTarget); + list.add(limitTarget); + } + } + this.saveOrUpdateBatchByMultiId(list,50); + } + private List getLimitRateData(String lineId,String date){ StringBuilder sql = new StringBuilder(); sql.append("SELECT * FROM limit_rate WHERE time >= '").append(date).append(" 00:00:00' and time <= '") @@ -66,6 +99,11 @@ public class LimitTargetServiceImpl implements LimitTargetService { return resultMapper.toPOJO(sqlResult, LimitRate.class); } + private List getLimitRateDataFromMysql(List lineList, String date){ + return statLimitRateDService.findList(lineList,date); + } + + private List processOutData(List limitRateData,Date dateOut){ List records = new ArrayList<>(); for (LimitRate limitRate : limitRateData){ @@ -162,4 +200,83 @@ public class LimitTargetServiceImpl implements LimitTargetService { fields.put("inuharm_16_overtime",(limitRate.getInuHarm16OverTime()>1)?1:0); return fields; } + + private void chanelData(RStatLimitRateDPO limitRate, RStatLimitTargetDPO limitTarget){ + limitTarget.setAllTime((limitRate.getAllTime()>1)?1:0); + limitTarget.setFlickerAllTime((limitRate.getFlickerAllTime()>1)?1:0); + limitTarget.setFreqDevOvertime((limitRate.getFreqDevOvertime()>1)?1:0); + limitTarget.setVoltageDevOvertime((limitRate.getVoltageDevOvertime()>1)?1:0); + limitTarget.setUbalanceOvertime((limitRate.getUbalanceOvertime()>1)?1:0); + limitTarget.setFlickerOvertime((limitRate.getFlickerOvertime()>1)?1:0); + limitTarget.setUaberranceOvertime((limitRate.getUaberranceOvertime()>1)?1:0); + limitTarget.setINegOvertime((limitRate.getINegOvertime()>1)?1:0); + + limitTarget.setUharm2Overtime((limitRate.getUharm2Overtime()>1)?1:0); + limitTarget.setUharm2Overtime((limitRate.getUharm2Overtime()>1)?1:0); + limitTarget.setUharm3Overtime((limitRate.getUharm3Overtime()>1)?1:0); + limitTarget.setUharm4Overtime((limitRate.getUharm4Overtime()>1)?1:0); + limitTarget.setUharm5Overtime((limitRate.getUharm5Overtime()>1)?1:0); + limitTarget.setUharm6Overtime((limitRate.getUharm6Overtime()>1)?1:0); + limitTarget.setUharm7Overtime((limitRate.getUharm7Overtime()>1)?1:0); + limitTarget.setUharm8Overtime((limitRate.getUharm8Overtime()>1)?1:0); + limitTarget.setUharm9Overtime((limitRate.getUharm9Overtime()>1)?1:0); + limitTarget.setUharm10Overtime((limitRate.getUharm10Overtime()>1)?1:0); + limitTarget.setUharm11Overtime((limitRate.getUharm11Overtime()>1)?1:0); + limitTarget.setUharm12Overtime((limitRate.getUharm12Overtime()>1)?1:0); + limitTarget.setUharm13Overtime((limitRate.getUharm13Overtime()>1)?1:0); + limitTarget.setUharm14Overtime((limitRate.getUharm14Overtime()>1)?1:0); + limitTarget.setUharm15Overtime((limitRate.getUharm15Overtime()>1)?1:0); + limitTarget.setUharm16Overtime((limitRate.getUharm16Overtime()>1)?1:0); + limitTarget.setUharm17Overtime((limitRate.getUharm17Overtime()>1)?1:0); + limitTarget.setUharm18Overtime((limitRate.getUharm18Overtime()>1)?1:0); + limitTarget.setUharm19Overtime((limitRate.getUharm19Overtime()>1)?1:0); + limitTarget.setUharm20Overtime((limitRate.getUharm20Overtime()>1)?1:0); + limitTarget.setUharm21Overtime((limitRate.getUharm21Overtime()>1)?1:0); + limitTarget.setUharm22Overtime((limitRate.getUharm22Overtime()>1)?1:0); + limitTarget.setUharm23Overtime((limitRate.getUharm23Overtime()>1)?1:0); + limitTarget.setUharm24Overtime((limitRate.getUharm24Overtime()>1)?1:0); + limitTarget.setUharm25Overtime((limitRate.getUharm25Overtime()>1)?1:0); + + limitTarget.setIharm2Overtime((limitRate.getIharm2Overtime()>1)?1:0); + limitTarget.setIharm3Overtime((limitRate.getIharm3Overtime()>1)?1:0); + limitTarget.setIharm4Overtime((limitRate.getIharm4Overtime()>1)?1:0); + limitTarget.setIharm5Overtime((limitRate.getIharm5Overtime()>1)?1:0); + limitTarget.setIharm6Overtime((limitRate.getIharm6Overtime()>1)?1:0); + limitTarget.setIharm7Overtime((limitRate.getIharm7Overtime()>1)?1:0); + limitTarget.setIharm8Overtime((limitRate.getIharm8Overtime()>1)?1:0); + limitTarget.setIharm9Overtime((limitRate.getIharm9Overtime()>1)?1:0); + limitTarget.setIharm10Overtime((limitRate.getIharm10Overtime()>1)?1:0); + limitTarget.setIharm11Overtime((limitRate.getIharm11Overtime()>1)?1:0); + limitTarget.setIharm12Overtime((limitRate.getIharm12Overtime()>1)?1:0); + limitTarget.setIharm13Overtime((limitRate.getIharm13Overtime()>1)?1:0); + limitTarget.setIharm14Overtime((limitRate.getIharm14Overtime()>1)?1:0); + limitTarget.setIharm15Overtime((limitRate.getIharm15Overtime()>1)?1:0); + limitTarget.setIharm16Overtime((limitRate.getIharm16Overtime()>1)?1:0); + limitTarget.setIharm17Overtime((limitRate.getIharm17Overtime()>1)?1:0); + limitTarget.setIharm18Overtime((limitRate.getIharm18Overtime()>1)?1:0); + limitTarget.setIharm19Overtime((limitRate.getIharm19Overtime()>1)?1:0); + limitTarget.setIharm20Overtime((limitRate.getIharm20Overtime()>1)?1:0); + limitTarget.setIharm21Overtime((limitRate.getIharm21Overtime()>1)?1:0); + limitTarget.setIharm22Overtime((limitRate.getIharm22Overtime()>1)?1:0); + limitTarget.setIharm23Overtime((limitRate.getIharm23Overtime()>1)?1:0); + limitTarget.setIharm24Overtime((limitRate.getIharm24Overtime()>1)?1:0); + limitTarget.setIharm25Overtime((limitRate.getIharm25Overtime()>1)?1:0); + + limitTarget.setInuharm1Overtime((limitRate.getInuharm1Overtime()>1)?1:0); + limitTarget.setInuharm2Overtime((limitRate.getInuharm2Overtime()>1)?1:0); + limitTarget.setInuharm3Overtime((limitRate.getInuharm3Overtime()>1)?1:0); + limitTarget.setInuharm4Overtime((limitRate.getInuharm4Overtime()>1)?1:0); + limitTarget.setInuharm5Overtime((limitRate.getInuharm5Overtime()>1)?1:0); + limitTarget.setInuharm6Overtime((limitRate.getInuharm6Overtime()>1)?1:0); + limitTarget.setInuharm7Overtime((limitRate.getInuharm7Overtime()>1)?1:0); + limitTarget.setInuharm8Overtime((limitRate.getInuharm8Overtime()>1)?1:0); + limitTarget.setInuharm9Overtime((limitRate.getInuharm9Overtime()>1)?1:0); + limitTarget.setInuharm10Overtime((limitRate.getInuharm10Overtime()>1)?1:0); + limitTarget.setInuharm11Overtime((limitRate.getInuharm11Overtime()>1)?1:0); + limitTarget.setInuharm12Overtime((limitRate.getInuharm12Overtime()>1)?1:0); + limitTarget.setInuharm13Overtime((limitRate.getInuharm13Overtime()>1)?1:0); + limitTarget.setInuharm14Overtime((limitRate.getInuharm14Overtime()>1)?1:0); + limitTarget.setInuharm15Overtime((limitRate.getInuharm15Overtime()>1)?1:0); + limitTarget.setInuharm16Overtime((limitRate.getInuharm16Overtime()>1)?1:0); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java index eb428325d..84fa18728 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java @@ -3,13 +3,17 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.energy.pojo.constant.ModelState; import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatOnlineRateDMapper; import com.njcn.prepare.harmonic.pojo.dto.OnLineRateDTO; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.pojo.influxdb.po.PqsCommunicatePO; +import com.njcn.prepare.harmonic.pojo.po.RStatOnlineRateDPO; import com.njcn.prepare.harmonic.service.mysql.line.OnlineRateService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -38,7 +42,7 @@ import static com.njcn.influxdb.param.InfluxDBPublicParam.DAY_MINUTE; @Slf4j @Service @AllArgsConstructor -public class OnlineRateServiceImpl implements OnlineRateService { +public class OnlineRateServiceImpl extends MppServiceImpl implements OnlineRateService { private final InfluxDbUtils influxDbUtils; @@ -75,6 +79,33 @@ public class OnlineRateServiceImpl implements OnlineRateService { influxDbUtils.batchInsert(influxDbUtils.getDbName(),"", InfluxDB.ConsistencyLevel.ALL, records); } + @Override + @Async("asyncExecutor") + public void onlineRateData(LineParam lineParam) { + List lineIdList = lineParam.getLineIds(); + if (CollUtil.isEmpty(lineParam.getLineIds())){ + lineIdList = lineFeignClient.getDeviceList().getData(); + } + List outCommunicateData = new ArrayList<>(); + for (String lineId : lineIdList){ + List communicateData = getCommunicateData(lineId); + outCommunicateData.addAll(communicateData); + } + List list = new ArrayList<>(); + Date dateOut = DateUtil.parse(lineParam.getDataDate()); + for (PqsCommunicatePO pqsCommunicate : outCommunicateData){ + RStatOnlineRateDPO onlineRateDpo = new RStatOnlineRateDPO(); + Date newDate = Date.from(pqsCommunicate.getTime()); + OnLineRateDTO onLineRate = onLineMinute(newDate,dateOut,pqsCommunicate.getType(),pqsCommunicate.getDevId(),lineParam.getDataDate()); + onlineRateDpo.setTime(dateOut); + onlineRateDpo.setDevId(pqsCommunicate.getDevId()); + onlineRateDpo.setOnlineMin(onLineRate.getOnLineMinute()); + onlineRateDpo.setOfflineMin(onLineRate.getOffLineMinute()); + list.add(onlineRateDpo); + } + this.saveOrUpdateBatchByMultiId(list,50); + } + /** * 获取pqs_communicate数据 */ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsOverRunLogServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsOverRunLogServiceImpl.java index 8718d979c..8f11d125f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsOverRunLogServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsOverRunLogServiceImpl.java @@ -1,15 +1,27 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.dynamic.datasource.annotation.DS; +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.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.mapper.mysql.line.ThsOverRunLogMapper; +import com.njcn.prepare.harmonic.mapper.mysql.line.ThsSuperviseMapper; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; +import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; +import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo; import com.njcn.prepare.harmonic.service.mysql.line.ThsOverRunLogService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.stream.Collectors; + /** *

    * 告警/预警监测点列表 服务实现类 @@ -20,12 +32,37 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Slf4j +@DS("process") public class ThsOverRunLogServiceImpl extends ServiceImpl implements ThsOverRunLogService { + @Autowired + private ThsOverRunLogMapper thsOverRunLogMapper; + @Autowired + private ThsSuperviseMapper thsSuperviseMapper; @Override @Transactional(rollbackFor = Exception.class) - @DS("process") public void saveOverRunLog(SuperviseParam superviseParam) { this.saveBatch(superviseParam.getOverRunLog()); } + + @Override + public SuperviceRunLogVo superviseDetail(String supIndex) { + ThsSupervise thsSupervise = thsSuperviseMapper.selectOne(new LambdaQueryWrapper().eq(ThsSupervise::getSupIndex, supIndex)); + List thsOverRunLogs = thsOverRunLogMapper.selectList(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, supIndex)); + return SuperviceRunLogVo.builder().overRunLog(thsOverRunLogs).thsSupervise(thsSupervise).build(); + } + + @Override + public HttpResult updateSupervise(SuperviseParam superviseParam) { + List overRunLog = superviseParam.getOverRunLog(); + if (CollectionUtil.isEmpty(overRunLog)) { + HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "监测点不能为空", null); + } + List thsOverRunLogs = thsOverRunLogMapper.selectList(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, superviseParam.getSupIndex())); + List saveIds = superviseParam.getOverRunLog().stream().map(ThsOverRunLog::getId).collect(Collectors.toList()); + List allIds = thsOverRunLogs.stream().map(ThsOverRunLog::getId).collect(Collectors.toList()); + allIds.removeAll(saveIds); + thsOverRunLogMapper.delete(new LambdaQueryWrapper().in(ThsOverRunLog::getId, allIds)); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, null); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java index 0470e22d1..2d066b2c7 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java @@ -5,40 +5,47 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.common.pojo.dto.SimpleDTO; 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.api.PmsGeneralDeviceInfoClient; -import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.harmonic.pojo.vo.SourceSteadyIndicator; import com.njcn.harmonic.pojo.vo.ThsStrategyVo; +import com.njcn.oss.constant.OssPath; +import com.njcn.oss.utils.FileStorageUtil; import com.njcn.prepare.enums.*; import com.njcn.prepare.harmonic.mapper.mysql.line.*; +import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; +import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo; +import com.njcn.prepare.harmonic.pojo.vo.SuperviseVo; import com.njcn.prepare.harmonic.service.mysql.line.ThsSuperviseService; import com.njcn.process.annotaion.HarCurrent; import com.njcn.process.annotaion.HarVoltage; import com.njcn.process.annotaion.InterharVoltage; import com.njcn.process.pojo.po.LimitRate; -import com.njcn.process.pojo.po.ThsWarnStrategy; import com.njcn.process.pojo.po.ThsWarnStrategyAss; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; -import com.njcn.user.pojo.vo.PvTerminalTreeVO; +import com.njcn.user.pojo.po.Dept; +import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -74,11 +81,13 @@ public class ThsSuperviseServiceImpl extends ServiceImpl> initSupervise(SuperviseParam superviseParam) { + public HttpResult initSupervise(SuperviseParam superviseParam) { + SuperviceRunLogVo superviceRunLogVo = new SuperviceRunLogVo(); List overRunLogList = new ArrayList<>(); if (InitTypeEnum.MANUAL.getCode().equals(superviseParam.getInitType()) && StringUtils.isBlank(superviseParam.getDeptId())) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.INVALID_PARAMETER, null, ""); @@ -89,6 +98,8 @@ public class ThsSuperviseServiceImpl extends ServiceImpl> deptMap = thsStrategyList.stream().collect(Collectors.groupingBy(ThsStrategyVo::getDeptId)); for (Map.Entry> entry : deptMap.entrySet()) { String depId = entry.getKey(); + ThsSupervise thsSupervise = new ThsSupervise(); + ArrayList thsOverRunLogs = new ArrayList<>(); List deptList = entry.getValue(); List oneLevel = deptList.stream().filter(r -> !GradeEnum.THREE_LEVEL.getCode().equals(r.getGrade())).collect(Collectors.toList());//一级或二级策略集合 List oneSourceSteadyIndicatorList = new ArrayList<>(); @@ -149,8 +160,6 @@ public class ThsSuperviseServiceImpl extends ServiceImpl { Monitor monitor = pmsMonitorMapper.selectById(steady.getMonitorId()); if (monitor != null) { @@ -159,90 +168,147 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap = this.verifyLimit(limitRate, steady); - //生成监督数据 - ThsOverRunLog thsOverRunLog = this.creatSuperviseData(steady, limitBoolMap, monitor, limitRate, superviseParam.getInitType()); - if (thsOverRunLog != null) { - overRunLogList.add(thsOverRunLog); - } + //构建监督数据 + this.buildData(steady, limitBoolMap, monitor, limitRate, superviseParam.getInitType(), thsSupervise, overRunLogList); + } } }); + //生成技术监督数据 + if (InitTypeEnum.AUTO.getCode().equals(superviseParam.getInitType())) { + HttpResult deptById = deptFeignClient.getDeptById(depId); + Dept dept = deptById.getData(); + this.creatData(dept, thsSupervise, overRunLogList); + } else { + superviceRunLogVo.setOverRunLog(overRunLogList); + superviceRunLogVo.setThsSupervise(thsSupervise); + } } } } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overRunLogList, ""); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, superviceRunLogVo, ""); } - /** - * 部门没有绑定策略的走通用策略 - */ + //生成技术监督数据 + @DS("process") + @Transactional(rollbackFor = Exception.class) @Override - public void initCommonStrategy(List thsStrategyList, SuperviseParam superviseParam) { - //查询通用策略 - ThsWarnStrategy thsWarnStrategy = thsWarnStrategyMapper.selectOne(new LambdaQueryWrapper() - .eq(ThsWarnStrategy::getBigType, BigTypeEnum.COMMON.getCode()) - .last("limit 1")); - if (null != thsWarnStrategy) { - List haveDepIdList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(thsStrategyList)) { - List verifyList = thsStrategyList.stream().filter(r -> !GradeEnum.THREE_LEVEL.getCode().equals(r.getGrade())) - .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ThsStrategyVo::getDeptId))), ArrayList::new)); - haveDepIdList = verifyList.stream().map(ThsStrategyVo::getDeptId).collect(Collectors.toList()); + public void creatData(Dept dept, ThsSupervise thsSupervise, List overRunLogList) { + if (CollectionUtil.isNotEmpty(overRunLogList)) { + thsSupervise.setDescription(overRunLogList.get(0).getDescription()); + String str = Arrays.asList(overRunLogList.get(0).getDescription().split(",")).get(0); + String overItem = str.substring(0, str.indexOf("次") - 1); + thsSupervise.setName(DateUtil.today() + dept.getName() + overRunLogList.get(0).getName() + "等" + overRunLogList.size() + "个监测点" + overItem); + thsSuperviseMapper.insert(thsSupervise); + for (ThsOverRunLog thsOverRunLog : overRunLogList) { + thsOverRunLogMapper.insert(thsOverRunLog); + } + } + } + @Override + @DS("process") + @Transactional(rollbackFor = Exception.class) + public void saveOverRunLog(SuperviceRunLogVo superviceRunLogVo) { + if (CollectionUtil.isNotEmpty(superviceRunLogVo.getOverRunLog())) { + ThsSupervise thsSupervise = superviceRunLogVo.getThsSupervise(); + Date date = new Date(); + thsSupervise.setCreateTime(date); + thsSupervise.setCreateUser(RequestUtil.getUsername()); + thsSupervise.setModifyTime(date); + thsSupervise.setSupIndex(IdUtil.simpleUUID()); + this.thsSuperviseMapper.insert(thsSupervise); + for (ThsOverRunLog thsOverRunLog : superviceRunLogVo.getOverRunLog()) { + thsOverRunLog.setCreateTime(date); + thsOverRunLog.setSupIndex(thsSupervise.getSupIndex()); + this.thsOverRunLogMapper.insert(thsOverRunLog); } - //获取所有部门信息 - HttpResult> listHttpResult = deptFeignClient.allDeptList(); - List allDepIdList = listHttpResult.getData().stream().distinct().map(PvTerminalTreeVO::getId).collect(Collectors.toList()); - allDepIdList.removeAll(haveDepIdList); - //部门没有配置定制策略的走通用策略 - if (CollectionUtil.isNotEmpty(allDepIdList)) { - List thsWarnStrategyAsses = thsWarnStrategyAssMapper.selectList(new LambdaQueryWrapper() - .eq(ThsWarnStrategyAss::getWarnId, thsWarnStrategy.getId())); - List sourceAssList = thsWarnStrategyAsses.stream().filter(source -> TypeEnum.SOURCE_TYPE.getCode().equals(source.getType())) - .collect(Collectors.toList()); - List interAssList = thsWarnStrategyAsses.stream().filter(inter -> TypeEnum.INTERFERENCE_TYPE.getCode().equals(inter.getType())) - .collect(Collectors.toList()); - //封装每一种干扰源和对应的指标 - List verifySteadylist = new ArrayList<>(); - for (ThsWarnStrategyAss oneWarnStrategyAss : sourceAssList) { - SourceSteadyIndicator build = SourceSteadyIndicator.builder().id(thsWarnStrategy.getId()).operation(thsWarnStrategy.getOperation()) - .interferenceSource(oneWarnStrategyAss.getAssId()) - .steadyIndicator(interAssList.stream().map(ThsWarnStrategyAss::getAssId).collect(Collectors.toList())) - .type(thsWarnStrategy.getType()) - .build(); - verifySteadylist.add(build); - } - allDepIdList.forEach(depId -> { - this.deleteTodayData(depId, superviseParam.getInitType()); - //查询部门下所有监测点基本信息 - PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); - pmsDeviceInfoParam.setDeptIndex(depId); - pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); - HttpResult> httpResult = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); - List dataList = httpResult.getData(); - if (CollectionUtil.isNotEmpty(dataList)) { - dataList.forEach(r -> { - List monitorIdList = r.getMonitorIdList(); - //查询所有监测点详细信息集合 - if (CollectionUtil.isNotEmpty(monitorIdList)) { - List monitors = pmsMonitorMapper.queryConfigMonitor(monitorIdList, Arrays.stream(InterferenceTypeEnum.values()).map(InterferenceTypeEnum::getCode).collect(Collectors.toList())); - monitors.forEach(monitor -> verifySteadylist.forEach(steady -> { - if (StringUtils.equals(monitor.getMonitorTag(), steady.getInterferenceSource())) {//匹配该监测点属于的干扰源类型 - steady.setDeptId(depId); - //查询该监测点的检测数据 - LimitRate limitRate = this.queryLimitTargetData(monitor.getId()); - //判断指标是否超标 - Map limitBoolMap = this.verifyLimit(limitRate, steady); - //生成监督数据 - this.creatSuperviseData(steady, limitBoolMap, monitor, limitRate, superviseParam.getInitType()); - } - })); - } - }); + } + } + + @Override + public Page querySuperviseList(SuperviseDto superviseDto) { + Integer pageNum = PageFactory.getPageNum(superviseDto); + Integer pageSize = PageFactory.getPageSize(superviseDto); + Page superviseVoPage = new Page<>(pageNum, pageSize); + Page page = thsSuperviseMapper.querySuperviseList(superviseVoPage, superviseDto); + List pageRecords = page.getRecords(); + if (CollectionUtil.isNotEmpty(pageRecords)) { + for (SuperviseVo superviseVo : pageRecords) { + List thsOverRunLogs = thsOverRunLogMapper.selectList(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, superviseVo.getSupIndex())); + if (CollectionUtil.isNotEmpty(thsOverRunLogs)) { + List alarmTickets = thsOverRunLogs.stream().map(ThsOverRunLog::getAlarmTicket).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(alarmTickets)) { + superviseVo.setHaveAlarmticket(true); } - }); + List feedbacks = thsOverRunLogs.stream().map(ThsOverRunLog::getFeedback).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(feedbacks)) { + superviseVo.setHaveFeedback(true); + } + List testReports = thsOverRunLogs.stream().map(ThsOverRunLog::getTestReport).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(testReports)) { + superviseVo.setHaveTestReport(true); + } + List reviseNotices = thsOverRunLogs.stream().map(ThsOverRunLog::getReviseNotice).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(reviseNotices)) { + superviseVo.setHaveReviseNotice(true); + } + List reviseFeedbacks = thsOverRunLogs.stream().map(ThsOverRunLog::getReviseFeedback).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(reviseFeedbacks)) { + superviseVo.setHaveReviseFeedback(true); + } + } } } + page.setRecords(pageRecords); + return page; + } + + @Override + public HttpResult deleteSupervise(SuperviseDto superviseDto) { + if (CollectionUtil.isNotEmpty(superviseDto.getDeleteIds())) { + superviseDto.getDeleteIds().forEach(id -> { + thsOverRunLogMapper.delete(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, id)); + thsSuperviseMapper.deleteById(id); + }); + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, null); + } + + @Override + public void uploadSuperviseTicket(String id, String ticketType, MultipartFile[] files, HttpServletResponse response) { + ThsOverRunLog thsOverRunLog = new ThsOverRunLog(); + thsOverRunLog.setId(id); + if (files != null && files.length > 0) { + List pathList = new ArrayList<>(); + for (int i = 0; i < files.length; i++) { + String path = fileStorageUtil.uploadMultipart(files[i], OssPath.ELECTRICITY_QUALITY); + pathList.add(path); + } + String pathStr = StringUtils.join(pathList, ","); + TicketTypeEnum ticketTypeEnum = TicketTypeEnum.getTicketTypeEnumByCode(ticketType); + if (ticketTypeEnum == null) { + throw new BusinessException("上传单据参数类型错误！"); + } + switch (ticketTypeEnum) { + case ALARM_TICKET: + thsOverRunLog.setAlarmTicket(pathStr); + break; + case FEEDBACK: + thsOverRunLog.setFeedback(pathStr); + break; + case TEST_REPORT: + thsOverRunLog.setTestReport(pathStr); + break; + case REVISE_NOTICE: + thsOverRunLog.setTestReport(pathStr); + break; + case REVISE_FEEDBACK: + thsOverRunLog.setReviseFeedback(pathStr); + break; + } + thsOverRunLogMapper.updateById(thsOverRunLog); + } } @@ -279,68 +345,51 @@ public class ThsSuperviseServiceImpl extends ServiceImpl limitBoolMap, Monitor monitor, LimitRate limitRate, Integer initType) { + public void buildData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, LimitRate limitRate, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs) { if (CollectionUtil.isNotEmpty(limitBoolMap)) { if (OperationEnum.AND.getCode().equals(steady.getOperation())) { for (Map.Entry entry : limitBoolMap.entrySet()) { if (entry.getValue() instanceof Boolean && !(boolean) entry.getValue()) { - return null; + return; } } - //生成监督数据 - ThsSupervise thsSupervise = this.insertSuperviseData(steady, monitor, limitRate, limitBoolMap, initType); - //生成告警/预警监测点列表数据 - return this.insertOverRunLog(steady, thsSupervise, monitor, limitRate, limitBoolMap, initType); + //构建监督数据 + this.buildSuperviseData(steady, monitor, limitRate, limitBoolMap, initType, thsSupervise, thsOverRunLogs); + //构建告警/预警监测点列表数据 + this.buildOverRunLog(steady, thsSupervise, monitor, limitRate, limitBoolMap, initType, thsOverRunLogs); + return; } if (OperationEnum.OR.getCode().equals(steady.getOperation())) { for (Map.Entry entry : limitBoolMap.entrySet()) { if (entry.getValue() instanceof Boolean && (boolean) entry.getValue()) { //生成监督数据 - ThsSupervise thsSupervise = this.insertSuperviseData(steady, monitor, limitRate, limitBoolMap, initType); + this.buildSuperviseData(steady, monitor, limitRate, limitBoolMap, initType, thsSupervise, thsOverRunLogs); //生成告警/预警监测点数据 - return this.insertOverRunLog(steady, thsSupervise, monitor, limitRate, limitBoolMap, initType); + this.buildOverRunLog(steady, thsSupervise, monitor, limitRate, limitBoolMap, initType, thsOverRunLogs); + return; } } } } - return null; } - @DS("process") + @Override - public ThsSupervise insertSuperviseData(SourceSteadyIndicator steady, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType) { - //判断今日是否已经生成了监督数据 - LambdaQueryWrapper superviseQueryWrapper = new LambdaQueryWrapper<>(); - superviseQueryWrapper.between(ThsSupervise::getCreateTime, - DateUtil.beginOfDay(new Date()), - DateUtil.endOfDay(new Date())) - .eq(ThsSupervise::getDeptId, steady.getDeptId()) - .eq(ThsSupervise::getType, steady.getType()) - .last("limit 1"); - ThsSupervise supervise = thsSuperviseMapper.selectOne(superviseQueryWrapper); - if (supervise != null) { - return supervise; + public void buildSuperviseData(SourceSteadyIndicator steady, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs) { + if (thsSupervise != null && StringUtils.isBlank(thsSupervise.getSupIndex())) { + thsSupervise.setSupIndex(IdUtil.simpleUUID()); + thsSupervise.setDeptId(steady.getDeptId()); + thsSupervise.setCreateTime(new Date()); + thsSupervise.setType(steady.getType()); + thsSupervise.setCreateUser(RequestUtil.getUsername()); + thsSupervise.setProgress(ProgressEnum.START.getCode()); + thsSupervise.setCreateType(initType); } - ThsSupervise thsSupervise = new ThsSupervise(); - thsSupervise.setSupIndex(IdUtil.simpleUUID()); - AlarmTypeEnum alarmTypeEnum = AlarmTypeEnum.getAlarmTypeEnumByCode(steady.getType()); - thsSupervise.setName(DateUtil.today() + monitor.getPowerrName() + (alarmTypeEnum == null ? "" : "_" + alarmTypeEnum.getMessage())); - thsSupervise.setDeptId(steady.getDeptId()); - thsSupervise.setCreateTime(new Date()); - thsSupervise.setType(steady.getType()); - thsSupervise.setCreateUser(RequestUtil.getUsername()); - thsSupervise.setProgress(ProgressEnum.START.getCode()); - List descriptionList = (List) limitBoolMap.get(DESCRIPTION); - thsSupervise.setDescription(StringUtils.join(descriptionList, ",")); - thsSupervise.setCreateType(initType); - thsSuperviseMapper.insert(thsSupervise); - return thsSupervise; } - @DS("process") @Override - public ThsOverRunLog insertOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType) { + public void buildOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType, List thsOverRunLogs) { ThsOverRunLog thsOverRunLog = new ThsOverRunLog(); thsOverRunLog.setId(IdUtil.simpleUUID()); thsOverRunLog.setSupIndex(thsSupervise.getSupIndex()); @@ -350,10 +399,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl descriptionList = (List) limitBoolMap.get(DESCRIPTION); thsOverRunLog.setDescription(StringUtils.join(descriptionList, ",")); - if (InitTypeEnum.AUTO.getCode().equals(initType)) { - thsOverRunLogMapper.insert(thsOverRunLog); - } - return thsOverRunLog; + thsOverRunLogs.add(thsOverRunLog); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlickerDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlickerDService.java new file mode 100644 index 000000000..6234e654f --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlickerDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO; + +import java.util.List; + +public interface IRStatDataFlickerDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlucDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlucDService.java new file mode 100644 index 000000000..da5493e45 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataFlucDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlucDPO; + +import java.util.List; + +public interface IRStatDataFlucDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateIDService.java new file mode 100644 index 000000000..3fca043fa --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateIDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateIDPO; + +import java.util.List; + +public interface IRStatDataHarmRateIDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java new file mode 100644 index 000000000..fdb523759 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmRateVDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmrateVDPO; + +import java.util.List; + +public interface IRStatDataHarmRateVDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicIDService.java new file mode 100644 index 000000000..3a615737e --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicIDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicIDPO; + +import java.util.List; + +public interface IRStatDataHarmphasicIDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicVDService.java new file mode 100644 index 000000000..f55e7845f --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmphasicVDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmphasicVDPO; + +import java.util.List; + +public interface IRStatDataHarmphasicVDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerPDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerPDService.java new file mode 100644 index 000000000..08c0657e6 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerPDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerPDPO; + +import java.util.List; + +public interface IRStatDataHarmpowerPDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerQDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerQDService.java new file mode 100644 index 000000000..06f072349 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerQDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerQDPO; + +import java.util.List; + +public interface IRStatDataHarmpowerQDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerSDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerSDService.java new file mode 100644 index 000000000..c7d831a66 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerSDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataHarmpowerSDPO; + +import java.util.List; + +public interface IRStatDataHarmpowerSDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java new file mode 100644 index 000000000..7fd867990 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataIDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataIDPO; + +import java.util.List; + +public interface IRStatDataIDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java new file mode 100644 index 000000000..faafb2064 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmIDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmIDPO; + +import java.util.List; + +public interface IRStatDataInharmIDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java new file mode 100644 index 000000000..9a78c5ccf --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataInharmVDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataInharmVDPO; + +import java.util.List; + +public interface IRStatDataInharmVDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java new file mode 100644 index 000000000..ee429db36 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataPltDService.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataPltDPO; + +import java.util.List; + +public interface IRStatDataPltDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java new file mode 100644 index 000000000..8a4bd543b --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataVDService.java @@ -0,0 +1,11 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataFlickerDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO; + +import java.util.List; + +public interface IRStatDataVDService { + + void insert(List list); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java new file mode 100644 index 000000000..99bfefd82 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatLimitRateDService.java @@ -0,0 +1,13 @@ +package com.njcn.prepare.harmonic.service.mysql.day; + +import com.njcn.prepare.harmonic.pojo.po.RStatDataVDPO; +import com.njcn.prepare.harmonic.pojo.po.RStatLimitRateDPO; + +import java.util.List; + +public interface IRStatLimitRateDService { + + void insert(List list); + + List findList(List list, String time); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/DayDataService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/DayDataService.java index 1115a9d0a..b4c5e4af9 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/DayDataService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/DayDataService.java @@ -19,4 +19,12 @@ public interface DayDataService { * @Date: 2022/10/24 */ void dayDataJobHandler(List indexLists, String startTime, String endTime); + + /** + * 处理day表，并将数据入MySQL库中 + * @param indexLists + * @param startTime + * @param endTime + */ + void dataToDayHandler(List indexLists, String startTime, String endTime); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java index 7452b78ba..f92df7d43 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicGeneralService.java @@ -10,4 +10,6 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; public interface HarmonicGeneralService { void generalData(LineParam lineParam); + + void generalDataToMysql(LineParam lineParam); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java index b67c17359..7583a3d54 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/HarmonicMetricService.java @@ -10,4 +10,6 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; public interface HarmonicMetricService { void metricData(LineParam lineParam); + + void metricDataToMysql(LineParam lineParam); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java index 6f26990ba..0f378df3c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IntegrityService.java @@ -10,4 +10,6 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; public interface IntegrityService { String computeDataIntegrity(LineParam lineParam); + + void dataIntegrity(LineParam lineParam); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java index 8dc2bf433..70a8d9828 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/LimitTargetService.java @@ -10,4 +10,6 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; public interface LimitTargetService { void getLimitTargetData(LineParam lineParam); + + void limitTargetData(LineParam lineParam); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java index 770022b5b..5ba162718 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/OnlineRateService.java @@ -10,4 +10,6 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; public interface OnlineRateService { void getOnlineRateData(LineParam lineParam); + + void onlineRateData(LineParam lineParam); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsOverRunLogService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsOverRunLogService.java index 18995b34c..8a6e99460 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsOverRunLogService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsOverRunLogService.java @@ -1,8 +1,12 @@ package com.njcn.prepare.harmonic.service.mysql.line; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.common.pojo.response.HttpResult; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; +import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo; + +import java.util.List; /** *

    @@ -21,4 +25,19 @@ public interface ThsOverRunLogService extends IService { * @return */ void saveOverRunLog(SuperviseParam superviseParam); + + /** + * 查询技术监督监测点集合 + * + * @param supIndex + * @return + */ + SuperviceRunLogVo superviseDetail(String supIndex); + + /** + * 更新技术监督 + * + * @param superviseParam + */ + HttpResult updateSupervise(SuperviseParam superviseParam); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java index 708c7f449..a90b0680b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java @@ -1,17 +1,24 @@ package com.njcn.prepare.harmonic.service.mysql.line; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.harmonic.pojo.vo.SourceSteadyIndicator; import com.njcn.harmonic.pojo.vo.ThsStrategyVo; import com.njcn.prepare.enums.TypeEnum; +import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog; import com.njcn.prepare.harmonic.pojo.po.ThsSupervise; +import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo; +import com.njcn.prepare.harmonic.pojo.vo.SuperviseVo; import com.njcn.process.pojo.po.LimitRate; import com.njcn.process.pojo.po.ThsWarnStrategyAss; +import com.njcn.user.pojo.po.Dept; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -27,7 +34,7 @@ public interface ThsSuperviseService extends IService { /** * 初始化技术监督 */ - HttpResult> initSupervise(SuperviseParam superviseParam); + HttpResult initSupervise(SuperviseParam superviseParam); /** * 查新策略集合 @@ -49,7 +56,7 @@ public interface ThsSuperviseService extends IService { * * @param limitBoolMap */ - ThsOverRunLog creatSuperviseData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, LimitRate limitRate, Integer initType); + void buildData(SourceSteadyIndicator steady, Map limitBoolMap, Monitor monitor, LimitRate limitRate, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs); /** * 查询策略绑定的干扰源列表或指标参数列表 @@ -67,7 +74,7 @@ public interface ThsSuperviseService extends IService { * @param monitor * @return */ - ThsSupervise insertSuperviseData(SourceSteadyIndicator steady, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType); + void buildSuperviseData(SourceSteadyIndicator steady, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType, ThsSupervise thsSupervise, List thsOverRunLogs); /** * 生成 告警/预警监测点列表 数据 @@ -76,15 +83,48 @@ public interface ThsSuperviseService extends IService { * @param thsSupervise * @param monitor */ - ThsOverRunLog insertOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType); + void buildOverRunLog(SourceSteadyIndicator steady, ThsSupervise thsSupervise, Monitor monitor, LimitRate limitRate, Map limitBoolMap, Integer initType, List thsOverRunLogs); - /** - * 部门没有绑定策略的走通用策略 - * - * @param thsStrategyList - * @param superviseParam - */ - void initCommonStrategy(List thsStrategyList, SuperviseParam superviseParam); void deleteTodayData(String depId, Integer initType); + + /** + * 生成技术监督数据 + * + * @param thsSupervise + * @param overRunLogList + */ + void creatData(Dept dept, ThsSupervise thsSupervise, List overRunLogList); + + /** + * 保存技术监督数据 + * + * @param superviceRunLogVo + */ + void saveOverRunLog(SuperviceRunLogVo superviceRunLogVo); + + /** + * 查询技术监督列表 + * + * @param superviseDto + */ + Page querySuperviseList(SuperviseDto superviseDto); + + /** + * 删除技术监督 + * + * @param superviseDto + * @return + */ + HttpResult deleteSupervise(SuperviseDto superviseDto); + + /** + * 上传技术监督单据 + * + * @param id + * @param ticketType + * @param files + * @param response + */ + void uploadSuperviseTicket(String id, String ticketType, MultipartFile[] files, HttpServletResponse response); } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index 04830abd1..28b74e067 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -160,6 +160,27 @@ public enum DicDataEnum { DY_10KV("交流10kV","10kV"), DY_35KV("交流35kV","35kV"), DY_110KV("交流110kV","110kV"), + /** + * 电压等级 + * @author cdf + * @date 2023/3/24 + */ + + KV038("0.38kV","0.38kV"), + V380("380V","380V"), + KV04("0.4kV","0.4kV"), + V400("400V","400V"), + KV6("6kV","6kV"), + KV10("10kV","10kV"), + KV20("20kV","20kV"), + KV35("35kV","35kV"), + KV66("66kV","66kV"), + KV110("110kV","110kV"), + KV220("220kV","220kV"), + KV330("330kV","330kV"), + KV500("500kV","500kV"), + KV750("750kV","750kV"), + KV1000("1000kV","1000kV"), /** * 计划采取实施