diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index e446d2d..06129bd 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -78,9 +78,10 @@ } else if (xfDataEnum == XfDataEnum.Meteorological) { DTO = JSONObject.parseArray(data, MonitorMeteorologicalData.class); // 整点数据 特殊处理 这个整点减去上个整点。。算出p1 - DTO.forEach(i -> { - checkSetQxzP1((MonitorMeteorologicalData) i); - }); + //2022-12-01 讯飞侧给入p1 +// DTO.forEach(i -> { +// checkSetQxzP1((MonitorMeteorologicalData) i); +// }); } else if (xfDataEnum == XfDataEnum.PptnData) { DTO = JSONObject.parseArray(data, MonitorPptnData.class); DTO.forEach(i -> { @@ -251,7 +252,7 @@ model = RealTimeSerializer.xfObjectToRealMap(DTO); } else if (xfDataEnum == XfDataEnum.Meteorological) { MonitorMeteorologicalData DTO = JSONObject.parseObject(data, MonitorMeteorologicalData.class); - checkSetQxzP1(DTO); +// checkSetQxzP1(DTO); model = RealTimeSerializer.xfObjectToRealMap(DTO); } else if (xfDataEnum == XfDataEnum.PptnData) { MonitorPptnData DTO = JSONObject.parseObject(data, MonitorPptnData.class); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index e446d2d..06129bd 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -78,9 +78,10 @@ } else if (xfDataEnum == XfDataEnum.Meteorological) { DTO = JSONObject.parseArray(data, MonitorMeteorologicalData.class); // 整点数据 特殊处理 这个整点减去上个整点。。算出p1 - DTO.forEach(i -> { - checkSetQxzP1((MonitorMeteorologicalData) i); - }); + //2022-12-01 讯飞侧给入p1 +// DTO.forEach(i -> { +// checkSetQxzP1((MonitorMeteorologicalData) i); +// }); } else if (xfDataEnum == XfDataEnum.PptnData) { DTO = JSONObject.parseArray(data, MonitorPptnData.class); DTO.forEach(i -> { @@ -251,7 +252,7 @@ model = RealTimeSerializer.xfObjectToRealMap(DTO); } else if (xfDataEnum == XfDataEnum.Meteorological) { MonitorMeteorologicalData DTO = JSONObject.parseObject(data, MonitorMeteorologicalData.class); - checkSetQxzP1(DTO); +// checkSetQxzP1(DTO); model = RealTimeSerializer.xfObjectToRealMap(DTO); } else if (xfDataEnum == XfDataEnum.PptnData) { MonitorPptnData DTO = JSONObject.parseObject(data, MonitorPptnData.class); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorMeteorologicalData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorMeteorologicalData.java index 38ee044..0f9786f 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorMeteorologicalData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorMeteorologicalData.java @@ -58,4 +58,7 @@ @JsonProperty(value ="p1") @ApiModelProperty(value = "1小时降雨量") //内存计算小时降雨量 private BigDecimal drp; + @JsonProperty(value ="gtp") + @ApiModelProperty(value = "地温") + private BigDecimal dtem; }