离线数据上传bug
This commit is contained in:
@@ -117,7 +117,7 @@ public class AnalyseComtradeCfg {
|
|||||||
hashMapA.put("pq_RmsU",rms[0]);
|
hashMapA.put("pq_RmsU",rms[0]);
|
||||||
hashMapB.put("pq_RmsU",rms[1]);
|
hashMapB.put("pq_RmsU",rms[1]);
|
||||||
hashMapC.put("pq_RmsU",rms[2]);
|
hashMapC.put("pq_RmsU",rms[2]);
|
||||||
hashMapA.put("pq_RmsU",rms[3]);
|
hashMapA.put("pq_RmsI",rms[3]);
|
||||||
hashMapB.put("pq_RmsI",rms[4]);
|
hashMapB.put("pq_RmsI",rms[4]);
|
||||||
hashMapC.put("pq_RmsI",rms[5]);
|
hashMapC.put("pq_RmsI",rms[5]);
|
||||||
hashMapA.put("pq_RmsLU",rms[6]);
|
hashMapA.put("pq_RmsLU",rms[6]);
|
||||||
@@ -197,37 +197,37 @@ public class AnalyseComtradeCfg {
|
|||||||
Float[][][] harmPower = min.getHarm_Power();
|
Float[][][] harmPower = min.getHarm_Power();
|
||||||
for (int i = 0; i < 49; i++) {
|
for (int i = 0; i < 49; i++) {
|
||||||
//电压含有率
|
//电压含有率
|
||||||
hashMapA.put("pq_HarmU_"+(i+2),harmContain[0][i]);
|
hashMapA.put("pq_HarmU_"+(i+2),harmContain[0][i+1]);
|
||||||
hashMapB.put("pq_HarmU_"+(i+2),harmContain[1][i]);
|
hashMapB.put("pq_HarmU_"+(i+2),harmContain[1][i+1]);
|
||||||
hashMapC.put("pq_HarmU_"+(i+2),harmContain[2][i]);
|
hashMapC.put("pq_HarmU_"+(i+2),harmContain[2][i+1]);
|
||||||
|
|
||||||
//谐波相角
|
//谐波相角
|
||||||
hashMapA.put("pq_HarmUAng_"+(i+2),fuHarmPhase[0][i]);
|
hashMapA.put("pq_HarmUAng_"+(i+2),fuHarmPhase[0][i+1]);
|
||||||
hashMapB.put("pq_HarmUAng_"+(i+2),fuHarmPhase[1][i]);
|
hashMapB.put("pq_HarmUAng_"+(i+2),fuHarmPhase[1][i+1]);
|
||||||
hashMapC.put("pq_HarmUAng_"+(i+2),fuHarmPhase[2][i]);
|
hashMapC.put("pq_HarmUAng_"+(i+2),fuHarmPhase[2][i+1]);
|
||||||
|
|
||||||
hashMapA.put("pq_HarmIAng_"+(i+2),fuHarmPhase[3][i]);
|
hashMapA.put("pq_HarmIAng_"+(i+2),fuHarmPhase[3][i+1]);
|
||||||
hashMapB.put("pq_HarmIAng_"+(i+2),fuHarmPhase[4][i]);
|
hashMapB.put("pq_HarmIAng_"+(i+2),fuHarmPhase[4][i+1]);
|
||||||
hashMapC.put("pq_HarmIAng_"+(i+2),fuHarmPhase[5][i]);
|
hashMapC.put("pq_HarmIAng_"+(i+2),fuHarmPhase[5][i+1]);
|
||||||
|
|
||||||
//电流幅值
|
//电流幅值
|
||||||
hashMapA.put("pq_HarmI_"+(i+2),fuHarm[3][i]);
|
hashMapA.put("pq_HarmI_"+(i+2),fuHarm[3][i+1]);
|
||||||
hashMapB.put("pq_HarmI_"+(i+2),fuHarm[4][i]);
|
hashMapB.put("pq_HarmI_"+(i+2),fuHarm[4][i+1]);
|
||||||
hashMapC.put("pq_HarmI_"+(i+2),fuHarm[5][i]);
|
hashMapC.put("pq_HarmI_"+(i+2),fuHarm[5][i+1]);
|
||||||
|
|
||||||
|
|
||||||
//谐波功率
|
//谐波功率
|
||||||
hashMapA.put("pq_HarmP_"+(i+2),harmPower[0][i][0]);
|
hashMapA.put("pq_HarmP_"+(i+2),harmPower[0][i+1][0]);
|
||||||
hashMapA.put("pq_HarmQ_"+(i+2),harmPower[0][i][1]);
|
hashMapA.put("pq_HarmQ_"+(i+2),harmPower[0][i+1][1]);
|
||||||
hashMapA.put("pq_HarmS_"+(i+2),harmPower[0][i][2]);
|
hashMapA.put("pq_HarmS_"+(i+2),harmPower[0][i+1][2]);
|
||||||
|
|
||||||
hashMapB.put("pq_HarmP_"+(i+2),harmPower[1][i][0]);
|
hashMapB.put("pq_HarmP_"+(i+2),harmPower[1][i+1][0]);
|
||||||
hashMapB.put("pq_HarmQ_"+(i+2),harmPower[1][i][1]);
|
hashMapB.put("pq_HarmQ_"+(i+2),harmPower[1][i+1][1]);
|
||||||
hashMapB.put("pq_HarmS_"+(i+2),harmPower[1][i][2]);
|
hashMapB.put("pq_HarmS_"+(i+2),harmPower[1][i+1][2]);
|
||||||
|
|
||||||
hashMapC.put("pq_HarmP_"+(i+2),harmPower[2][i][0]);
|
hashMapC.put("pq_HarmP_"+(i+2),harmPower[2][i+1][0]);
|
||||||
hashMapC.put("pq_HarmQ_"+(i+2),harmPower[2][i][1]);
|
hashMapC.put("pq_HarmQ_"+(i+2),harmPower[2][i+1][1]);
|
||||||
hashMapC.put("pq_HarmS_"+(i+2),harmPower[2][i][2]);
|
hashMapC.put("pq_HarmS_"+(i+2),harmPower[2][i+1][2]);
|
||||||
//M相目前没有
|
//M相目前没有
|
||||||
// hashMapT.put("pq_HarmP_"+(i+2),harmPower[3][i][0]);
|
// hashMapT.put("pq_HarmP_"+(i+2),harmPower[3][i][0]);
|
||||||
// hashMapT.put("pq_HarmQ_"+(i+2),harmPower[3][i][1]);
|
// hashMapT.put("pq_HarmQ_"+(i+2),harmPower[3][i][1]);
|
||||||
@@ -239,9 +239,9 @@ public class AnalyseComtradeCfg {
|
|||||||
|
|
||||||
for (int i = 0; i < 50; i++) {
|
for (int i = 0; i < 50; i++) {
|
||||||
//间谐波幅值
|
//间谐波幅值
|
||||||
hashMapA.put("pq_InHarmIAmp_"+(i+1),inHarm[3][i]);
|
hashMapA.put("pq_InHarmIAmp_"+(i+1),inHarm[3][i+1]);
|
||||||
hashMapB.put("pq_InHarmIAmp_"+(i+1),inHarm[4][i]);
|
hashMapB.put("pq_InHarmIAmp_"+(i+1),inHarm[4][i+1]);
|
||||||
hashMapC.put("pq_InHarmIAmp_"+(i+1),inHarm[5][i]);
|
hashMapC.put("pq_InHarmIAmp_"+(i+1),inHarm[5][i+1]);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user