diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java index fe5a982..ea428be 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java @@ -263,9 +263,9 @@ public class AnalyseComtradeCfg { hashMapB.put("pq_S",totalPower[1][2]); hashMapC.put("pq_S",totalPower[2][2]); - hashMapM.put("pq_TotHarmP",totalPower[3][0]); - hashMapM.put("pq_TotHarmQ",totalPower[3][1]); - hashMapM.put("pq_TotHarmS",totalPower[3][2]); + hashMapM.put("pq_TotP",totalPower[3][0]); + hashMapM.put("pq_TotQ",totalPower[3][1]); + hashMapM.put("pq_TotS",totalPower[3][2]); /*todo 谐波畸变率,电压波动,电压闪变,电压长闪变会根据监测点接线方式是星型存A,B,C相,角型或者V型存AB,BC,CA相,目前全存在A,B,C相*/ //谐波畸变率 @@ -297,9 +297,9 @@ public class AnalyseComtradeCfg { hashMapC.put("pq_Fluct",uFluctuation[2]); //电压闪变 Float[] uFlicker = min.getU_Flicker(); - hashMapA.put("pq_Plt",uFlicker[0]); - hashMapB.put("pq_Plt",uFlicker[1]); - hashMapC.put("pq_Plt",uFlicker[2]); + hashMapA.put("pq_Pst",uFlicker[0]); + hashMapB.put("pq_Pst",uFlicker[1]); + hashMapC.put("pq_Pst",uFlicker[2]); //电压长闪变 Float[] ulFlicker = min.getUL_Flicker(); hashMapA.put("pq_Plt",ulFlicker[0]);