diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index 75811fdb..f6b1d8ec 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -390,10 +390,10 @@ public class SocketDevResponseService { (type + "b").equals(x.getChannelType()) || (type + "c").equals(x.getChannelType()) ).collect(Collectors.toList()); - Map sourceMap = sourceList.stream() + Map sourceMap = sourceList.stream() .collect(Collectors.toMap(x -> x.getChannelType().toUpperCase().replace(type, "") , SourceIssue.ChannelListDTO::getFAmp)); - Map devMap = new HashMap<>(3); + Map devMap = new HashMap<>(3); devMap.put("A", devData.getA()); devMap.put("B", devData.getB()); devMap.put("C", devData.getC()); diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/po/DevData.java b/detection/src/main/java/com/njcn/gather/detection/pojo/po/DevData.java index 6bd36dc7..178779a9 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/po/DevData.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/po/DevData.java @@ -46,13 +46,13 @@ public class DevData { @Data public static class ListDTO { @JSONField(name = "A", ordinal = 1) - private Float a; + private Double a; @JSONField(name = "B", ordinal = 2) - private Float b; + private Double b; @JSONField(name = "C", ordinal = 3) - private Float c; + private Double c; @JSONField(name = "T", ordinal = 4) - private Float t; + private Double t; } } diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/po/SourceCompareDev.java b/detection/src/main/java/com/njcn/gather/detection/pojo/po/SourceCompareDev.java index 5ed8bc88..680280f2 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/po/SourceCompareDev.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/po/SourceCompareDev.java @@ -47,13 +47,13 @@ public class SourceCompareDev { * 源数据 */ @JSONField(ordinal = 5) - private Map sourceData; + private Map sourceData; /** * 装置数据 */ @JSONField(ordinal = 6) - private Map DevData; + private Map DevData; } diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/po/SourceIssue.java b/device/src/main/java/com/njcn/gather/device/script/pojo/po/SourceIssue.java index dba8ec29..89aabd84 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/po/SourceIssue.java +++ b/device/src/main/java/com/njcn/gather/device/script/pojo/po/SourceIssue.java @@ -38,19 +38,19 @@ public class SourceIssue { * 被检设备额定电压 */ @JSONField(name = "fUn", ordinal = 4) - private Float fUn; + private Double fUn; /** * 被检设备额定电流 */ @JSONField(name = "fIn", ordinal = 5) - private Float fIn; + private Double fIn; /** * 频率 */ @JSONField(name = "fFreq", ordinal = 6) - private Float fFreq; + private Double fFreq; /** * 通道信息 @@ -102,13 +102,13 @@ public class SourceIssue { * 幅值 */ @JSONField(name = "fAmp", ordinal = 7) - private Float fAmp; + private Double fAmp; /** * 相角 */ @JSONField(name = "fPhase", ordinal = 8) - private Float fPhase; + private Double fPhase; /** * 谐波叠加列表 @@ -152,13 +152,13 @@ public class SourceIssue { * 谐波含有率 */ @JSONField(name = "fApm", ordinal = 2) - private Float fApm; + private Double fApm; /** * 谐波相角 */ @JSONField(name = "fPhase", ordinal = 3) - private Float fPhase; + private Double fPhase; } @@ -179,13 +179,13 @@ public class SourceIssue { * 间谐波含有率 */ @JSONField(name = "fApm", ordinal = 2) - private Float fApm; + private Double fApm; /** * 间谐波相角 */ @JSONField(name = "fPhase", ordinal = 3) - private Float fPhase; + private Double fPhase; } @@ -201,37 +201,37 @@ public class SourceIssue { * 暂态幅值(%) */ @JSONField(name = "fTransValue", ordinal = 1) - private Float fTransValue; + private Double fTransValue; /** * 暂态前时间(s) */ @JSONField(name = "fPreTime", ordinal = 2) - private Float fPreTime; + private Double fPreTime; /** * 写入时间(s) */ @JSONField(name = "fRampIn", ordinal = 3) - private Float fRampIn; + private Double fRampIn; /** * 暂态持续时间(s) */ @JSONField(name = "fRetainTime", ordinal = 4) - private Float fRetainTime; + private Double fRetainTime; /** * 写出时间(s) */ @JSONField(name = "fRampOut", ordinal = 5) - private Float fRampOut; + private Double fRampOut; /** * 暂态后时间(s) */ @JSONField(name = "fAfterTime", ordinal = 6) - private Float fAfterTime; + private Double fAfterTime; } /** @@ -257,19 +257,19 @@ public class SourceIssue { * 占空比 */ @JSONField(name = "fDutyCycle", ordinal = 3) - private Float fDutyCycle; + private Double fDutyCycle; /** * 变动次数 */ @JSONField(name = "fChagFre", ordinal = 4) - private Float fChagFre; + private Double fChagFre; /** * 变动量 */ @JSONField(name = "fChagValue", ordinal = 5) - private Float fChagValue; + private Double fChagValue; } } }