From f0eabb44b1150126be0a2a1c0fc6ba31d4c114ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 16 May 2023 15:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=80=BC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/biz/pojo/po/Overlimit.java | 54 ++++++++++++++ .../njcn/device/biz/utils/COverlimitUtil.java | 73 +++---------------- .../device/pq/mapper/mapping/LineMapper.xml | 2 +- 3 files changed, 64 insertions(+), 65 deletions(-) diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java index fc5b400a8..9c6945f2c 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java @@ -838,5 +838,59 @@ public class Overlimit implements Serializable { this.inuharm16=fLimit[70]; } + public void buildIHarm(Float[] iHarmTem){ + this.iharm2= iHarmTem[0]; + this.iharm4= iHarmTem[2]; + this.iharm6= iHarmTem[4]; + this.iharm8= iHarmTem[6]; + this.iharm10= iHarmTem[8]; + this.iharm12= iHarmTem[10]; + this.iharm14= iHarmTem[12]; + this.iharm16= iHarmTem[14]; + this.iharm18= iHarmTem[16]; + this.iharm20= iHarmTem[18]; + this.iharm22= iHarmTem[20]; + this.iharm24= iHarmTem[22]; + this.iharm26= iHarmTem[24]; + this.iharm28= iHarmTem[26]; + this.iharm30= iHarmTem[28]; + this.iharm32= iHarmTem[30]; + this.iharm34= iHarmTem[32]; + this.iharm36= iHarmTem[34]; + this.iharm38= iHarmTem[36]; + this.iharm40= iHarmTem[38]; + this.iharm42= iHarmTem[40]; + this.iharm44= iHarmTem[42]; + this.iharm46= iHarmTem[44]; + this.iharm48= iHarmTem[46]; + this.iharm50= iHarmTem[48]; + + + + this.iharm3= iHarmTem[1]; + this.iharm5= iHarmTem[3]; + this.iharm7= iHarmTem[5]; + this.iharm9= iHarmTem[7]; + this.iharm11= iHarmTem[9]; + this.iharm13= iHarmTem[11]; + this.iharm15= iHarmTem[13]; + this.iharm17= iHarmTem[15]; + this.iharm19= iHarmTem[17]; + this.iharm21= iHarmTem[19]; + this.iharm23= iHarmTem[21]; + this.iharm25= iHarmTem[23]; + this.iharm27= iHarmTem[25]; + this.iharm29= iHarmTem[27]; + this.iharm31= iHarmTem[29]; + this.iharm33= iHarmTem[31]; + this.iharm35= iHarmTem[33]; + this.iharm37= iHarmTem[35]; + this.iharm39= iHarmTem[37]; + this.iharm41= iHarmTem[39]; + this.iharm43= iHarmTem[41]; + this.iharm45= iHarmTem[43]; + this.iharm47= iHarmTem[45]; + this.iharm49= iHarmTem[47]; + } } diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java index c78058dfa..f11879aa1 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java @@ -30,6 +30,9 @@ public class COverlimitUtil { }; + /** + * 计算监测点限值 + */ public static Overlimit globalAssemble(Float voltageLevel,Float protocolCapacity,Float devCapacity,Float shortCapacity) { Overlimit overlimit = new Overlimit(); voltageDeviation(overlimit,voltageLevel); @@ -39,7 +42,7 @@ public class COverlimitUtil { totalHarmonicDistortion(overlimit,voltageLevel); uHarm(overlimit,voltageLevel); threeVoltageUnbalance(overlimit); - iHarm(overlimit,voltageLevel,protocolCapacity,devCapacity); + iHarm(overlimit,voltageLevel,protocolCapacity,devCapacity,shortCapacity); negativeSequenceCurrent(overlimit,voltageLevel,shortCapacity); interharmonicCurrent(overlimit,voltageLevel); return overlimit; @@ -228,73 +231,15 @@ public class COverlimitUtil { /** * 谐波电流限值 */ - public static void iHarm(Overlimit overlimit, Float voltageLevel,Float protocolCapacity,Float devCapacity) { - float calCap = getDlCapByVoltageLevel(voltageLevel); + public static void iHarm(Overlimit overlimit, Float voltageLevel,Float protocolCapacity,Float devCapacity,Float shortCapacity) { + float calCap = shortCapacity/getDlCapByVoltageLevel(voltageLevel); //24谐波电流幅值 Float[] iHarmTem = new Float[49]; for (int i = 0; i <= 48; i++) { - float v = iHarmCalculate(i+2,voltageLevel,protocolCapacity,devCapacity,calCap); - iHarmTem[i] = v; + float inHarm = iHarmCalculate(i+2,voltageLevel,protocolCapacity,devCapacity,calCap); + iHarmTem[i] = inHarm; } - - - overlimit.setIharm2(iHarmTem[0]); - overlimit.setIharm4(iHarmTem[2]); - overlimit.setIharm6(iHarmTem[4]); - overlimit.setIharm8(iHarmTem[6]); - overlimit.setIharm10(iHarmTem[8]); - overlimit.setIharm12(iHarmTem[10]); - overlimit.setIharm14(iHarmTem[12]); - overlimit.setIharm16(iHarmTem[14]); - overlimit.setIharm18(iHarmTem[16]); - overlimit.setIharm20(iHarmTem[18]); - overlimit.setIharm22(iHarmTem[20]); - overlimit.setIharm24(iHarmTem[22]); - overlimit.setIharm26(iHarmTem[24]); - overlimit.setIharm28(iHarmTem[26]); - overlimit.setIharm30(iHarmTem[28]); - overlimit.setIharm32(iHarmTem[30]); - overlimit.setIharm34(iHarmTem[32]); - overlimit.setIharm36(iHarmTem[34]); - overlimit.setIharm38(iHarmTem[36]); - overlimit.setIharm40(iHarmTem[38]); - overlimit.setIharm42(iHarmTem[40]); - overlimit.setIharm44(iHarmTem[42]); - overlimit.setIharm46(iHarmTem[44]); - overlimit.setIharm48(iHarmTem[46]); - overlimit.setIharm50(iHarmTem[48]); - - - - overlimit.setIharm3(iHarmTem[1]); - overlimit.setIharm5(iHarmTem[3]); - overlimit.setIharm7(iHarmTem[5]); - overlimit.setIharm9(iHarmTem[7]); - overlimit.setIharm11(iHarmTem[9]); - overlimit.setIharm13(iHarmTem[11]); - overlimit.setIharm15(iHarmTem[13]); - overlimit.setIharm17(iHarmTem[15]); - overlimit.setIharm19(iHarmTem[17]); - overlimit.setIharm21(iHarmTem[19]); - overlimit.setIharm23(iHarmTem[21]); - overlimit.setIharm25(iHarmTem[23]); - overlimit.setIharm27(iHarmTem[25]); - overlimit.setIharm29(iHarmTem[27]); - overlimit.setIharm31(iHarmTem[29]); - overlimit.setIharm33(iHarmTem[31]); - overlimit.setIharm35(iHarmTem[33]); - overlimit.setIharm37(iHarmTem[35]); - overlimit.setIharm39(iHarmTem[37]); - overlimit.setIharm41(iHarmTem[39]); - overlimit.setIharm43(iHarmTem[41]); - overlimit.setIharm45(iHarmTem[43]); - overlimit.setIharm47(iHarmTem[45]); - overlimit.setIharm49(iHarmTem[47]); - - - - - + overlimit.buildIHarm(iHarmTem); } private static float iHarmCalculate(int nHarm, Float voltageLevel,float protocolCapacity, float devCapacity,float calCap) { diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 612e7a615..69033d0f8 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -410,7 +410,7 @@ - select f.* from pq_line a inner join pq_line_detail b on a.id = b.id inner join pq_line c on a.pid = c.id