江津优先更新版本 实际用水量采集平台查询bug

src/main/java/com/shkpr/service/aimodelpower/bizmgr/KprAimTapWaterBizFun.java

@@ -73,10 +73,10 @@ public class KprAimTapWaterBizFun {
                             //TODO 查询当前天日期内每小时的设备数据
                             for (int i = 0; i < Integer.valueOf(String.valueOf(Duration.between(startDateTime, today.withMinute(0).withSecond(0)).toHours())); i++) {
                                 String startTime = newStartDateTime.minusHours(-i).format(formater);
-                                String endTime = newStartDateTime.minusMinutes(-1).minusHours(-(i+1)).format(formater);
+                                String endTime = newStartDateTime.minusMinutes(-1).minusHours(-(i+1)).format(formater);//查询时间加一分钟
                                 Map<String, Object> recordAllEntity = new HashMap<>();//需要添加的实体数据
                                 recordAllEntity.put("org_name", key.toString());//水厂
-                                recordAllEntity.put("time", endTime);//采集时间(小时的最后时间)
+                                recordAllEntity.put("time", newStartDateTime.minusHours(-(i+1)).format(formater));//采集时间(小时的最后时间)
                                 recordAllEntity.put("value", null);
                                 recordAllEntity.put("value_tag", "water");
                                 recordAllEntity.put("collcation_tag_array", FastJsonUtil.toJSON(deviceList));
@@ -418,11 +418,11 @@ public class KprAimTapWaterBizFun {
                                                 //TODO 查询当前天日期内每小时的设备数据
                                                 for (int i = 0; i < 24; i++) {
                                                     String startTime = newStartDateTime.withHour(i).format(formater);
-                                                    String endTime = newStartDateTime.withHour(i).minusMinutes(-1).minusHours(-1).format(formater);
+                                                    String endTime = newStartDateTime.withHour(i).minusMinutes(-1).minusHours(-1).format(formater);//查询时间加一分钟
 
                                                     Map<String, Object> recordAllEntity = new HashMap<>();//需要添加的实体数据
                                                     recordAllEntity.put("org_name", key.toString());//水厂
-                                                    recordAllEntity.put("time", endTime);//采集时间(小时的最后时间)
+                                                    recordAllEntity.put("time", newStartDateTime.withHour(i).minusHours(-1).format(formater));//采集时间(小时的最后时间)
                                                     recordAllEntity.put("value", null);
                                                     recordAllEntity.put("value_tag", "water");
                                                     recordAllEntity.put("collcation_tag_array", FastJsonUtil.toJSON(deviceList));