From 044f3c4d643e0297b0c248b4e7cae649a7617a0e Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 8 Apr 2026 13:50:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E8=A7=92=E6=95=B0=E6=8D=AE=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86=EF=BC=8C=E8=AE=A9?= =?UTF-8?q?=E7=9B=B8=E8=A7=92=E4=BF=9D=E6=8C=81=E5=9C=A8-180=E8=87=B3180?= =?UTF-8?q?=E4=B9=8B=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/stat/utils/BeanIConverter.java | 422 ++++++++--------- .../com/njcn/stat/utils/BeanVConverter.java | 423 +++++++++--------- 2 files changed, 445 insertions(+), 400 deletions(-) diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java index b6ee237..31eacc3 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java @@ -18,6 +18,28 @@ import java.util.Objects; * @version V1.0.0 */ public class BeanIConverter { + /** + * 角度相关常量 + */ + private static final double ANGLE_180 = 180.0; + private static final double ANGLE_360 = 360.0; + private static final double ANGLE_MINUS_180 = -180.0; + + public static Double adjustPhase(Double phase) { + if (phase == null) { + return null; + } + // 使用模运算将角度标准化到[-180, 180]范围 + double normalizedPhase = phase % ANGLE_360; + // 处理超出[-180, 180]范围的情况 + if (normalizedPhase > ANGLE_180) { + normalizedPhase -= ANGLE_360; + } else if (normalizedPhase < ANGLE_MINUS_180) { + normalizedPhase += ANGLE_360; + } + + return normalizedPhase; + } //A,B,C三项 public static DataIDTO messageDataITODataI(MessageDataI messageDataI){ DataIDTO dataI = new DataIDTO(); @@ -283,209 +305,209 @@ public class BeanIConverter { public static DataHarmphasicIDTO messageDataITODataHarmphasicI(MessageDataI messageDataI){ DataHarmphasicIDTO dataHarmphasicI = new DataHarmphasicIDTO(); if(Objects.nonNull(messageDataI)){ - dataHarmphasicI.setI1(messageDataI.getIfundAngle()); - dataHarmphasicI.setI2(messageDataI.getIa2()); - dataHarmphasicI.setI3(messageDataI.getIa3()); - dataHarmphasicI.setI4(messageDataI.getIa4()); - dataHarmphasicI.setI5(messageDataI.getIa5()); - dataHarmphasicI.setI6(messageDataI.getIa6()); - dataHarmphasicI.setI7(messageDataI.getIa7()); - dataHarmphasicI.setI8(messageDataI.getIa8()); - dataHarmphasicI.setI9(messageDataI.getIa9()); - dataHarmphasicI.setI10(messageDataI.getIa10()); - dataHarmphasicI.setI11(messageDataI.getIa11()); - dataHarmphasicI.setI12(messageDataI.getIa12()); - dataHarmphasicI.setI13(messageDataI.getIa13()); - dataHarmphasicI.setI14(messageDataI.getIa14()); - dataHarmphasicI.setI15(messageDataI.getIa15()); - dataHarmphasicI.setI16(messageDataI.getIa16()); - dataHarmphasicI.setI17(messageDataI.getIa17()); - dataHarmphasicI.setI18(messageDataI.getIa18()); - dataHarmphasicI.setI19(messageDataI.getIa19()); - dataHarmphasicI.setI20(messageDataI.getIa20()); - dataHarmphasicI.setI21(messageDataI.getIa21()); - dataHarmphasicI.setI22(messageDataI.getIa22()); - dataHarmphasicI.setI23(messageDataI.getIa23()); - dataHarmphasicI.setI24(messageDataI.getIa24()); - dataHarmphasicI.setI25(messageDataI.getIa25()); - dataHarmphasicI.setI26(messageDataI.getIa26()); - dataHarmphasicI.setI27(messageDataI.getIa27()); - dataHarmphasicI.setI28(messageDataI.getIa28()); - dataHarmphasicI.setI29(messageDataI.getIa29()); - dataHarmphasicI.setI30(messageDataI.getIa30()); - dataHarmphasicI.setI31(messageDataI.getIa31()); - dataHarmphasicI.setI32(messageDataI.getIa32()); - dataHarmphasicI.setI33(messageDataI.getIa33()); - dataHarmphasicI.setI34(messageDataI.getIa34()); - dataHarmphasicI.setI35(messageDataI.getIa35()); - dataHarmphasicI.setI36(messageDataI.getIa36()); - dataHarmphasicI.setI37(messageDataI.getIa37()); - dataHarmphasicI.setI38(messageDataI.getIa38()); - dataHarmphasicI.setI39(messageDataI.getIa39()); - dataHarmphasicI.setI40(messageDataI.getIa40()); - dataHarmphasicI.setI41(messageDataI.getIa41()); - dataHarmphasicI.setI42(messageDataI.getIa42()); - dataHarmphasicI.setI43(messageDataI.getIa43()); - dataHarmphasicI.setI44(messageDataI.getIa44()); - dataHarmphasicI.setI45(messageDataI.getIa45()); - dataHarmphasicI.setI46(messageDataI.getIa46()); - dataHarmphasicI.setI47(messageDataI.getIa47()); - dataHarmphasicI.setI48(messageDataI.getIa48()); - dataHarmphasicI.setI49(messageDataI.getIa49()); - dataHarmphasicI.setI50(messageDataI.getIa50()); + dataHarmphasicI.setI1(adjustPhase(messageDataI.getIfundAngle())); + dataHarmphasicI.setI2(adjustPhase(messageDataI.getIa2())); + dataHarmphasicI.setI3(adjustPhase(messageDataI.getIa3())); + dataHarmphasicI.setI4(adjustPhase(messageDataI.getIa4())); + dataHarmphasicI.setI5(adjustPhase(messageDataI.getIa5())); + dataHarmphasicI.setI6(adjustPhase(messageDataI.getIa6())); + dataHarmphasicI.setI7(adjustPhase(messageDataI.getIa7())); + dataHarmphasicI.setI8(adjustPhase(messageDataI.getIa8())); + dataHarmphasicI.setI9(adjustPhase(messageDataI.getIa9())); + dataHarmphasicI.setI10(adjustPhase(messageDataI.getIa10())); + dataHarmphasicI.setI11(adjustPhase(messageDataI.getIa11())); + dataHarmphasicI.setI12(adjustPhase(messageDataI.getIa12())); + dataHarmphasicI.setI13(adjustPhase(messageDataI.getIa13())); + dataHarmphasicI.setI14(adjustPhase(messageDataI.getIa14())); + dataHarmphasicI.setI15(adjustPhase(messageDataI.getIa15())); + dataHarmphasicI.setI16(adjustPhase(messageDataI.getIa16())); + dataHarmphasicI.setI17(adjustPhase(messageDataI.getIa17())); + dataHarmphasicI.setI18(adjustPhase(messageDataI.getIa18())); + dataHarmphasicI.setI19(adjustPhase(messageDataI.getIa19())); + dataHarmphasicI.setI20(adjustPhase(messageDataI.getIa20())); + dataHarmphasicI.setI21(adjustPhase(messageDataI.getIa21())); + dataHarmphasicI.setI22(adjustPhase(messageDataI.getIa22())); + dataHarmphasicI.setI23(adjustPhase(messageDataI.getIa23())); + dataHarmphasicI.setI24(adjustPhase(messageDataI.getIa24())); + dataHarmphasicI.setI25(adjustPhase(messageDataI.getIa25())); + dataHarmphasicI.setI26(adjustPhase(messageDataI.getIa26())); + dataHarmphasicI.setI27(adjustPhase(messageDataI.getIa27())); + dataHarmphasicI.setI28(adjustPhase(messageDataI.getIa28())); + dataHarmphasicI.setI29(adjustPhase(messageDataI.getIa29())); + dataHarmphasicI.setI30(adjustPhase(messageDataI.getIa30())); + dataHarmphasicI.setI31(adjustPhase(messageDataI.getIa31())); + dataHarmphasicI.setI32(adjustPhase(messageDataI.getIa32())); + dataHarmphasicI.setI33(adjustPhase(messageDataI.getIa33())); + dataHarmphasicI.setI34(adjustPhase(messageDataI.getIa34())); + dataHarmphasicI.setI35(adjustPhase(messageDataI.getIa35())); + dataHarmphasicI.setI36(adjustPhase(messageDataI.getIa36())); + dataHarmphasicI.setI37(adjustPhase(messageDataI.getIa37())); + dataHarmphasicI.setI38(adjustPhase(messageDataI.getIa38())); + dataHarmphasicI.setI39(adjustPhase(messageDataI.getIa39())); + dataHarmphasicI.setI40(adjustPhase(messageDataI.getIa40())); + dataHarmphasicI.setI41(adjustPhase(messageDataI.getIa41())); + dataHarmphasicI.setI42(adjustPhase(messageDataI.getIa42())); + dataHarmphasicI.setI43(adjustPhase(messageDataI.getIa43())); + dataHarmphasicI.setI44(adjustPhase(messageDataI.getIa44())); + dataHarmphasicI.setI45(adjustPhase(messageDataI.getIa45())); + dataHarmphasicI.setI46(adjustPhase(messageDataI.getIa46())); + dataHarmphasicI.setI47(adjustPhase(messageDataI.getIa47())); + dataHarmphasicI.setI48(adjustPhase(messageDataI.getIa48())); + dataHarmphasicI.setI49(adjustPhase(messageDataI.getIa49())); + dataHarmphasicI.setI50(adjustPhase(messageDataI.getIa50())); - dataHarmphasicI.setI1Max( messageDataI.getMaxIfundAngle()); - dataHarmphasicI.setI2Max(messageDataI.getMaxIa2()); - dataHarmphasicI.setI3Max(messageDataI.getMaxIa3()); - dataHarmphasicI.setI4Max(messageDataI.getMaxIa4()); - dataHarmphasicI.setI5Max(messageDataI.getMaxIa5()); - dataHarmphasicI.setI6Max(messageDataI.getMaxIa6()); - dataHarmphasicI.setI7Max(messageDataI.getMaxIa7()); - dataHarmphasicI.setI8Max(messageDataI.getMaxIa8()); - dataHarmphasicI.setI9Max(messageDataI.getMaxIa9()); - dataHarmphasicI.setI10Max(messageDataI.getMaxIa10()); - dataHarmphasicI.setI11Max(messageDataI.getMaxIa11()); - dataHarmphasicI.setI12Max(messageDataI.getMaxIa12()); - dataHarmphasicI.setI13Max(messageDataI.getMaxIa13()); - dataHarmphasicI.setI14Max(messageDataI.getMaxIa14()); - dataHarmphasicI.setI15Max(messageDataI.getMaxIa15()); - dataHarmphasicI.setI16Max(messageDataI.getMaxIa16()); - dataHarmphasicI.setI17Max(messageDataI.getMaxIa17()); - dataHarmphasicI.setI18Max(messageDataI.getMaxIa18()); - dataHarmphasicI.setI19Max(messageDataI.getMaxIa19()); - dataHarmphasicI.setI20Max(messageDataI.getMaxIa20()); - dataHarmphasicI.setI21Max(messageDataI.getMaxIa21()); - dataHarmphasicI.setI22Max(messageDataI.getMaxIa22()); - dataHarmphasicI.setI23Max(messageDataI.getMaxIa23()); - dataHarmphasicI.setI24Max(messageDataI.getMaxIa24()); - dataHarmphasicI.setI25Max(messageDataI.getMaxIa25()); - dataHarmphasicI.setI26Max(messageDataI.getMaxIa26()); - dataHarmphasicI.setI27Max(messageDataI.getMaxIa27()); - dataHarmphasicI.setI28Max(messageDataI.getMaxIa28()); - dataHarmphasicI.setI29Max(messageDataI.getMaxIa29()); - dataHarmphasicI.setI30Max(messageDataI.getMaxIa30()); - dataHarmphasicI.setI31Max(messageDataI.getMaxIa31()); - dataHarmphasicI.setI32Max(messageDataI.getMaxIa32()); - dataHarmphasicI.setI33Max(messageDataI.getMaxIa33()); - dataHarmphasicI.setI34Max(messageDataI.getMaxIa34()); - dataHarmphasicI.setI35Max(messageDataI.getMaxIa35()); - dataHarmphasicI.setI36Max(messageDataI.getMaxIa36()); - dataHarmphasicI.setI37Max(messageDataI.getMaxIa37()); - dataHarmphasicI.setI38Max(messageDataI.getMaxIa38()); - dataHarmphasicI.setI39Max(messageDataI.getMaxIa39()); - dataHarmphasicI.setI40Max(messageDataI.getMaxIa40()); - dataHarmphasicI.setI41Max(messageDataI.getMaxIa41()); - dataHarmphasicI.setI42Max(messageDataI.getMaxIa42()); - dataHarmphasicI.setI43Max(messageDataI.getMaxIa43()); - dataHarmphasicI.setI44Max(messageDataI.getMaxIa44()); - dataHarmphasicI.setI45Max(messageDataI.getMaxIa45()); - dataHarmphasicI.setI46Max(messageDataI.getMaxIa46()); - dataHarmphasicI.setI47Max(messageDataI.getMaxIa47()); - dataHarmphasicI.setI48Max(messageDataI.getMaxIa48()); - dataHarmphasicI.setI49Max(messageDataI.getMaxIa49()); - dataHarmphasicI.setI50Max(messageDataI.getMaxIa50()); + dataHarmphasicI.setI1Max( adjustPhase(messageDataI.getMaxIfundAngle())); + dataHarmphasicI.setI2Max(adjustPhase(messageDataI.getMaxIa2())); + dataHarmphasicI.setI3Max(adjustPhase(messageDataI.getMaxIa3())); + dataHarmphasicI.setI4Max(adjustPhase(messageDataI.getMaxIa4())); + dataHarmphasicI.setI5Max(adjustPhase(messageDataI.getMaxIa5())); + dataHarmphasicI.setI6Max(adjustPhase(messageDataI.getMaxIa6())); + dataHarmphasicI.setI7Max(adjustPhase(messageDataI.getMaxIa7())); + dataHarmphasicI.setI8Max(adjustPhase(messageDataI.getMaxIa8())); + dataHarmphasicI.setI9Max(adjustPhase(messageDataI.getMaxIa9())); + dataHarmphasicI.setI10Max(adjustPhase(messageDataI.getMaxIa10())); + dataHarmphasicI.setI11Max(adjustPhase(messageDataI.getMaxIa11())); + dataHarmphasicI.setI12Max(adjustPhase(messageDataI.getMaxIa12())); + dataHarmphasicI.setI13Max(adjustPhase(messageDataI.getMaxIa13())); + dataHarmphasicI.setI14Max(adjustPhase(messageDataI.getMaxIa14())); + dataHarmphasicI.setI15Max(adjustPhase(messageDataI.getMaxIa15())); + dataHarmphasicI.setI16Max(adjustPhase(messageDataI.getMaxIa16())); + dataHarmphasicI.setI17Max(adjustPhase(messageDataI.getMaxIa17())); + dataHarmphasicI.setI18Max(adjustPhase(messageDataI.getMaxIa18())); + dataHarmphasicI.setI19Max(adjustPhase(messageDataI.getMaxIa19())); + dataHarmphasicI.setI20Max(adjustPhase(messageDataI.getMaxIa20())); + dataHarmphasicI.setI21Max(adjustPhase(messageDataI.getMaxIa21())); + dataHarmphasicI.setI22Max(adjustPhase(messageDataI.getMaxIa22())); + dataHarmphasicI.setI23Max(adjustPhase(messageDataI.getMaxIa23())); + dataHarmphasicI.setI24Max(adjustPhase(messageDataI.getMaxIa24())); + dataHarmphasicI.setI25Max(adjustPhase(messageDataI.getMaxIa25())); + dataHarmphasicI.setI26Max(adjustPhase(messageDataI.getMaxIa26())); + dataHarmphasicI.setI27Max(adjustPhase(messageDataI.getMaxIa27())); + dataHarmphasicI.setI28Max(adjustPhase(messageDataI.getMaxIa28())); + dataHarmphasicI.setI29Max(adjustPhase(messageDataI.getMaxIa29())); + dataHarmphasicI.setI30Max(adjustPhase(messageDataI.getMaxIa30())); + dataHarmphasicI.setI31Max(adjustPhase(messageDataI.getMaxIa31())); + dataHarmphasicI.setI32Max(adjustPhase(messageDataI.getMaxIa32())); + dataHarmphasicI.setI33Max(adjustPhase(messageDataI.getMaxIa33())); + dataHarmphasicI.setI34Max(adjustPhase(messageDataI.getMaxIa34())); + dataHarmphasicI.setI35Max(adjustPhase(messageDataI.getMaxIa35())); + dataHarmphasicI.setI36Max(adjustPhase(messageDataI.getMaxIa36())); + dataHarmphasicI.setI37Max(adjustPhase(messageDataI.getMaxIa37())); + dataHarmphasicI.setI38Max(adjustPhase(messageDataI.getMaxIa38())); + dataHarmphasicI.setI39Max(adjustPhase(messageDataI.getMaxIa39())); + dataHarmphasicI.setI40Max(adjustPhase(messageDataI.getMaxIa40())); + dataHarmphasicI.setI41Max(adjustPhase(messageDataI.getMaxIa41())); + dataHarmphasicI.setI42Max(adjustPhase(messageDataI.getMaxIa42())); + dataHarmphasicI.setI43Max(adjustPhase(messageDataI.getMaxIa43())); + dataHarmphasicI.setI44Max(adjustPhase(messageDataI.getMaxIa44())); + dataHarmphasicI.setI45Max(adjustPhase(messageDataI.getMaxIa45())); + dataHarmphasicI.setI46Max(adjustPhase(messageDataI.getMaxIa46())); + dataHarmphasicI.setI47Max(adjustPhase(messageDataI.getMaxIa47())); + dataHarmphasicI.setI48Max(adjustPhase(messageDataI.getMaxIa48())); + dataHarmphasicI.setI49Max(adjustPhase(messageDataI.getMaxIa49())); + dataHarmphasicI.setI50Max(adjustPhase(messageDataI.getMaxIa50())); - dataHarmphasicI.setI1Min(messageDataI.getMinIfundAngle()); - dataHarmphasicI.setI2Min(messageDataI.getMinIa2()); - dataHarmphasicI.setI3Min(messageDataI.getMinIa3()); - dataHarmphasicI.setI4Min(messageDataI.getMinIa4()); - dataHarmphasicI.setI5Min(messageDataI.getMinIa5()); - dataHarmphasicI.setI6Min(messageDataI.getMinIa6()); - dataHarmphasicI.setI7Min(messageDataI.getMinIa7()); - dataHarmphasicI.setI8Min(messageDataI.getMinIa8()); - dataHarmphasicI.setI9Min(messageDataI.getMinIa9()); - dataHarmphasicI.setI10Min(messageDataI.getMinIa10()); - dataHarmphasicI.setI11Min(messageDataI.getMinIa11()); - dataHarmphasicI.setI12Min(messageDataI.getMinIa12()); - dataHarmphasicI.setI13Min(messageDataI.getMinIa13()); - dataHarmphasicI.setI14Min(messageDataI.getMinIa14()); - dataHarmphasicI.setI15Min(messageDataI.getMinIa15()); - dataHarmphasicI.setI16Min(messageDataI.getMinIa16()); - dataHarmphasicI.setI17Min(messageDataI.getMinIa17()); - dataHarmphasicI.setI18Min(messageDataI.getMinIa18()); - dataHarmphasicI.setI19Min(messageDataI.getMinIa19()); - dataHarmphasicI.setI20Min(messageDataI.getMinIa20()); - dataHarmphasicI.setI21Min(messageDataI.getMinIa21()); - dataHarmphasicI.setI22Min(messageDataI.getMinIa22()); - dataHarmphasicI.setI23Min(messageDataI.getMinIa23()); - dataHarmphasicI.setI24Min(messageDataI.getMinIa24()); - dataHarmphasicI.setI25Min(messageDataI.getMinIa25()); - dataHarmphasicI.setI26Min(messageDataI.getMinIa26()); - dataHarmphasicI.setI27Min(messageDataI.getMinIa27()); - dataHarmphasicI.setI28Min(messageDataI.getMinIa28()); - dataHarmphasicI.setI29Min(messageDataI.getMinIa29()); - dataHarmphasicI.setI30Min(messageDataI.getMinIa30()); - dataHarmphasicI.setI31Min(messageDataI.getMinIa31()); - dataHarmphasicI.setI32Min(messageDataI.getMinIa32()); - dataHarmphasicI.setI33Min(messageDataI.getMinIa33()); - dataHarmphasicI.setI34Min(messageDataI.getMinIa34()); - dataHarmphasicI.setI35Min(messageDataI.getMinIa35()); - dataHarmphasicI.setI36Min(messageDataI.getMinIa36()); - dataHarmphasicI.setI37Min(messageDataI.getMinIa37()); - dataHarmphasicI.setI38Min(messageDataI.getMinIa38()); - dataHarmphasicI.setI39Min(messageDataI.getMinIa39()); - dataHarmphasicI.setI40Min(messageDataI.getMinIa40()); - dataHarmphasicI.setI41Min(messageDataI.getMinIa41()); - dataHarmphasicI.setI42Min(messageDataI.getMinIa42()); - dataHarmphasicI.setI43Min(messageDataI.getMinIa43()); - dataHarmphasicI.setI44Min(messageDataI.getMinIa44()); - dataHarmphasicI.setI45Min(messageDataI.getMinIa45()); - dataHarmphasicI.setI46Min(messageDataI.getMinIa46()); - dataHarmphasicI.setI47Min(messageDataI.getMinIa47()); - dataHarmphasicI.setI48Min(messageDataI.getMinIa48()); - dataHarmphasicI.setI49Min(messageDataI.getMinIa49()); - dataHarmphasicI.setI50Min(messageDataI.getMinIa50()); + dataHarmphasicI.setI1Min(adjustPhase(messageDataI.getMinIfundAngle())); + dataHarmphasicI.setI2Min(adjustPhase(messageDataI.getMinIa2())); + dataHarmphasicI.setI3Min(adjustPhase(messageDataI.getMinIa3())); + dataHarmphasicI.setI4Min(adjustPhase(messageDataI.getMinIa4())); + dataHarmphasicI.setI5Min(adjustPhase(messageDataI.getMinIa5())); + dataHarmphasicI.setI6Min(adjustPhase(messageDataI.getMinIa6())); + dataHarmphasicI.setI7Min(adjustPhase(messageDataI.getMinIa7())); + dataHarmphasicI.setI8Min(adjustPhase(messageDataI.getMinIa8())); + dataHarmphasicI.setI9Min(adjustPhase(messageDataI.getMinIa9())); + dataHarmphasicI.setI10Min(adjustPhase(messageDataI.getMinIa10())); + dataHarmphasicI.setI11Min(adjustPhase(messageDataI.getMinIa11())); + dataHarmphasicI.setI12Min(adjustPhase(messageDataI.getMinIa12())); + dataHarmphasicI.setI13Min(adjustPhase(messageDataI.getMinIa13())); + dataHarmphasicI.setI14Min(adjustPhase(messageDataI.getMinIa14())); + dataHarmphasicI.setI15Min(adjustPhase(messageDataI.getMinIa15())); + dataHarmphasicI.setI16Min(adjustPhase(messageDataI.getMinIa16())); + dataHarmphasicI.setI17Min(adjustPhase(messageDataI.getMinIa17())); + dataHarmphasicI.setI18Min(adjustPhase(messageDataI.getMinIa18())); + dataHarmphasicI.setI19Min(adjustPhase(messageDataI.getMinIa19())); + dataHarmphasicI.setI20Min(adjustPhase(messageDataI.getMinIa20())); + dataHarmphasicI.setI21Min(adjustPhase(messageDataI.getMinIa21())); + dataHarmphasicI.setI22Min(adjustPhase(messageDataI.getMinIa22())); + dataHarmphasicI.setI23Min(adjustPhase(messageDataI.getMinIa23())); + dataHarmphasicI.setI24Min(adjustPhase(messageDataI.getMinIa24())); + dataHarmphasicI.setI25Min(adjustPhase(messageDataI.getMinIa25())); + dataHarmphasicI.setI26Min(adjustPhase(messageDataI.getMinIa26())); + dataHarmphasicI.setI27Min(adjustPhase(messageDataI.getMinIa27())); + dataHarmphasicI.setI28Min(adjustPhase(messageDataI.getMinIa28())); + dataHarmphasicI.setI29Min(adjustPhase(messageDataI.getMinIa29())); + dataHarmphasicI.setI30Min(adjustPhase(messageDataI.getMinIa30())); + dataHarmphasicI.setI31Min(adjustPhase(messageDataI.getMinIa31())); + dataHarmphasicI.setI32Min(adjustPhase(messageDataI.getMinIa32())); + dataHarmphasicI.setI33Min(adjustPhase(messageDataI.getMinIa33())); + dataHarmphasicI.setI34Min(adjustPhase(messageDataI.getMinIa34())); + dataHarmphasicI.setI35Min(adjustPhase(messageDataI.getMinIa35())); + dataHarmphasicI.setI36Min(adjustPhase(messageDataI.getMinIa36())); + dataHarmphasicI.setI37Min(adjustPhase(messageDataI.getMinIa37())); + dataHarmphasicI.setI38Min(adjustPhase(messageDataI.getMinIa38())); + dataHarmphasicI.setI39Min(adjustPhase(messageDataI.getMinIa39())); + dataHarmphasicI.setI40Min(adjustPhase(messageDataI.getMinIa40())); + dataHarmphasicI.setI41Min(adjustPhase(messageDataI.getMinIa41())); + dataHarmphasicI.setI42Min(adjustPhase(messageDataI.getMinIa42())); + dataHarmphasicI.setI43Min(adjustPhase(messageDataI.getMinIa43())); + dataHarmphasicI.setI44Min(adjustPhase(messageDataI.getMinIa44())); + dataHarmphasicI.setI45Min(adjustPhase(messageDataI.getMinIa45())); + dataHarmphasicI.setI46Min(adjustPhase(messageDataI.getMinIa46())); + dataHarmphasicI.setI47Min(adjustPhase(messageDataI.getMinIa47())); + dataHarmphasicI.setI48Min(adjustPhase(messageDataI.getMinIa48())); + dataHarmphasicI.setI49Min(adjustPhase(messageDataI.getMinIa49())); + dataHarmphasicI.setI50Min(adjustPhase(messageDataI.getMinIa50())); - dataHarmphasicI.setI1Cp95(messageDataI.getGIfundAngle()); - dataHarmphasicI.setI2Cp95(messageDataI.getGIa2()); - dataHarmphasicI.setI3Cp95(messageDataI.getGIa3()); - dataHarmphasicI.setI4Cp95(messageDataI.getGIa4()); - dataHarmphasicI.setI5Cp95(messageDataI.getGIa5()); - dataHarmphasicI.setI6Cp95(messageDataI.getGIa6()); - dataHarmphasicI.setI7Cp95(messageDataI.getGIa7()); - dataHarmphasicI.setI8Cp95(messageDataI.getGIa8()); - dataHarmphasicI.setI9Cp95(messageDataI.getGIa9()); - dataHarmphasicI.setI10Cp95(messageDataI.getGIa10()); - dataHarmphasicI.setI11Cp95(messageDataI.getGIa11()); - dataHarmphasicI.setI12Cp95(messageDataI.getGIa12()); - dataHarmphasicI.setI13Cp95(messageDataI.getGIa13()); - dataHarmphasicI.setI14Cp95(messageDataI.getGIa14()); - dataHarmphasicI.setI15Cp95(messageDataI.getGIa15()); - dataHarmphasicI.setI16Cp95(messageDataI.getGIa16()); - dataHarmphasicI.setI17Cp95(messageDataI.getGIa17()); - dataHarmphasicI.setI18Cp95(messageDataI.getGIa18()); - dataHarmphasicI.setI19Cp95(messageDataI.getGIa19()); - dataHarmphasicI.setI20Cp95(messageDataI.getGIa20()); - dataHarmphasicI.setI21Cp95(messageDataI.getGIa21()); - dataHarmphasicI.setI22Cp95(messageDataI.getGIa22()); - dataHarmphasicI.setI23Cp95(messageDataI.getGIa23()); - dataHarmphasicI.setI24Cp95(messageDataI.getGIa24()); - dataHarmphasicI.setI25Cp95(messageDataI.getGIa25()); - dataHarmphasicI.setI26Cp95(messageDataI.getGIa26()); - dataHarmphasicI.setI27Cp95(messageDataI.getGIa27()); - dataHarmphasicI.setI28Cp95(messageDataI.getGIa28()); - dataHarmphasicI.setI29Cp95(messageDataI.getGIa29()); - dataHarmphasicI.setI30Cp95(messageDataI.getGIa30()); - dataHarmphasicI.setI31Cp95(messageDataI.getGIa31()); - dataHarmphasicI.setI32Cp95(messageDataI.getGIa32()); - dataHarmphasicI.setI33Cp95(messageDataI.getGIa33()); - dataHarmphasicI.setI34Cp95(messageDataI.getGIa34()); - dataHarmphasicI.setI35Cp95(messageDataI.getGIa35()); - dataHarmphasicI.setI36Cp95(messageDataI.getGIa36()); - dataHarmphasicI.setI37Cp95(messageDataI.getGIa37()); - dataHarmphasicI.setI38Cp95(messageDataI.getGIa38()); - dataHarmphasicI.setI39Cp95(messageDataI.getGIa39()); - dataHarmphasicI.setI40Cp95(messageDataI.getGIa40()); - dataHarmphasicI.setI41Cp95(messageDataI.getGIa41()); - dataHarmphasicI.setI42Cp95(messageDataI.getGIa42()); - dataHarmphasicI.setI43Cp95(messageDataI.getGIa43()); - dataHarmphasicI.setI44Cp95(messageDataI.getGIa44()); - dataHarmphasicI.setI45Cp95(messageDataI.getGIa45()); - dataHarmphasicI.setI46Cp95(messageDataI.getGIa46()); - dataHarmphasicI.setI47Cp95(messageDataI.getGIa47()); - dataHarmphasicI.setI48Cp95(messageDataI.getGIa48()); - dataHarmphasicI.setI49Cp95(messageDataI.getGIa49()); - dataHarmphasicI.setI50Cp95(messageDataI.getGIa50()); + dataHarmphasicI.setI1Cp95(adjustPhase(messageDataI.getGIfundAngle())); + dataHarmphasicI.setI2Cp95(adjustPhase(messageDataI.getGIa2())); + dataHarmphasicI.setI3Cp95(adjustPhase(messageDataI.getGIa3())); + dataHarmphasicI.setI4Cp95(adjustPhase(messageDataI.getGIa4())); + dataHarmphasicI.setI5Cp95(adjustPhase(messageDataI.getGIa5())); + dataHarmphasicI.setI6Cp95(adjustPhase(messageDataI.getGIa6())); + dataHarmphasicI.setI7Cp95(adjustPhase(messageDataI.getGIa7())); + dataHarmphasicI.setI8Cp95(adjustPhase(messageDataI.getGIa8())); + dataHarmphasicI.setI9Cp95(adjustPhase(messageDataI.getGIa9())); + dataHarmphasicI.setI10Cp95(adjustPhase(messageDataI.getGIa10())); + dataHarmphasicI.setI11Cp95(adjustPhase(messageDataI.getGIa11())); + dataHarmphasicI.setI12Cp95(adjustPhase(messageDataI.getGIa12())); + dataHarmphasicI.setI13Cp95(adjustPhase(messageDataI.getGIa13())); + dataHarmphasicI.setI14Cp95(adjustPhase(messageDataI.getGIa14())); + dataHarmphasicI.setI15Cp95(adjustPhase(messageDataI.getGIa15())); + dataHarmphasicI.setI16Cp95(adjustPhase(messageDataI.getGIa16())); + dataHarmphasicI.setI17Cp95(adjustPhase(messageDataI.getGIa17())); + dataHarmphasicI.setI18Cp95(adjustPhase(messageDataI.getGIa18())); + dataHarmphasicI.setI19Cp95(adjustPhase(messageDataI.getGIa19())); + dataHarmphasicI.setI20Cp95(adjustPhase(messageDataI.getGIa20())); + dataHarmphasicI.setI21Cp95(adjustPhase(messageDataI.getGIa21())); + dataHarmphasicI.setI22Cp95(adjustPhase(messageDataI.getGIa22())); + dataHarmphasicI.setI23Cp95(adjustPhase(messageDataI.getGIa23())); + dataHarmphasicI.setI24Cp95(adjustPhase(messageDataI.getGIa24())); + dataHarmphasicI.setI25Cp95(adjustPhase(messageDataI.getGIa25())); + dataHarmphasicI.setI26Cp95(adjustPhase(messageDataI.getGIa26())); + dataHarmphasicI.setI27Cp95(adjustPhase(messageDataI.getGIa27())); + dataHarmphasicI.setI28Cp95(adjustPhase(messageDataI.getGIa28())); + dataHarmphasicI.setI29Cp95(adjustPhase(messageDataI.getGIa29())); + dataHarmphasicI.setI30Cp95(adjustPhase(messageDataI.getGIa30())); + dataHarmphasicI.setI31Cp95(adjustPhase(messageDataI.getGIa31())); + dataHarmphasicI.setI32Cp95(adjustPhase(messageDataI.getGIa32())); + dataHarmphasicI.setI33Cp95(adjustPhase(messageDataI.getGIa33())); + dataHarmphasicI.setI34Cp95(adjustPhase(messageDataI.getGIa34())); + dataHarmphasicI.setI35Cp95(adjustPhase(messageDataI.getGIa35())); + dataHarmphasicI.setI36Cp95(adjustPhase(messageDataI.getGIa36())); + dataHarmphasicI.setI37Cp95(adjustPhase(messageDataI.getGIa37())); + dataHarmphasicI.setI38Cp95(adjustPhase(messageDataI.getGIa38())); + dataHarmphasicI.setI39Cp95(adjustPhase(messageDataI.getGIa39())); + dataHarmphasicI.setI40Cp95(adjustPhase(messageDataI.getGIa40())); + dataHarmphasicI.setI41Cp95(adjustPhase(messageDataI.getGIa41())); + dataHarmphasicI.setI42Cp95(adjustPhase(messageDataI.getGIa42())); + dataHarmphasicI.setI43Cp95(adjustPhase(messageDataI.getGIa43())); + dataHarmphasicI.setI44Cp95(adjustPhase(messageDataI.getGIa44())); + dataHarmphasicI.setI45Cp95(adjustPhase(messageDataI.getGIa45())); + dataHarmphasicI.setI46Cp95(adjustPhase(messageDataI.getGIa46())); + dataHarmphasicI.setI47Cp95(adjustPhase(messageDataI.getGIa47())); + dataHarmphasicI.setI48Cp95(adjustPhase(messageDataI.getGIa48())); + dataHarmphasicI.setI49Cp95(adjustPhase(messageDataI.getGIa49())); + dataHarmphasicI.setI50Cp95(adjustPhase(messageDataI.getGIa50())); } return dataHarmphasicI; diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java index c4c6d89..73de847 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java @@ -19,6 +19,28 @@ import java.util.Objects; * @version V1.0.0 */ public class BeanVConverter { + /** + * 角度相关常量 + */ + private static final double ANGLE_180 = 180.0; + private static final double ANGLE_360 = 360.0; + private static final double ANGLE_MINUS_180 = -180.0; + + public static Double adjustPhase(Double phase) { + if (phase == null) { + return null; + } + // 使用模运算将角度标准化到[-180, 180]范围 + double normalizedPhase = phase % ANGLE_360; + // 处理超出[-180, 180]范围的情况 + if (normalizedPhase > ANGLE_180) { + normalizedPhase -= ANGLE_360; + } else if (normalizedPhase < ANGLE_MINUS_180) { + normalizedPhase += ANGLE_360; + } + + return normalizedPhase; + } //A,B,C三项 public static DataVDTO messageDataVTODataV(MessageDataV messageDataV){ DataVDTO dataVRelation = new DataVDTO(); @@ -561,209 +583,209 @@ public class BeanVConverter { public static DataHarmphasicVDTO messageDataVTODataHarmphasicV(MessageDataV messageDataV){ DataHarmphasicVDTO dataHarmphasicV = new DataHarmphasicVDTO(); if (Objects.nonNull(messageDataV)){ - dataHarmphasicV.setV1(messageDataV.getVfundAngle()); - dataHarmphasicV.setV2(messageDataV.getVa2()); - dataHarmphasicV.setV3(messageDataV.getVa3()); - dataHarmphasicV.setV4(messageDataV.getVa4()); - dataHarmphasicV.setV5(messageDataV.getVa5()); - dataHarmphasicV.setV6(messageDataV.getVa6()); - dataHarmphasicV.setV7(messageDataV.getVa7()); - dataHarmphasicV.setV8(messageDataV.getVa8()); - dataHarmphasicV.setV9(messageDataV.getVa9()); - dataHarmphasicV.setV10(messageDataV.getVa10()); - dataHarmphasicV.setV11(messageDataV.getVa11()); - dataHarmphasicV.setV12(messageDataV.getVa12()); - dataHarmphasicV.setV13(messageDataV.getVa13()); - dataHarmphasicV.setV14(messageDataV.getVa14()); - dataHarmphasicV.setV15(messageDataV.getVa15()); - dataHarmphasicV.setV16(messageDataV.getVa16()); - dataHarmphasicV.setV17(messageDataV.getVa17()); - dataHarmphasicV.setV18(messageDataV.getVa18()); - dataHarmphasicV.setV19(messageDataV.getVa19()); - dataHarmphasicV.setV20(messageDataV.getVa20()); - dataHarmphasicV.setV21(messageDataV.getVa21()); - dataHarmphasicV.setV22(messageDataV.getVa22()); - dataHarmphasicV.setV23(messageDataV.getVa23()); - dataHarmphasicV.setV24(messageDataV.getVa24()); - dataHarmphasicV.setV25(messageDataV.getVa25()); - dataHarmphasicV.setV26(messageDataV.getVa26()); - dataHarmphasicV.setV27(messageDataV.getVa27()); - dataHarmphasicV.setV28(messageDataV.getVa28()); - dataHarmphasicV.setV29(messageDataV.getVa29()); - dataHarmphasicV.setV30(messageDataV.getVa30()); - dataHarmphasicV.setV31(messageDataV.getVa31()); - dataHarmphasicV.setV32(messageDataV.getVa32()); - dataHarmphasicV.setV33(messageDataV.getVa33()); - dataHarmphasicV.setV34(messageDataV.getVa34()); - dataHarmphasicV.setV35(messageDataV.getVa35()); - dataHarmphasicV.setV36(messageDataV.getVa36()); - dataHarmphasicV.setV37(messageDataV.getVa37()); - dataHarmphasicV.setV38(messageDataV.getVa38()); - dataHarmphasicV.setV39(messageDataV.getVa39()); - dataHarmphasicV.setV40(messageDataV.getVa40()); - dataHarmphasicV.setV41(messageDataV.getVa41()); - dataHarmphasicV.setV42(messageDataV.getVa42()); - dataHarmphasicV.setV43(messageDataV.getVa43()); - dataHarmphasicV.setV44(messageDataV.getVa44()); - dataHarmphasicV.setV45(messageDataV.getVa45()); - dataHarmphasicV.setV46(messageDataV.getVa46()); - dataHarmphasicV.setV47(messageDataV.getVa47()); - dataHarmphasicV.setV48(messageDataV.getVa48()); - dataHarmphasicV.setV49(messageDataV.getVa49()); - dataHarmphasicV.setV50(messageDataV.getVa50()); + dataHarmphasicV.setV1(adjustPhase(messageDataV.getVfundAngle())); + dataHarmphasicV.setV2(adjustPhase(messageDataV.getVa2())); + dataHarmphasicV.setV3(adjustPhase(messageDataV.getVa3())); + dataHarmphasicV.setV4(adjustPhase(messageDataV.getVa4())); + dataHarmphasicV.setV5(adjustPhase(messageDataV.getVa5())); + dataHarmphasicV.setV6(adjustPhase(messageDataV.getVa6())); + dataHarmphasicV.setV7(adjustPhase(messageDataV.getVa7())); + dataHarmphasicV.setV8(adjustPhase(messageDataV.getVa8())); + dataHarmphasicV.setV9(adjustPhase(messageDataV.getVa9())); + dataHarmphasicV.setV10(adjustPhase(messageDataV.getVa10())); + dataHarmphasicV.setV11(adjustPhase(messageDataV.getVa11())); + dataHarmphasicV.setV12(adjustPhase(messageDataV.getVa12())); + dataHarmphasicV.setV13(adjustPhase(messageDataV.getVa13())); + dataHarmphasicV.setV14(adjustPhase(messageDataV.getVa14())); + dataHarmphasicV.setV15(adjustPhase(messageDataV.getVa15())); + dataHarmphasicV.setV16(adjustPhase(messageDataV.getVa16())); + dataHarmphasicV.setV17(adjustPhase(messageDataV.getVa17())); + dataHarmphasicV.setV18(adjustPhase(messageDataV.getVa18())); + dataHarmphasicV.setV19(adjustPhase(messageDataV.getVa19())); + dataHarmphasicV.setV20(adjustPhase(messageDataV.getVa20())); + dataHarmphasicV.setV21(adjustPhase(messageDataV.getVa21())); + dataHarmphasicV.setV22(adjustPhase(messageDataV.getVa22())); + dataHarmphasicV.setV23(adjustPhase(messageDataV.getVa23())); + dataHarmphasicV.setV24(adjustPhase(messageDataV.getVa24())); + dataHarmphasicV.setV25(adjustPhase(messageDataV.getVa25())); + dataHarmphasicV.setV26(adjustPhase(messageDataV.getVa26())); + dataHarmphasicV.setV27(adjustPhase(messageDataV.getVa27())); + dataHarmphasicV.setV28(adjustPhase(messageDataV.getVa28())); + dataHarmphasicV.setV29(adjustPhase(messageDataV.getVa29())); + dataHarmphasicV.setV30(adjustPhase(messageDataV.getVa30())); + dataHarmphasicV.setV31(adjustPhase(messageDataV.getVa31())); + dataHarmphasicV.setV32(adjustPhase(messageDataV.getVa32())); + dataHarmphasicV.setV33(adjustPhase(messageDataV.getVa33())); + dataHarmphasicV.setV34(adjustPhase(messageDataV.getVa34())); + dataHarmphasicV.setV35(adjustPhase(messageDataV.getVa35())); + dataHarmphasicV.setV36(adjustPhase(messageDataV.getVa36())); + dataHarmphasicV.setV37(adjustPhase(messageDataV.getVa37())); + dataHarmphasicV.setV38(adjustPhase(messageDataV.getVa38())); + dataHarmphasicV.setV39(adjustPhase(messageDataV.getVa39())); + dataHarmphasicV.setV40(adjustPhase(messageDataV.getVa40())); + dataHarmphasicV.setV41(adjustPhase(messageDataV.getVa41())); + dataHarmphasicV.setV42(adjustPhase(messageDataV.getVa42())); + dataHarmphasicV.setV43(adjustPhase(messageDataV.getVa43())); + dataHarmphasicV.setV44(adjustPhase(messageDataV.getVa44())); + dataHarmphasicV.setV45(adjustPhase(messageDataV.getVa45())); + dataHarmphasicV.setV46(adjustPhase(messageDataV.getVa46())); + dataHarmphasicV.setV47(adjustPhase(messageDataV.getVa47())); + dataHarmphasicV.setV48(adjustPhase(messageDataV.getVa48())); + dataHarmphasicV.setV49(adjustPhase(messageDataV.getVa49())); + dataHarmphasicV.setV50(adjustPhase(messageDataV.getVa50())); - dataHarmphasicV.setV1Max(messageDataV.getMaxVfundAngle()); - dataHarmphasicV.setV2Max(messageDataV.getMaxVa2()); - dataHarmphasicV.setV3Max(messageDataV.getMaxVa3()); - dataHarmphasicV.setV4Max(messageDataV.getMaxVa4()); - dataHarmphasicV.setV5Max(messageDataV.getMaxVa5()); - dataHarmphasicV.setV6Max(messageDataV.getMaxVa6()); - dataHarmphasicV.setV7Max(messageDataV.getMaxVa7()); - dataHarmphasicV.setV8Max(messageDataV.getMaxVa8()); - dataHarmphasicV.setV9Max(messageDataV.getMaxVa9()); - dataHarmphasicV.setV10Max(messageDataV.getMaxVa10()); - dataHarmphasicV.setV11Max(messageDataV.getMaxVa11()); - dataHarmphasicV.setV12Max(messageDataV.getMaxVa12()); - dataHarmphasicV.setV13Max(messageDataV.getMaxVa13()); - dataHarmphasicV.setV14Max(messageDataV.getMaxVa14()); - dataHarmphasicV.setV15Max(messageDataV.getMaxVa15()); - dataHarmphasicV.setV16Max(messageDataV.getMaxVa16()); - dataHarmphasicV.setV17Max(messageDataV.getMaxVa17()); - dataHarmphasicV.setV18Max(messageDataV.getMaxVa18()); - dataHarmphasicV.setV19Max(messageDataV.getMaxVa19()); - dataHarmphasicV.setV20Max(messageDataV.getMaxVa20()); - dataHarmphasicV.setV21Max(messageDataV.getMaxVa21()); - dataHarmphasicV.setV22Max(messageDataV.getMaxVa22()); - dataHarmphasicV.setV23Max(messageDataV.getMaxVa23()); - dataHarmphasicV.setV24Max(messageDataV.getMaxVa24()); - dataHarmphasicV.setV25Max(messageDataV.getMaxVa25()); - dataHarmphasicV.setV26Max(messageDataV.getMaxVa26()); - dataHarmphasicV.setV27Max(messageDataV.getMaxVa27()); - dataHarmphasicV.setV28Max(messageDataV.getMaxVa28()); - dataHarmphasicV.setV29Max(messageDataV.getMaxVa29()); - dataHarmphasicV.setV30Max(messageDataV.getMaxVa30()); - dataHarmphasicV.setV31Max(messageDataV.getMaxVa31()); - dataHarmphasicV.setV32Max(messageDataV.getMaxVa32()); - dataHarmphasicV.setV33Max(messageDataV.getMaxVa33()); - dataHarmphasicV.setV34Max(messageDataV.getMaxVa34()); - dataHarmphasicV.setV35Max(messageDataV.getMaxVa35()); - dataHarmphasicV.setV36Max(messageDataV.getMaxVa36()); - dataHarmphasicV.setV37Max(messageDataV.getMaxVa37()); - dataHarmphasicV.setV38Max(messageDataV.getMaxVa38()); - dataHarmphasicV.setV39Max(messageDataV.getMaxVa39()); - dataHarmphasicV.setV40Max(messageDataV.getMaxVa40()); - dataHarmphasicV.setV41Max(messageDataV.getMaxVa41()); - dataHarmphasicV.setV42Max(messageDataV.getMaxVa42()); - dataHarmphasicV.setV43Max(messageDataV.getMaxVa43()); - dataHarmphasicV.setV44Max(messageDataV.getMaxVa44()); - dataHarmphasicV.setV45Max(messageDataV.getMaxVa45()); - dataHarmphasicV.setV46Max(messageDataV.getMaxVa46()); - dataHarmphasicV.setV47Max(messageDataV.getMaxVa47()); - dataHarmphasicV.setV48Max(messageDataV.getMaxVa48()); - dataHarmphasicV.setV49Max(messageDataV.getMaxVa49()); - dataHarmphasicV.setV50Max(messageDataV.getMaxVa50()); + dataHarmphasicV.setV1Max(adjustPhase(messageDataV.getMaxVfundAngle())); + dataHarmphasicV.setV2Max(adjustPhase(messageDataV.getMaxVa2())); + dataHarmphasicV.setV3Max(adjustPhase(messageDataV.getMaxVa3())); + dataHarmphasicV.setV4Max(adjustPhase(messageDataV.getMaxVa4())); + dataHarmphasicV.setV5Max(adjustPhase(messageDataV.getMaxVa5())); + dataHarmphasicV.setV6Max(adjustPhase(messageDataV.getMaxVa6())); + dataHarmphasicV.setV7Max(adjustPhase(messageDataV.getMaxVa7())); + dataHarmphasicV.setV8Max(adjustPhase(messageDataV.getMaxVa8())); + dataHarmphasicV.setV9Max(adjustPhase(messageDataV.getMaxVa9())); + dataHarmphasicV.setV10Max(adjustPhase(messageDataV.getMaxVa10())); + dataHarmphasicV.setV11Max(adjustPhase(messageDataV.getMaxVa11())); + dataHarmphasicV.setV12Max(adjustPhase(messageDataV.getMaxVa12())); + dataHarmphasicV.setV13Max(adjustPhase(messageDataV.getMaxVa13())); + dataHarmphasicV.setV14Max(adjustPhase(messageDataV.getMaxVa14())); + dataHarmphasicV.setV15Max(adjustPhase(messageDataV.getMaxVa15())); + dataHarmphasicV.setV16Max(adjustPhase(messageDataV.getMaxVa16())); + dataHarmphasicV.setV17Max(adjustPhase(messageDataV.getMaxVa17())); + dataHarmphasicV.setV18Max(adjustPhase(messageDataV.getMaxVa18())); + dataHarmphasicV.setV19Max(adjustPhase(messageDataV.getMaxVa19())); + dataHarmphasicV.setV20Max(adjustPhase(messageDataV.getMaxVa20())); + dataHarmphasicV.setV21Max(adjustPhase(messageDataV.getMaxVa21())); + dataHarmphasicV.setV22Max(adjustPhase(messageDataV.getMaxVa22())); + dataHarmphasicV.setV23Max(adjustPhase(messageDataV.getMaxVa23())); + dataHarmphasicV.setV24Max(adjustPhase(messageDataV.getMaxVa24())); + dataHarmphasicV.setV25Max(adjustPhase(messageDataV.getMaxVa25())); + dataHarmphasicV.setV26Max(adjustPhase(messageDataV.getMaxVa26())); + dataHarmphasicV.setV27Max(adjustPhase(messageDataV.getMaxVa27())); + dataHarmphasicV.setV28Max(adjustPhase(messageDataV.getMaxVa28())); + dataHarmphasicV.setV29Max(adjustPhase(messageDataV.getMaxVa29())); + dataHarmphasicV.setV30Max(adjustPhase(messageDataV.getMaxVa30())); + dataHarmphasicV.setV31Max(adjustPhase(messageDataV.getMaxVa31())); + dataHarmphasicV.setV32Max(adjustPhase(messageDataV.getMaxVa32())); + dataHarmphasicV.setV33Max(adjustPhase(messageDataV.getMaxVa33())); + dataHarmphasicV.setV34Max(adjustPhase(messageDataV.getMaxVa34())); + dataHarmphasicV.setV35Max(adjustPhase(messageDataV.getMaxVa35())); + dataHarmphasicV.setV36Max(adjustPhase(messageDataV.getMaxVa36())); + dataHarmphasicV.setV37Max(adjustPhase(messageDataV.getMaxVa37())); + dataHarmphasicV.setV38Max(adjustPhase(messageDataV.getMaxVa38())); + dataHarmphasicV.setV39Max(adjustPhase(messageDataV.getMaxVa39())); + dataHarmphasicV.setV40Max(adjustPhase(messageDataV.getMaxVa40())); + dataHarmphasicV.setV41Max(adjustPhase(messageDataV.getMaxVa41())); + dataHarmphasicV.setV42Max(adjustPhase(messageDataV.getMaxVa42())); + dataHarmphasicV.setV43Max(adjustPhase(messageDataV.getMaxVa43())); + dataHarmphasicV.setV44Max(adjustPhase(messageDataV.getMaxVa44())); + dataHarmphasicV.setV45Max(adjustPhase(messageDataV.getMaxVa45())); + dataHarmphasicV.setV46Max(adjustPhase(messageDataV.getMaxVa46())); + dataHarmphasicV.setV47Max(adjustPhase(messageDataV.getMaxVa47())); + dataHarmphasicV.setV48Max(adjustPhase(messageDataV.getMaxVa48())); + dataHarmphasicV.setV49Max(adjustPhase(messageDataV.getMaxVa49())); + dataHarmphasicV.setV50Max(adjustPhase(messageDataV.getMaxVa50())); - dataHarmphasicV.setV1Min(messageDataV.getMinVfundAngle()); - dataHarmphasicV.setV2Min(messageDataV.getMinVa2()); - dataHarmphasicV.setV3Min(messageDataV.getMinVa3()); - dataHarmphasicV.setV4Min(messageDataV.getMinVa4()); - dataHarmphasicV.setV5Min(messageDataV.getMinVa5()); - dataHarmphasicV.setV6Min(messageDataV.getMinVa6()); - dataHarmphasicV.setV7Min(messageDataV.getMinVa7()); - dataHarmphasicV.setV8Min(messageDataV.getMinVa8()); - dataHarmphasicV.setV9Min(messageDataV.getMinVa9()); - dataHarmphasicV.setV10Min(messageDataV.getMinVa10()); - dataHarmphasicV.setV11Min(messageDataV.getMinVa11()); - dataHarmphasicV.setV12Min(messageDataV.getMinVa12()); - dataHarmphasicV.setV13Min(messageDataV.getMinVa13()); - dataHarmphasicV.setV14Min(messageDataV.getMinVa14()); - dataHarmphasicV.setV15Min(messageDataV.getMinVa15()); - dataHarmphasicV.setV16Min(messageDataV.getMinVa16()); - dataHarmphasicV.setV17Min(messageDataV.getMinVa17()); - dataHarmphasicV.setV18Min(messageDataV.getMinVa18()); - dataHarmphasicV.setV19Min(messageDataV.getMinVa19()); - dataHarmphasicV.setV20Min(messageDataV.getMinVa20()); - dataHarmphasicV.setV21Min(messageDataV.getMinVa21()); - dataHarmphasicV.setV22Min(messageDataV.getMinVa22()); - dataHarmphasicV.setV23Min(messageDataV.getMinVa23()); - dataHarmphasicV.setV24Min(messageDataV.getMinVa24()); - dataHarmphasicV.setV25Min(messageDataV.getMinVa25()); - dataHarmphasicV.setV26Min(messageDataV.getMinVa26()); - dataHarmphasicV.setV27Min(messageDataV.getMinVa27()); - dataHarmphasicV.setV28Min(messageDataV.getMinVa28()); - dataHarmphasicV.setV29Min(messageDataV.getMinVa29()); - dataHarmphasicV.setV30Min(messageDataV.getMinVa30()); - dataHarmphasicV.setV31Min(messageDataV.getMinVa31()); - dataHarmphasicV.setV32Min(messageDataV.getMinVa32()); - dataHarmphasicV.setV33Min(messageDataV.getMinVa33()); - dataHarmphasicV.setV34Min(messageDataV.getMinVa34()); - dataHarmphasicV.setV35Min(messageDataV.getMinVa35()); - dataHarmphasicV.setV36Min(messageDataV.getMinVa36()); - dataHarmphasicV.setV37Min(messageDataV.getMinVa37()); - dataHarmphasicV.setV38Min(messageDataV.getMinVa38()); - dataHarmphasicV.setV39Min(messageDataV.getMinVa39()); - dataHarmphasicV.setV40Min(messageDataV.getMinVa40()); - dataHarmphasicV.setV41Min(messageDataV.getMinVa41()); - dataHarmphasicV.setV42Min(messageDataV.getMinVa42()); - dataHarmphasicV.setV43Min(messageDataV.getMinVa43()); - dataHarmphasicV.setV44Min(messageDataV.getMinVa44()); - dataHarmphasicV.setV45Min(messageDataV.getMinVa45()); - dataHarmphasicV.setV46Min(messageDataV.getMinVa46()); - dataHarmphasicV.setV47Min(messageDataV.getMinVa47()); - dataHarmphasicV.setV48Min(messageDataV.getMinVa48()); - dataHarmphasicV.setV49Min(messageDataV.getMinVa49()); - dataHarmphasicV.setV50Min(messageDataV.getMinVa50()); + dataHarmphasicV.setV1Min(adjustPhase(messageDataV.getMinVfundAngle())); + dataHarmphasicV.setV2Min(adjustPhase(messageDataV.getMinVa2())); + dataHarmphasicV.setV3Min(adjustPhase(messageDataV.getMinVa3())); + dataHarmphasicV.setV4Min(adjustPhase(messageDataV.getMinVa4())); + dataHarmphasicV.setV5Min(adjustPhase(messageDataV.getMinVa5())); + dataHarmphasicV.setV6Min(adjustPhase(messageDataV.getMinVa6())); + dataHarmphasicV.setV7Min(adjustPhase(messageDataV.getMinVa7())); + dataHarmphasicV.setV8Min(adjustPhase(messageDataV.getMinVa8())); + dataHarmphasicV.setV9Min(adjustPhase(messageDataV.getMinVa9())); + dataHarmphasicV.setV10Min(adjustPhase(messageDataV.getMinVa10())); + dataHarmphasicV.setV11Min(adjustPhase(messageDataV.getMinVa11())); + dataHarmphasicV.setV12Min(adjustPhase(messageDataV.getMinVa12())); + dataHarmphasicV.setV13Min(adjustPhase(messageDataV.getMinVa13())); + dataHarmphasicV.setV14Min(adjustPhase(messageDataV.getMinVa14())); + dataHarmphasicV.setV15Min(adjustPhase(messageDataV.getMinVa15())); + dataHarmphasicV.setV16Min(adjustPhase(messageDataV.getMinVa16())); + dataHarmphasicV.setV17Min(adjustPhase(messageDataV.getMinVa17())); + dataHarmphasicV.setV18Min(adjustPhase(messageDataV.getMinVa18())); + dataHarmphasicV.setV19Min(adjustPhase(messageDataV.getMinVa19())); + dataHarmphasicV.setV20Min(adjustPhase(messageDataV.getMinVa20())); + dataHarmphasicV.setV21Min(adjustPhase(messageDataV.getMinVa21())); + dataHarmphasicV.setV22Min(adjustPhase(messageDataV.getMinVa22())); + dataHarmphasicV.setV23Min(adjustPhase(messageDataV.getMinVa23())); + dataHarmphasicV.setV24Min(adjustPhase(messageDataV.getMinVa24())); + dataHarmphasicV.setV25Min(adjustPhase(messageDataV.getMinVa25())); + dataHarmphasicV.setV26Min(adjustPhase(messageDataV.getMinVa26())); + dataHarmphasicV.setV27Min(adjustPhase(messageDataV.getMinVa27())); + dataHarmphasicV.setV28Min(adjustPhase(messageDataV.getMinVa28())); + dataHarmphasicV.setV29Min(adjustPhase(messageDataV.getMinVa29())); + dataHarmphasicV.setV30Min(adjustPhase(messageDataV.getMinVa30())); + dataHarmphasicV.setV31Min(adjustPhase(messageDataV.getMinVa31())); + dataHarmphasicV.setV32Min(adjustPhase(messageDataV.getMinVa32())); + dataHarmphasicV.setV33Min(adjustPhase(messageDataV.getMinVa33())); + dataHarmphasicV.setV34Min(adjustPhase(messageDataV.getMinVa34())); + dataHarmphasicV.setV35Min(adjustPhase(messageDataV.getMinVa35())); + dataHarmphasicV.setV36Min(adjustPhase(messageDataV.getMinVa36())); + dataHarmphasicV.setV37Min(adjustPhase(messageDataV.getMinVa37())); + dataHarmphasicV.setV38Min(adjustPhase(messageDataV.getMinVa38())); + dataHarmphasicV.setV39Min(adjustPhase(messageDataV.getMinVa39())); + dataHarmphasicV.setV40Min(adjustPhase(messageDataV.getMinVa40())); + dataHarmphasicV.setV41Min(adjustPhase(messageDataV.getMinVa41())); + dataHarmphasicV.setV42Min(adjustPhase(messageDataV.getMinVa42())); + dataHarmphasicV.setV43Min(adjustPhase(messageDataV.getMinVa43())); + dataHarmphasicV.setV44Min(adjustPhase(messageDataV.getMinVa44())); + dataHarmphasicV.setV45Min(adjustPhase(messageDataV.getMinVa45())); + dataHarmphasicV.setV46Min(adjustPhase(messageDataV.getMinVa46())); + dataHarmphasicV.setV47Min(adjustPhase(messageDataV.getMinVa47())); + dataHarmphasicV.setV48Min(adjustPhase(messageDataV.getMinVa48())); + dataHarmphasicV.setV49Min(adjustPhase(messageDataV.getMinVa49())); + dataHarmphasicV.setV50Min(adjustPhase(messageDataV.getMinVa50())); - dataHarmphasicV.setV1Cp95(messageDataV.getGVfundAngle()); - dataHarmphasicV.setV2Cp95(messageDataV.getGVa2()); - dataHarmphasicV.setV3Cp95(messageDataV.getGVa3()); - dataHarmphasicV.setV4Cp95(messageDataV.getGVa4()); - dataHarmphasicV.setV5Cp95(messageDataV.getGVa5()); - dataHarmphasicV.setV6Cp95(messageDataV.getGVa6()); - dataHarmphasicV.setV7Cp95(messageDataV.getGVa7()); - dataHarmphasicV.setV8Cp95(messageDataV.getGVa8()); - dataHarmphasicV.setV9Cp95(messageDataV.getGVa9()); - dataHarmphasicV.setV10Cp95(messageDataV.getGVa10()); - dataHarmphasicV.setV11Cp95(messageDataV.getGVa11()); - dataHarmphasicV.setV12Cp95(messageDataV.getGVa12()); - dataHarmphasicV.setV13Cp95(messageDataV.getGVa13()); - dataHarmphasicV.setV14Cp95(messageDataV.getGVa14()); - dataHarmphasicV.setV15Cp95(messageDataV.getGVa15()); - dataHarmphasicV.setV16Cp95(messageDataV.getGVa16()); - dataHarmphasicV.setV17Cp95(messageDataV.getGVa17()); - dataHarmphasicV.setV18Cp95(messageDataV.getGVa18()); - dataHarmphasicV.setV19Cp95(messageDataV.getGVa19()); - dataHarmphasicV.setV20Cp95(messageDataV.getGVa20()); - dataHarmphasicV.setV21Cp95(messageDataV.getGVa21()); - dataHarmphasicV.setV22Cp95(messageDataV.getGVa22()); - dataHarmphasicV.setV23Cp95(messageDataV.getGVa23()); - dataHarmphasicV.setV24Cp95(messageDataV.getGVa24()); - dataHarmphasicV.setV25Cp95(messageDataV.getGVa25()); - dataHarmphasicV.setV26Cp95(messageDataV.getGVa26()); - dataHarmphasicV.setV27Cp95(messageDataV.getGVa27()); - dataHarmphasicV.setV28Cp95(messageDataV.getGVa28()); - dataHarmphasicV.setV29Cp95(messageDataV.getGVa29()); - dataHarmphasicV.setV30Cp95(messageDataV.getGVa30()); - dataHarmphasicV.setV31Cp95(messageDataV.getGVa31()); - dataHarmphasicV.setV32Cp95(messageDataV.getGVa32()); - dataHarmphasicV.setV33Cp95(messageDataV.getGVa33()); - dataHarmphasicV.setV34Cp95(messageDataV.getGVa34()); - dataHarmphasicV.setV35Cp95(messageDataV.getGVa35()); - dataHarmphasicV.setV36Cp95(messageDataV.getGVa36()); - dataHarmphasicV.setV37Cp95(messageDataV.getGVa37()); - dataHarmphasicV.setV38Cp95(messageDataV.getGVa38()); - dataHarmphasicV.setV39Cp95(messageDataV.getGVa39()); - dataHarmphasicV.setV40Cp95(messageDataV.getGVa40()); - dataHarmphasicV.setV41Cp95(messageDataV.getGVa41()); - dataHarmphasicV.setV42Cp95(messageDataV.getGVa42()); - dataHarmphasicV.setV43Cp95(messageDataV.getGVa43()); - dataHarmphasicV.setV44Cp95(messageDataV.getGVa44()); - dataHarmphasicV.setV45Cp95(messageDataV.getGVa45()); - dataHarmphasicV.setV46Cp95(messageDataV.getGVa46()); - dataHarmphasicV.setV47Cp95(messageDataV.getGVa47()); - dataHarmphasicV.setV48Cp95(messageDataV.getGVa48()); - dataHarmphasicV.setV49Cp95(messageDataV.getGVa49()); - dataHarmphasicV.setV50Cp95(messageDataV.getGVa50()); + dataHarmphasicV.setV1Cp95(adjustPhase(messageDataV.getGVfundAngle())); + dataHarmphasicV.setV2Cp95(adjustPhase(messageDataV.getGVa2())); + dataHarmphasicV.setV3Cp95(adjustPhase(messageDataV.getGVa3())); + dataHarmphasicV.setV4Cp95(adjustPhase(messageDataV.getGVa4())); + dataHarmphasicV.setV5Cp95(adjustPhase(messageDataV.getGVa5())); + dataHarmphasicV.setV6Cp95(adjustPhase(messageDataV.getGVa6())); + dataHarmphasicV.setV7Cp95(adjustPhase(messageDataV.getGVa7())); + dataHarmphasicV.setV8Cp95(adjustPhase(messageDataV.getGVa8())); + dataHarmphasicV.setV9Cp95(adjustPhase(messageDataV.getGVa9())); + dataHarmphasicV.setV10Cp95(adjustPhase(messageDataV.getGVa10())); + dataHarmphasicV.setV11Cp95(adjustPhase(messageDataV.getGVa11())); + dataHarmphasicV.setV12Cp95(adjustPhase(messageDataV.getGVa12())); + dataHarmphasicV.setV13Cp95(adjustPhase(messageDataV.getGVa13())); + dataHarmphasicV.setV14Cp95(adjustPhase(messageDataV.getGVa14())); + dataHarmphasicV.setV15Cp95(adjustPhase(messageDataV.getGVa15())); + dataHarmphasicV.setV16Cp95(adjustPhase(messageDataV.getGVa16())); + dataHarmphasicV.setV17Cp95(adjustPhase(messageDataV.getGVa17())); + dataHarmphasicV.setV18Cp95(adjustPhase(messageDataV.getGVa18())); + dataHarmphasicV.setV19Cp95(adjustPhase(messageDataV.getGVa19())); + dataHarmphasicV.setV20Cp95(adjustPhase(messageDataV.getGVa20())); + dataHarmphasicV.setV21Cp95(adjustPhase(messageDataV.getGVa21())); + dataHarmphasicV.setV22Cp95(adjustPhase(messageDataV.getGVa22())); + dataHarmphasicV.setV23Cp95(adjustPhase(messageDataV.getGVa23())); + dataHarmphasicV.setV24Cp95(adjustPhase(messageDataV.getGVa24())); + dataHarmphasicV.setV25Cp95(adjustPhase(messageDataV.getGVa25())); + dataHarmphasicV.setV26Cp95(adjustPhase(messageDataV.getGVa26())); + dataHarmphasicV.setV27Cp95(adjustPhase(messageDataV.getGVa27())); + dataHarmphasicV.setV28Cp95(adjustPhase(messageDataV.getGVa28())); + dataHarmphasicV.setV29Cp95(adjustPhase(messageDataV.getGVa29())); + dataHarmphasicV.setV30Cp95(adjustPhase(messageDataV.getGVa30())); + dataHarmphasicV.setV31Cp95(adjustPhase(messageDataV.getGVa31())); + dataHarmphasicV.setV32Cp95(adjustPhase(messageDataV.getGVa32())); + dataHarmphasicV.setV33Cp95(adjustPhase(messageDataV.getGVa33())); + dataHarmphasicV.setV34Cp95(adjustPhase(messageDataV.getGVa34())); + dataHarmphasicV.setV35Cp95(adjustPhase(messageDataV.getGVa35())); + dataHarmphasicV.setV36Cp95(adjustPhase(messageDataV.getGVa36())); + dataHarmphasicV.setV37Cp95(adjustPhase(messageDataV.getGVa37())); + dataHarmphasicV.setV38Cp95(adjustPhase(messageDataV.getGVa38())); + dataHarmphasicV.setV39Cp95(adjustPhase(messageDataV.getGVa39())); + dataHarmphasicV.setV40Cp95(adjustPhase(messageDataV.getGVa40())); + dataHarmphasicV.setV41Cp95(adjustPhase(messageDataV.getGVa41())); + dataHarmphasicV.setV42Cp95(adjustPhase(messageDataV.getGVa42())); + dataHarmphasicV.setV43Cp95(adjustPhase(messageDataV.getGVa43())); + dataHarmphasicV.setV44Cp95(adjustPhase(messageDataV.getGVa44())); + dataHarmphasicV.setV45Cp95(adjustPhase(messageDataV.getGVa45())); + dataHarmphasicV.setV46Cp95(adjustPhase(messageDataV.getGVa46())); + dataHarmphasicV.setV47Cp95(adjustPhase(messageDataV.getGVa47())); + dataHarmphasicV.setV48Cp95(adjustPhase(messageDataV.getGVa48())); + dataHarmphasicV.setV49Cp95(adjustPhase(messageDataV.getGVa49())); + dataHarmphasicV.setV50Cp95(adjustPhase(messageDataV.getGVa50())); } @@ -980,4 +1002,5 @@ public class BeanVConverter { return dataHarmrateVDTO; } + }