diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java index 5bb8d6c..30b7611 100644 --- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java +++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java @@ -121,7 +121,7 @@ dto.setP1(one); dto.setP3(Three); dto.setP6(Six); - dto.setPd(Day); + dto.setP24(Day); //todo 历史每个月查询 } diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java index 5bb8d6c..30b7611 100644 --- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java +++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java @@ -121,7 +121,7 @@ dto.setP1(one); dto.setP3(Three); dto.setP6(Six); - dto.setPd(Day); + dto.setP24(Day); //todo 历史每个月查询 } diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/dto/YlDto.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/dto/YlDto.java index e85ca15..901ede4 100644 --- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/dto/YlDto.java +++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/dto/YlDto.java @@ -41,13 +41,13 @@ private Float p3; private Float p6; private Float p12; - private Float pd; + private Float p24; private BigDecimal countPt=BigDecimal.ZERO; public static String one = "p1"; public static String Three = "p3"; public static String six = "p6"; public static String twelve = "p12"; - public static String day = "pd"; + public static String day = "p24"; public static String pt = "pt"; public static PtReceiveBaseModel convert(YlDto dto) { @@ -89,10 +89,10 @@ p1.setSn(YlDto.twelve); dataMap.put(YlDto.twelve, p1); } - if (dto.getPd() != null) { + if (dto.getP24() != null) { MqNodeData p1 = new MqNodeData(); p1.setKey(YlDto.day); - p1.setValue(dto.getPd()); + p1.setValue(dto.getP24()); p1.setSn(YlDto.day); dataMap.put(YlDto.day, p1); } @@ -125,7 +125,7 @@ } else if (size == 60 * 12 / 5) { dto.setP12(countBig.floatValue()); } else if (size == 60 * 24 / 5) { - dto.setPd(countBig.floatValue()); + dto.setP24(countBig.floatValue()); } } } diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java index 5bb8d6c..30b7611 100644 --- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java +++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/action/YlAction.java @@ -121,7 +121,7 @@ dto.setP1(one); dto.setP3(Three); dto.setP6(Six); - dto.setPd(Day); + dto.setP24(Day); //todo 历史每个月查询 } diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/dto/YlDto.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/dto/YlDto.java index e85ca15..901ede4 100644 --- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/dto/YlDto.java +++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/dto/YlDto.java @@ -41,13 +41,13 @@ private Float p3; private Float p6; private Float p12; - private Float pd; + private Float p24; private BigDecimal countPt=BigDecimal.ZERO; public static String one = "p1"; public static String Three = "p3"; public static String six = "p6"; public static String twelve = "p12"; - public static String day = "pd"; + public static String day = "p24"; public static String pt = "pt"; public static PtReceiveBaseModel convert(YlDto dto) { @@ -89,10 +89,10 @@ p1.setSn(YlDto.twelve); dataMap.put(YlDto.twelve, p1); } - if (dto.getPd() != null) { + if (dto.getP24() != null) { MqNodeData p1 = new MqNodeData(); p1.setKey(YlDto.day); - p1.setValue(dto.getPd()); + p1.setValue(dto.getP24()); p1.setSn(YlDto.day); dataMap.put(YlDto.day, p1); } @@ -125,7 +125,7 @@ } else if (size == 60 * 12 / 5) { dto.setP12(countBig.floatValue()); } else if (size == 60 * 24 / 5) { - dto.setPd(countBig.floatValue()); + dto.setP24(countBig.floatValue()); } } } diff --git a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/util/RainfallAccumulationUtil.java b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/util/RainfallAccumulationUtil.java index 6839315..80d3f19 100644 --- a/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/util/RainfallAccumulationUtil.java +++ b/src/main/java/org/springnewfiber/dataadapter/ziguang/yl/util/RainfallAccumulationUtil.java @@ -55,6 +55,7 @@ private final NodeQueued sixNodeQueued = new NodeQueued(60 * 6 / 5); private final NodeQueued twelveNodeQueued = new NodeQueued(60 * 12 / 5); private final NodeQueued twentyFourNodeQueued = new NodeQueued(60 * 24 / 5); + //todo 每日累计降雨量算法未算 // private final NodeQueued oneNodeQueued = new NodeQueued(10); // private final NodeQueued threeNodeQueued = new NodeQueued(20); // private final NodeQueued sixNodeQueued = new NodeQueued(30);