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 0ffaaa5..b800e34 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -146,12 +146,12 @@ String st = data.getStcd(); MonitorMeteorologicalData old; Date tm = data.getTm(); - data.setP1(BigDecimal.ZERO); + data.setDrp(BigDecimal.ZERO); if (redis.exists(st) && (old = redis.get(st)) != null && tm.compareTo(old.getTm()) > 0) { if (DateUtil.offsetHour(old.getTm(), 1).compareTo(tm) == 0) { BigDecimal p1=data.getPresum().subtract(old.getPresum()); if(p1.compareTo(BigDecimal.ZERO)>-1){ - data.setP1(p1); + data.setDrp(p1); } } redis.set(data.getStcd(), data); 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 0ffaaa5..b800e34 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -146,12 +146,12 @@ String st = data.getStcd(); MonitorMeteorologicalData old; Date tm = data.getTm(); - data.setP1(BigDecimal.ZERO); + data.setDrp(BigDecimal.ZERO); if (redis.exists(st) && (old = redis.get(st)) != null && tm.compareTo(old.getTm()) > 0) { if (DateUtil.offsetHour(old.getTm(), 1).compareTo(tm) == 0) { BigDecimal p1=data.getPresum().subtract(old.getPresum()); if(p1.compareTo(BigDecimal.ZERO)>-1){ - data.setP1(p1); + data.setDrp(p1); } } redis.set(data.getStcd(), data); 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 75a6009..38ee044 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorMeteorologicalData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/MonitorMeteorologicalData.java @@ -55,7 +55,7 @@ @JsonProperty(value ="us") @ApiModelProperty(value = "风速m/s") private BigDecimal windSpeed; - @JsonProperty(value ="drp") + @JsonProperty(value ="p1") @ApiModelProperty(value = "1小时降雨量") //内存计算小时降雨量 - private BigDecimal p1; + private BigDecimal drp; }