pms pq代码调整

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java

@@ -947,4 +947,7 @@ public class Overlimit implements Serializable {
         this.uharm49=resultOdd;
     }
 
+
+
+
 }

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java

@@ -4,6 +4,7 @@ import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.Dic;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
@@ -37,9 +38,9 @@ public class COverlimitUtil {
      * @param devCapacity 设备容量
      * @param shortCapacity 短路容量
      * @param powerFlag 0.用户侧 1.电网侧
-     * @param lineType 0.主网 1.配网
+     * @param lineType 0.主网 1.配网 需要注意配网目前没有四种容量，谐波电流幅值限值,负序电流限值无法计算默认-3.14159
      */
-    public static Overlimit globalAssemble(Float voltageLevel,Float protocolCapacity,Float devCapacity,Float shortCapacity,Integer powerFlag,Integer lineType) {
+    public static Overlimit globalAssemble(Float voltageLevel, Float protocolCapacity, Float devCapacity, Float shortCapacity, Integer powerFlag, Integer lineType) {
         Overlimit overlimit = new Overlimit();
         voltageDeviation(overlimit,voltageLevel);
         frequency(overlimit);
@@ -48,9 +49,22 @@ public class COverlimitUtil {
         totalHarmonicDistortion(overlimit,voltageLevel);
         uHarm(overlimit,voltageLevel);
         threeVoltageUnbalance(overlimit);
-        iHarm(overlimit,voltageLevel,protocolCapacity,devCapacity,shortCapacity);
-        negativeSequenceCurrent(overlimit,voltageLevel,shortCapacity);
         interharmonicCurrent(overlimit,voltageLevel);
+
+        if(lineType == 1) {
+          //配网
+            Float[] iHarmTem = new Float[49];
+            for (int i = 0; i <= 48; i++) {
+
+                iHarmTem[i] = -3.14159f;
+            }
+            overlimit.buildIHarm(iHarmTem);
+            overlimit.setINeg(-3.14159f);
+        }else {
+            //主网
+            iHarm(overlimit, voltageLevel, protocolCapacity, devCapacity, shortCapacity);
+            negativeSequenceCurrent(overlimit, voltageLevel, shortCapacity);
+        }
         return overlimit;
     }