diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 7677a87..63d2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -100,8 +100,7 @@
         dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
 
         // 保存到数据库 同时计算日/月用水量
-//        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
-        double flowAccToday=100;
+        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
         // 判断是否报警/预警
         AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警
         AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 7677a87..63d2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -100,8 +100,7 @@
         dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
 
         // 保存到数据库 同时计算日/月用水量
-//        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
-        double flowAccToday=100;
+        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
         // 判断是否报警/预警
         AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警
         AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index d275ff7..0b1650e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -151,6 +151,7 @@
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
+        AND     JOB_ID>0
     </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 7677a87..63d2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -100,8 +100,7 @@
         dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
 
         // 保存到数据库 同时计算日/月用水量
-//        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
-        double flowAccToday=100;
+        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
         // 判断是否报警/预警
         AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警
         AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index d275ff7..0b1650e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -151,6 +151,7 @@
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
+        AND     JOB_ID>0
     </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
index 9256c80..1283ba2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
@@ -14,4 +14,10 @@
     Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
 
     Map<String, Object> isExistDataGasFlowMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void updateDataGasFlowDay(@Param("devcode") String devcode,
+                                             @Param("wellCode") String wellCode,
+                                             @Param("date") String date,
+                                             @Param("totalFlow") String totalFlow,
+                                             @Param("totalFlowDate") String totalFlowDate);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 7677a87..63d2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -100,8 +100,7 @@
         dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
 
         // 保存到数据库 同时计算日/月用水量
-//        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
-        double flowAccToday=100;
+        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
         // 判断是否报警/预警
         AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警
         AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index d275ff7..0b1650e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -151,6 +151,7 @@
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
+        AND     JOB_ID>0
     </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
index 9256c80..1283ba2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
@@ -14,4 +14,10 @@
     Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
 
     Map<String, Object> isExistDataGasFlowMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void updateDataGasFlowDay(@Param("devcode") String devcode,
+                                             @Param("wellCode") String wellCode,
+                                             @Param("date") String date,
+                                             @Param("totalFlow") String totalFlow,
+                                             @Param("totalFlowDate") String totalFlowDate);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
index a277471..743bee9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -25,6 +25,7 @@
     Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
 
     void insertDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
+    void updateDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
     void insertDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth);
     void updateDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth, @Param("id") Long id);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 7677a87..63d2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -100,8 +100,7 @@
         dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
 
         // 保存到数据库 同时计算日/月用水量
-//        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
-        double flowAccToday=100;
+        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
         // 判断是否报警/预警
         AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警
         AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index d275ff7..0b1650e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -151,6 +151,7 @@
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
+        AND     JOB_ID>0
     </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
index 9256c80..1283ba2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
@@ -14,4 +14,10 @@
     Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
 
     Map<String, Object> isExistDataGasFlowMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void updateDataGasFlowDay(@Param("devcode") String devcode,
+                                             @Param("wellCode") String wellCode,
+                                             @Param("date") String date,
+                                             @Param("totalFlow") String totalFlow,
+                                             @Param("totalFlowDate") String totalFlowDate);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
index a277471..743bee9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -25,6 +25,7 @@
     Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
 
     void insertDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
+    void updateDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
     void insertDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth);
     void updateDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth, @Param("id") Long id);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
index c4ca696..eb691c4 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
@@ -27,7 +27,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM data_gasflow
-        WHERE devcode = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{uptime})
+        WHERE devcode = #{devcode}
         ORDER BY uptime DESC
         limit 1
     </select>
@@ -39,7 +39,8 @@
 								   WHERE   DEVCODE =#{devcode}
 								   order by  uptime  desc  limit 1
 									)   dg
-        WHERE DEVCODE = #{devcode} AND unix_timestamp(DATE) &lt; unix_timestamp(#{date}) order by DATE desc limit 1
+        WHERE DEVCODE = #{devcode}
+         order by DATE desc limit 1
     </select>
 
     <select id="isExistDataGasFlowMonth" resultType="map">
@@ -49,4 +50,12 @@
         LIMIT 1
     </select>
 
+    <update id="updateDataGasFlowDay">
+        UPDATE data_gasflow_day
+        SET TOTAL_FLOW = #{totalFlow},TOTAL_FLOW_DATE = #{totalFlowDate}
+        WHERE  DATE = #{date}
+        AND WELL_CODE= #{wellCode}
+        AND DEVCODE=#{devcode}
+    </update>
+
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 7677a87..63d2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -100,8 +100,7 @@
         dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
 
         // 保存到数据库 同时计算日/月用水量
-//        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
-        double flowAccToday=100;
+        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
         // 判断是否报警/预警
         AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警
         AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index d275ff7..0b1650e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -151,6 +151,7 @@
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
+        AND     JOB_ID>0
     </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
index 9256c80..1283ba2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
@@ -14,4 +14,10 @@
     Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
 
     Map<String, Object> isExistDataGasFlowMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void updateDataGasFlowDay(@Param("devcode") String devcode,
+                                             @Param("wellCode") String wellCode,
+                                             @Param("date") String date,
+                                             @Param("totalFlow") String totalFlow,
+                                             @Param("totalFlowDate") String totalFlowDate);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
index a277471..743bee9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -25,6 +25,7 @@
     Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
 
     void insertDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
+    void updateDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
     void insertDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth);
     void updateDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth, @Param("id") Long id);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
index c4ca696..eb691c4 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
@@ -27,7 +27,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM data_gasflow
-        WHERE devcode = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{uptime})
+        WHERE devcode = #{devcode}
         ORDER BY uptime DESC
         limit 1
     </select>
@@ -39,7 +39,8 @@
 								   WHERE   DEVCODE =#{devcode}
 								   order by  uptime  desc  limit 1
 									)   dg
-        WHERE DEVCODE = #{devcode} AND unix_timestamp(DATE) &lt; unix_timestamp(#{date}) order by DATE desc limit 1
+        WHERE DEVCODE = #{devcode}
+         order by DATE desc limit 1
     </select>
 
     <select id="isExistDataGasFlowMonth" resultType="map">
@@ -49,4 +50,12 @@
         LIMIT 1
     </select>
 
+    <update id="updateDataGasFlowDay">
+        UPDATE data_gasflow_day
+        SET TOTAL_FLOW = #{totalFlow},TOTAL_FLOW_DATE = #{totalFlowDate}
+        WHERE  DATE = #{date}
+        AND WELL_CODE= #{wellCode}
+        AND DEVCODE=#{devcode}
+    </update>
+
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index 4015909..faf1e9e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -24,7 +24,7 @@
 
     <select id="selectLatestRecordByDevcode" resultType="com.casic.missiles.modular.system.model.DataWaterMeter">
         SELECT <include refid="Base_Column_List"/> FROM data_watermeter
-        where devcode = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{uptime}) order by uptime desc limit 1
+        where devcode = #{devcode} order by uptime desc limit 1
     </select>
 
     <select id="selectLatestDayAccByDevice" resultType="map">
@@ -34,7 +34,7 @@
 								   WHERE  DEVCODE =#{devcode}
 								   order by  uptime  desc  limit 1
 									)   dw
-        WHERE DEVCODE = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{date})
+        WHERE DEVCODE = #{devcode}
         order by DATE desc limit 1
     </select>
 
@@ -43,6 +43,14 @@
         VALUES (#{dataDay.wellCode}, #{dataDay.devCode}, #{dataDay.flowAccDate}, #{dataDay.flowAcc}, #{dataDay.date})
     </insert>
 
+    <update id="updateDataWatermeterDay" parameterType="Map">
+        UPDATE data_watermeter_day
+        SET FLOW_ACC = #{dataDay.flowAcc}, FLOW_ACC_DATE = #{dataDay.flowAccDate}
+        WHERE  DATE = #{dataDay.date}
+        AND WELL_CODE= #{dataDay.wellCode}
+        AND DEVCODE=#{dataDay.devCode}
+    </update>
+
     <select id="isExistDataWatermeterMonth" resultType="map">
         SELECT ID as id, WELL_CODE as wellCode, DEVCODE as devCode, FLOW_ACC_MONTH as flowAccMonth, FIRST_ACC as firstAcc, LAST_ACC as lastAcc, MONTH as month
         FROM data_watermeter_month

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 7677a87..63d2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -100,8 +100,7 @@
         dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
 
         // 保存到数据库 同时计算日/月用水量
-//        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
-        double flowAccToday=100;
+        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
         // 判断是否报警/预警
         AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警
         AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index d275ff7..0b1650e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -151,6 +151,7 @@
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
+        AND     JOB_ID>0
     </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
index 9256c80..1283ba2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
@@ -14,4 +14,10 @@
     Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
 
     Map<String, Object> isExistDataGasFlowMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void updateDataGasFlowDay(@Param("devcode") String devcode,
+                                             @Param("wellCode") String wellCode,
+                                             @Param("date") String date,
+                                             @Param("totalFlow") String totalFlow,
+                                             @Param("totalFlowDate") String totalFlowDate);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
index a277471..743bee9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -25,6 +25,7 @@
     Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
 
     void insertDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
+    void updateDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
     void insertDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth);
     void updateDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth, @Param("id") Long id);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
index c4ca696..eb691c4 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
@@ -27,7 +27,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM data_gasflow
-        WHERE devcode = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{uptime})
+        WHERE devcode = #{devcode}
         ORDER BY uptime DESC
         limit 1
     </select>
@@ -39,7 +39,8 @@
 								   WHERE   DEVCODE =#{devcode}
 								   order by  uptime  desc  limit 1
 									)   dg
-        WHERE DEVCODE = #{devcode} AND unix_timestamp(DATE) &lt; unix_timestamp(#{date}) order by DATE desc limit 1
+        WHERE DEVCODE = #{devcode}
+         order by DATE desc limit 1
     </select>
 
     <select id="isExistDataGasFlowMonth" resultType="map">
@@ -49,4 +50,12 @@
         LIMIT 1
     </select>
 
+    <update id="updateDataGasFlowDay">
+        UPDATE data_gasflow_day
+        SET TOTAL_FLOW = #{totalFlow},TOTAL_FLOW_DATE = #{totalFlowDate}
+        WHERE  DATE = #{date}
+        AND WELL_CODE= #{wellCode}
+        AND DEVCODE=#{devcode}
+    </update>
+
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index 4015909..faf1e9e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -24,7 +24,7 @@
 
     <select id="selectLatestRecordByDevcode" resultType="com.casic.missiles.modular.system.model.DataWaterMeter">
         SELECT <include refid="Base_Column_List"/> FROM data_watermeter
-        where devcode = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{uptime}) order by uptime desc limit 1
+        where devcode = #{devcode} order by uptime desc limit 1
     </select>
 
     <select id="selectLatestDayAccByDevice" resultType="map">
@@ -34,7 +34,7 @@
 								   WHERE  DEVCODE =#{devcode}
 								   order by  uptime  desc  limit 1
 									)   dw
-        WHERE DEVCODE = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{date})
+        WHERE DEVCODE = #{devcode}
         order by DATE desc limit 1
     </select>
 
@@ -43,6 +43,14 @@
         VALUES (#{dataDay.wellCode}, #{dataDay.devCode}, #{dataDay.flowAccDate}, #{dataDay.flowAcc}, #{dataDay.date})
     </insert>
 
+    <update id="updateDataWatermeterDay" parameterType="Map">
+        UPDATE data_watermeter_day
+        SET FLOW_ACC = #{dataDay.flowAcc}, FLOW_ACC_DATE = #{dataDay.flowAccDate}
+        WHERE  DATE = #{dataDay.date}
+        AND WELL_CODE= #{dataDay.wellCode}
+        AND DEVCODE=#{dataDay.devCode}
+    </update>
+
     <select id="isExistDataWatermeterMonth" resultType="map">
         SELECT ID as id, WELL_CODE as wellCode, DEVCODE as devCode, FLOW_ACC_MONTH as flowAccMonth, FIRST_ACC as firstAcc, LAST_ACC as lastAcc, MONTH as month
         FROM data_watermeter_month
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
index 16d03e1..18e6657 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
@@ -7,18 +7,16 @@
 import com.casic.missiles.modular.system.model.DataGasFlow;
 import com.casic.missiles.modular.system.model.DataGasFlowDay;
 import com.casic.missiles.modular.system.model.DataGasFlowMonth;
-import com.casic.missiles.modular.system.model.DataWaterMeter;
 import com.casic.missiles.modular.system.service.IGasFlowDataService;
-import lombok.extern.java.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -36,17 +34,13 @@
     @Override
     @Transactional
     public double saveGasFlowData(DataGasFlow dataGasFlow) {
-
-
         // 用于返回的日用气量
         double totalFlowDayRet = 0.0;
-
         // 日用气量
         DataGasFlowDay gasFlowDay = new DataGasFlowDay();
         gasFlowDay.setWellCode(dataGasFlow.getWellCode());
         gasFlowDay.setDevcode(dataGasFlow.getDevcode());
         gasFlowDay.setDate(sdfDate.format(dataGasFlow.getUptime()));
-
         // 月用气量
         DataGasFlowMonth gasFlowMonth = new DataGasFlowMonth();
         gasFlowMonth.setWellCode(dataGasFlow.getWellCode());
@@ -56,56 +50,38 @@
         Map<String, Object> lastDayAcc = this.selectLatestDayAccByDevice(dataGasFlow.getDevcode(), sdfDate.format(dataGasFlow.getUptime()));
         // 1. 保存原始记录
         this.baseMapper.insert(dataGasFlow);
+        Calendar lastDay = Calendar.getInstance();
         if (null != lastDayAcc) {
+            try {
+                lastDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
+            } catch (Exception ex) {
+                log.error("主题:供气表接收展示，日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex);
+            }
+            gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
+            gasFlowMonth.setMonth(sdfDate.format(lastDay.getTime()).substring(0, 7));
             Calendar today = Calendar.getInstance();
             today.setTime(dataGasFlow.getUptime());
-            today.set(Calendar.HOUR, 0);
-            today.set(Calendar.MINUTE, 0);
-            today.set(Calendar.SECOND, 0);
-            try {
-                Calendar lastDay = Calendar.getInstance();
-                lastDay.setTime(sdfDate.parse(lastDayAcc.get("DATE").toString()));
-                // 计算间隔天数
-                long delta = today.getTimeInMillis() - lastDay.getTimeInMillis();
-                int dateDelta = (int) (delta / (3600 * 24 * 1000));
-                long delhour = delta / (3600 * 1000);
-                log.debug("时间1" + today.getTimeInMillis() + "时间2" + lastDay.getTimeInMillis() + "-------------today" + today.get(Calendar.DATE) + "最后一天" + lastDay.get(Calendar.DATE) + "相差小时" + delhour);
-                // 计算与上一条日用气量的差值
-                Double totalFlowDelta = Double.parseDouble(dataGasFlow.getTotalFlow()) - Double.parseDouble(lastDayAcc.get("totalFlow").toString());
-                //如果间隔为0，可能是同一天，或者是间隔一天，进行天的进一步判断
-                if (dateDelta == 0) {
-                    long dayDel = today.get(Calendar.DATE) - lastDay.get(Calendar.DATE);
-                    if (dayDel == 1) {
-                        // 间隔一天 日用水量=差值
-                        totalFlowDayRet = totalFlowDelta / delhour * 24;
-                        gasFlowDay.setTotalFlowDate(df2.format(totalFlowDelta));
-                        intervalOfDayGasFlow(gasFlowDay, today, lastDayAcc, gasFlowMonth, dataGasFlow);
-                    }
-                }
-                // 时间间隔为1天
-                if (dateDelta == 1) {
-                    // 间隔一天 日用气量=差值
-                    totalFlowDayRet = totalFlowDelta / delhour * 24;
-                    // 当日用气量 = 当日气表读数 - 昨日气表读数
-                    gasFlowDay.setTotalFlowDate(df2.format(totalFlowDayRet));
-                    intervalOfDayGasFlow(gasFlowDay, today, lastDayAcc, gasFlowMonth, dataGasFlow);
-                } else {
-                    intervalManyDayGasFlow(gasFlowDay, lastDay, lastDayAcc, gasFlowMonth, totalFlowDelta, delhour, dateDelta);
-                }
-            } catch (Exception ex) {
-                ex.printStackTrace();
+            // 计算与上一条日用气量的差值
+            Double totalFlowDelta = Double.parseDouble(dataGasFlow.getTotalFlow()) - Double.parseDouble(lastDayAcc.get("totalFlow").toString());
+
+            // 计算间隔天数
+            long delta = today.getTimeInMillis() - lastDay.getTimeInMillis();
+            long dayDel = today.get(Calendar.DATE) - lastDay.get(Calendar.DATE);
+            // 计算间隔时差
+            long delhour = delta / (3600 * 1000);
+            int dateDelta = (int) delhour / 24;
+            totalFlowDayRet = totalFlowDelta / delhour * 24;
+            //如果间隔为0，可能是同一天，或者是间隔一天，进行天的进一步判断
+            if (dayDel == 0 && dateDelta == 0 && delhour > 0) {
+                noIntervalDayGasFlow(gasFlowDay, lastDayAcc, totalFlowDayRet, totalFlowDelta, gasFlowMonth, dataGasFlow);
+            } else if (dayDel == 1||dateDelta == 1 ) {
+                intervalOfDayGasFlow(gasFlowDay, lastDay, totalFlowDayRet, totalFlowDelta, lastDayAcc, gasFlowMonth, dataGasFlow);
+            } else {
+                intervalManyDayGasFlow(gasFlowDay, lastDay, lastDayAcc, gasFlowMonth, totalFlowDayRet, delhour, dateDelta);
             }
         } else {
-            // 没有找到最近的日用气量记录 则新增日及月用气量
-            gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
-            gasFlowDay.setTotalFlowDate(dataGasFlow.getTotalFlow());
-            dataGasFlowDayMapper.insert(gasFlowDay);
-            // 没有上一条记录 日用气量 = 当前读数
-            totalFlowDayRet = Double.parseDouble(dataGasFlow.getTotalFlow());
-            gasFlowMonth.setTotalFlowMonth(dataGasFlow.getTotalFlow());
-            gasFlowMonth.setFirstTotal("0");
-            gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
-            dataGasFlowMonthMapper.insert(gasFlowMonth);
+            lastDay.setTime(dataGasFlow.getUptime());
+            totalFlowDayRet = initFlowGas(gasFlowDay, dataGasFlow, gasFlowMonth);
         }
         return totalFlowDayRet;
     }
@@ -115,41 +91,81 @@
         return this.baseMapper.selectLatestDayAccByDevice(devcode, date);
     }
 
+    /**
+     * 没有间隔
+     */
+    private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay, Map<String, Object> lastDayAcc, Double flowAccDayRet,
+                                      Double flowAccDelta, DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
+        gasFlowDay.setTotalFlowDate(dataGasFlow.getTotalFlow());
+        gasFlowDay.setTotalFlow(df2.format(flowAccDayRet));
+        this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getDevcode(), gasFlowDay.getDate(),
+                gasFlowDay.getTotalFlow(), gasFlowDay.getTotalFlowDate());
+        // 更新月用气量
+        Map<String, Object> monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
+        if (null != monthExist) {
+            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + flowAccDelta));
+            gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
+            gasFlowMonth.setId((Long) monthExist.get("id"));
+            dataGasFlowMonthMapper.updateById(gasFlowMonth);
+        } else {
+            gasFlowMonth.setTotalFlowMonth(flowAccDelta.toString());
+            gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
+            gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
+            dataGasFlowMonthMapper.insert(gasFlowMonth);
+        }
+    }
+
+    /**
+     * 间隔一天
+     */
     private void intervalOfDayGasFlow(DataGasFlowDay gasFlowDay,
-                                      Calendar today, Map<String, Object> lastDayAcc,
-                                      DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
+                                      Calendar lastDay,
+                                      Double flowAccDayRet,
+                                      Double flowAccDelta,
+                                      Map<String, Object> lastDayAcc,
+                                      DataGasFlowMonth gasFlowMonth,
+                                      DataGasFlow dataGasFlow) {
+        // 更新月用水量
+        lastDay.add(Calendar.DATE, 1);
+        gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
+        gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
         gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
         dataGasFlowDayMapper.insert(gasFlowDay);
-        if (today.get(Calendar.DATE) == 1) {
-            // 是每月的第一天 则新增月用气量
-            gasFlowMonth.setTotalFlowMonth(gasFlowDay.getTotalFlowDate());
-            gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());// 初始累积值为上个月的最后一个累积值
+        if (lastDay.get(Calendar.DATE) == 1) {
+            gasFlowMonth.setTotalFlowMonth(flowAccDelta.toString());
+            gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
             gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
             dataGasFlowMonthMapper.insert(gasFlowMonth);
         } else {
             // 更新月用气量
             Map<String, Object> monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
             if (null != monthExist) {
-                gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString())
-                        + Double.parseDouble(gasFlowDay.getTotalFlowDate())));
+                gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + flowAccDelta));
                 gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
                 gasFlowMonth.setId((Long) monthExist.get("id"));
                 dataGasFlowMonthMapper.updateById(gasFlowMonth);
             } else {
-                gasFlowMonth.setTotalFlowMonth(gasFlowDay.getTotalFlowDate());
-                gasFlowMonth.setFirstTotal("0");
+                gasFlowMonth.setTotalFlowMonth(flowAccDelta.toString());
+                gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
                 gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
                 dataGasFlowMonthMapper.insert(gasFlowMonth);
             }
         }
     }
 
-    private void intervalManyDayGasFlow(DataGasFlowDay gasFlowDay, Calendar lastDay, Map<String, Object> lastDayAcc, DataGasFlowMonth gasFlowMonth, double flowAccDelta, long delhour, int dayDelta) {
-        // 间隔多天平均值
-        double avgFlowDay = flowAccDelta / delhour * 24;
+    /**
+     * 间隔多天
+     */
+    private void intervalManyDayGasFlow(DataGasFlowDay gasFlowDay,
+                                        Calendar lastDay, Map<String, Object> lastDayAcc,
+                                        DataGasFlowMonth gasFlowMonth,
+                                        double avgFlowDay,
+                                        long delhour,
+                                        int dayDelta) {
+        Map<String, Object> monthExist = new HashMap<>();
         for (int i = 0; i < dayDelta; i++) {
             Double totalFlow = Double.parseDouble(lastDayAcc.get("totalFlow").toString()) + avgFlowDay * (i + 1);
-            gasFlowDay.setTotalFlow(df2.format(totalFlow.toString()));
+            gasFlowDay.setTotalFlow(totalFlow.toString());
             // 当日用气量 = （当日气表读数 - 昨日气表读数） / 天数
             gasFlowDay.setTotalFlowDate(df2.format(avgFlowDay));
             lastDay.add(Calendar.DATE, 1);
@@ -164,7 +180,7 @@
                 dataGasFlowMonthMapper.insert(gasFlowMonth);
             } else {
                 // 更新月用气量
-                Map<String, Object> monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
+                monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
                 if (null != monthExist) {
                     gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + avgFlowDay));
                     gasFlowMonth.setEndTotal(gasFlowDay.getTotalFlow());
@@ -172,11 +188,37 @@
                     dataGasFlowMonthMapper.updateById(gasFlowMonth);
                 } else {
                     gasFlowMonth.setTotalFlowMonth(gasFlowDay.getTotalFlowDate());
-                    gasFlowMonth.setFirstTotal("0");
+                    gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
                     gasFlowMonth.setEndTotal(gasFlowDay.getTotalFlow());
                     dataGasFlowMonthMapper.insert(gasFlowMonth);
                 }
             }
         }
+        if (dayDelta != 0) {
+            //修正月统计最后的累计
+            Double lastTimeDiff = avgFlowDay + Double.valueOf(dayDelta * 24 - delhour) / 24 * avgFlowDay;
+            //更新最后月累计量
+            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString())+lastTimeDiff));
+            dataGasFlowMonthMapper.updateById(gasFlowMonth);
+        }
+    }
+
+    /**
+     * 之前没有记录
+     */
+    private Double initFlowGas(DataGasFlowDay gasFlowDay,
+                               DataGasFlow dataGasFlow,
+                               DataGasFlowMonth gasFlowMonth) {
+        // 没有找到最近的日用气量记录 则新增日及月用气量
+        gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
+        gasFlowDay.setTotalFlowDate(dataGasFlow.getTotalFlow());
+        dataGasFlowDayMapper.insert(gasFlowDay);
+        // 没有上一条记录 日用气量 = 当前读数
+        Double totalFlowDayRet = Double.parseDouble(dataGasFlow.getTotalFlow());
+        gasFlowMonth.setTotalFlowMonth(dataGasFlow.getTotalFlow());
+        gasFlowMonth.setFirstTotal("0");
+        gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
+        dataGasFlowMonthMapper.insert(gasFlowMonth);
+        return totalFlowDayRet;
     }
 }
\ No newline at end of file

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 70193fa..9cc0b08 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -235,7 +235,7 @@
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
         for (AlarmRecords alarmRecord : alarmRecords) {
-            alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),"4","手动消警",currentUser.getId());
+            alarmRecordsService.cancelAlarm(alarmRecord.getId(),"4","手动消警",currentUser.getId());
         }
         return ResponseData.success();
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index 9d4e4a2..b3e6fed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -66,7 +66,6 @@
 
     public String isOldAlarmRecord(String devCode, String MsgContent) {
         return this.baseMapper.isOldAlarmRecord(devCode, MsgContent);
-
     }
 
     public Integer updateOldAlarmRecord(String devCode, String MsgContent) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 6b60c4a..5a85056 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -65,11 +65,9 @@
 
         // 创建原始记录对象
         DataGasFlow dataGasFlow = new DataGasFlow();
-
         // 赋值设备地址
         String gasFlowAddr = gasFlowData.get("assetcode").toString();
         dataGasFlow.setDevcode(gasFlowAddr);
-
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
@@ -81,13 +79,7 @@
         Device device = deviceService.getDeviceByDevCode(gasFlowAddr);
 
         // 赋值水表读数
-        Double gasFlowNumber = 0.0;
-        String numType = gasFlowData.get("ljll").getClass().getSimpleName();
-        if (numType.equals("String")) {
-            gasFlowNumber = Double.parseDouble(gasFlowData.get("ljll").toString());
-        } else if (numType.equals("BigDecimal")) {
-            gasFlowNumber = ((Number) gasFlowData.get("ljll")).doubleValue();
-        }
+        Double gasFlowNumber = Double.valueOf(gasFlowData.get("ljll").toString());
         dataGasFlow.setTotalFlow(String.valueOf(gasFlowNumber));
         // 赋值数据采集时间
         String readDate = gasFlowData.get("logat").toString();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 7677a87..63d2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -100,8 +100,7 @@
         dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
 
         // 保存到数据库 同时计算日/月用水量
-//        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
-        double flowAccToday=100;
+        double flowAccToday = waterMeterDataService.saveWaterMeterData(dataWaterMeter);
         // 判断是否报警/预警
         AlarmRule alarmRule = alarmRuleService.selectAlarmRuleByDev(meterAddr, "1"); // 报警
         AlarmRule alarmRuleWarn = alarmRuleService.selectAlarmRuleByDev(meterAddr, "2"); // 预警
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index d275ff7..0b1650e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -151,6 +151,7 @@
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
+        AND     JOB_ID>0
     </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
index 9256c80..1283ba2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataGasFlowMapper.java
@@ -14,4 +14,10 @@
     Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
 
     Map<String, Object> isExistDataGasFlowMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void updateDataGasFlowDay(@Param("devcode") String devcode,
+                                             @Param("wellCode") String wellCode,
+                                             @Param("date") String date,
+                                             @Param("totalFlow") String totalFlow,
+                                             @Param("totalFlowDate") String totalFlowDate);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
index a277471..743bee9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -25,6 +25,7 @@
     Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
 
     void insertDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
+    void updateDataWatermeterDay(@Param("dataDay") Map<String, Object> dataDay);
     void insertDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth);
     void updateDataWatermeterMonth(@Param("dataMonth") Map<String, Object> dataMonth, @Param("id") Long id);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
index c4ca696..eb691c4 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataGasFlowMapper.xml
@@ -27,7 +27,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM data_gasflow
-        WHERE devcode = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{uptime})
+        WHERE devcode = #{devcode}
         ORDER BY uptime DESC
         limit 1
     </select>
@@ -39,7 +39,8 @@
 								   WHERE   DEVCODE =#{devcode}
 								   order by  uptime  desc  limit 1
 									)   dg
-        WHERE DEVCODE = #{devcode} AND unix_timestamp(DATE) &lt; unix_timestamp(#{date}) order by DATE desc limit 1
+        WHERE DEVCODE = #{devcode}
+         order by DATE desc limit 1
     </select>
 
     <select id="isExistDataGasFlowMonth" resultType="map">
@@ -49,4 +50,12 @@
         LIMIT 1
     </select>
 
+    <update id="updateDataGasFlowDay">
+        UPDATE data_gasflow_day
+        SET TOTAL_FLOW = #{totalFlow},TOTAL_FLOW_DATE = #{totalFlowDate}
+        WHERE  DATE = #{date}
+        AND WELL_CODE= #{wellCode}
+        AND DEVCODE=#{devcode}
+    </update>
+
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index 4015909..faf1e9e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -24,7 +24,7 @@
 
     <select id="selectLatestRecordByDevcode" resultType="com.casic.missiles.modular.system.model.DataWaterMeter">
         SELECT <include refid="Base_Column_List"/> FROM data_watermeter
-        where devcode = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{uptime}) order by uptime desc limit 1
+        where devcode = #{devcode} order by uptime desc limit 1
     </select>
 
     <select id="selectLatestDayAccByDevice" resultType="map">
@@ -34,7 +34,7 @@
 								   WHERE  DEVCODE =#{devcode}
 								   order by  uptime  desc  limit 1
 									)   dw
-        WHERE DEVCODE = #{devcode} and unix_timestamp(uptime) &lt; unix_timestamp(#{date})
+        WHERE DEVCODE = #{devcode}
         order by DATE desc limit 1
     </select>
 
@@ -43,6 +43,14 @@
         VALUES (#{dataDay.wellCode}, #{dataDay.devCode}, #{dataDay.flowAccDate}, #{dataDay.flowAcc}, #{dataDay.date})
     </insert>
 
+    <update id="updateDataWatermeterDay" parameterType="Map">
+        UPDATE data_watermeter_day
+        SET FLOW_ACC = #{dataDay.flowAcc}, FLOW_ACC_DATE = #{dataDay.flowAccDate}
+        WHERE  DATE = #{dataDay.date}
+        AND WELL_CODE= #{dataDay.wellCode}
+        AND DEVCODE=#{dataDay.devCode}
+    </update>
+
     <select id="isExistDataWatermeterMonth" resultType="map">
         SELECT ID as id, WELL_CODE as wellCode, DEVCODE as devCode, FLOW_ACC_MONTH as flowAccMonth, FIRST_ACC as firstAcc, LAST_ACC as lastAcc, MONTH as month
         FROM data_watermeter_month
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
index 16d03e1..18e6657 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
@@ -7,18 +7,16 @@
 import com.casic.missiles.modular.system.model.DataGasFlow;
 import com.casic.missiles.modular.system.model.DataGasFlowDay;
 import com.casic.missiles.modular.system.model.DataGasFlowMonth;
-import com.casic.missiles.modular.system.model.DataWaterMeter;
 import com.casic.missiles.modular.system.service.IGasFlowDataService;
-import lombok.extern.java.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -36,17 +34,13 @@
     @Override
     @Transactional
     public double saveGasFlowData(DataGasFlow dataGasFlow) {
-
-
         // 用于返回的日用气量
         double totalFlowDayRet = 0.0;
-
         // 日用气量
         DataGasFlowDay gasFlowDay = new DataGasFlowDay();
         gasFlowDay.setWellCode(dataGasFlow.getWellCode());
         gasFlowDay.setDevcode(dataGasFlow.getDevcode());
         gasFlowDay.setDate(sdfDate.format(dataGasFlow.getUptime()));
-
         // 月用气量
         DataGasFlowMonth gasFlowMonth = new DataGasFlowMonth();
         gasFlowMonth.setWellCode(dataGasFlow.getWellCode());
@@ -56,56 +50,38 @@
         Map<String, Object> lastDayAcc = this.selectLatestDayAccByDevice(dataGasFlow.getDevcode(), sdfDate.format(dataGasFlow.getUptime()));
         // 1. 保存原始记录
         this.baseMapper.insert(dataGasFlow);
+        Calendar lastDay = Calendar.getInstance();
         if (null != lastDayAcc) {
+            try {
+                lastDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
+            } catch (Exception ex) {
+                log.error("主题:供气表接收展示，日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex);
+            }
+            gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
+            gasFlowMonth.setMonth(sdfDate.format(lastDay.getTime()).substring(0, 7));
             Calendar today = Calendar.getInstance();
             today.setTime(dataGasFlow.getUptime());
-            today.set(Calendar.HOUR, 0);
-            today.set(Calendar.MINUTE, 0);
-            today.set(Calendar.SECOND, 0);
-            try {
-                Calendar lastDay = Calendar.getInstance();
-                lastDay.setTime(sdfDate.parse(lastDayAcc.get("DATE").toString()));
-                // 计算间隔天数
-                long delta = today.getTimeInMillis() - lastDay.getTimeInMillis();
-                int dateDelta = (int) (delta / (3600 * 24 * 1000));
-                long delhour = delta / (3600 * 1000);
-                log.debug("时间1" + today.getTimeInMillis() + "时间2" + lastDay.getTimeInMillis() + "-------------today" + today.get(Calendar.DATE) + "最后一天" + lastDay.get(Calendar.DATE) + "相差小时" + delhour);
-                // 计算与上一条日用气量的差值
-                Double totalFlowDelta = Double.parseDouble(dataGasFlow.getTotalFlow()) - Double.parseDouble(lastDayAcc.get("totalFlow").toString());
-                //如果间隔为0，可能是同一天，或者是间隔一天，进行天的进一步判断
-                if (dateDelta == 0) {
-                    long dayDel = today.get(Calendar.DATE) - lastDay.get(Calendar.DATE);
-                    if (dayDel == 1) {
-                        // 间隔一天 日用水量=差值
-                        totalFlowDayRet = totalFlowDelta / delhour * 24;
-                        gasFlowDay.setTotalFlowDate(df2.format(totalFlowDelta));
-                        intervalOfDayGasFlow(gasFlowDay, today, lastDayAcc, gasFlowMonth, dataGasFlow);
-                    }
-                }
-                // 时间间隔为1天
-                if (dateDelta == 1) {
-                    // 间隔一天 日用气量=差值
-                    totalFlowDayRet = totalFlowDelta / delhour * 24;
-                    // 当日用气量 = 当日气表读数 - 昨日气表读数
-                    gasFlowDay.setTotalFlowDate(df2.format(totalFlowDayRet));
-                    intervalOfDayGasFlow(gasFlowDay, today, lastDayAcc, gasFlowMonth, dataGasFlow);
-                } else {
-                    intervalManyDayGasFlow(gasFlowDay, lastDay, lastDayAcc, gasFlowMonth, totalFlowDelta, delhour, dateDelta);
-                }
-            } catch (Exception ex) {
-                ex.printStackTrace();
+            // 计算与上一条日用气量的差值
+            Double totalFlowDelta = Double.parseDouble(dataGasFlow.getTotalFlow()) - Double.parseDouble(lastDayAcc.get("totalFlow").toString());
+
+            // 计算间隔天数
+            long delta = today.getTimeInMillis() - lastDay.getTimeInMillis();
+            long dayDel = today.get(Calendar.DATE) - lastDay.get(Calendar.DATE);
+            // 计算间隔时差
+            long delhour = delta / (3600 * 1000);
+            int dateDelta = (int) delhour / 24;
+            totalFlowDayRet = totalFlowDelta / delhour * 24;
+            //如果间隔为0，可能是同一天，或者是间隔一天，进行天的进一步判断
+            if (dayDel == 0 && dateDelta == 0 && delhour > 0) {
+                noIntervalDayGasFlow(gasFlowDay, lastDayAcc, totalFlowDayRet, totalFlowDelta, gasFlowMonth, dataGasFlow);
+            } else if (dayDel == 1||dateDelta == 1 ) {
+                intervalOfDayGasFlow(gasFlowDay, lastDay, totalFlowDayRet, totalFlowDelta, lastDayAcc, gasFlowMonth, dataGasFlow);
+            } else {
+                intervalManyDayGasFlow(gasFlowDay, lastDay, lastDayAcc, gasFlowMonth, totalFlowDayRet, delhour, dateDelta);
             }
         } else {
-            // 没有找到最近的日用气量记录 则新增日及月用气量
-            gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
-            gasFlowDay.setTotalFlowDate(dataGasFlow.getTotalFlow());
-            dataGasFlowDayMapper.insert(gasFlowDay);
-            // 没有上一条记录 日用气量 = 当前读数
-            totalFlowDayRet = Double.parseDouble(dataGasFlow.getTotalFlow());
-            gasFlowMonth.setTotalFlowMonth(dataGasFlow.getTotalFlow());
-            gasFlowMonth.setFirstTotal("0");
-            gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
-            dataGasFlowMonthMapper.insert(gasFlowMonth);
+            lastDay.setTime(dataGasFlow.getUptime());
+            totalFlowDayRet = initFlowGas(gasFlowDay, dataGasFlow, gasFlowMonth);
         }
         return totalFlowDayRet;
     }
@@ -115,41 +91,81 @@
         return this.baseMapper.selectLatestDayAccByDevice(devcode, date);
     }
 
+    /**
+     * 没有间隔
+     */
+    private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay, Map<String, Object> lastDayAcc, Double flowAccDayRet,
+                                      Double flowAccDelta, DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
+        gasFlowDay.setTotalFlowDate(dataGasFlow.getTotalFlow());
+        gasFlowDay.setTotalFlow(df2.format(flowAccDayRet));
+        this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getDevcode(), gasFlowDay.getDate(),
+                gasFlowDay.getTotalFlow(), gasFlowDay.getTotalFlowDate());
+        // 更新月用气量
+        Map<String, Object> monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
+        if (null != monthExist) {
+            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + flowAccDelta));
+            gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
+            gasFlowMonth.setId((Long) monthExist.get("id"));
+            dataGasFlowMonthMapper.updateById(gasFlowMonth);
+        } else {
+            gasFlowMonth.setTotalFlowMonth(flowAccDelta.toString());
+            gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
+            gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
+            dataGasFlowMonthMapper.insert(gasFlowMonth);
+        }
+    }
+
+    /**
+     * 间隔一天
+     */
     private void intervalOfDayGasFlow(DataGasFlowDay gasFlowDay,
-                                      Calendar today, Map<String, Object> lastDayAcc,
-                                      DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
+                                      Calendar lastDay,
+                                      Double flowAccDayRet,
+                                      Double flowAccDelta,
+                                      Map<String, Object> lastDayAcc,
+                                      DataGasFlowMonth gasFlowMonth,
+                                      DataGasFlow dataGasFlow) {
+        // 更新月用水量
+        lastDay.add(Calendar.DATE, 1);
+        gasFlowDay.setDate(sdfDate.format(lastDay.getTime()));
+        gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
         gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
         dataGasFlowDayMapper.insert(gasFlowDay);
-        if (today.get(Calendar.DATE) == 1) {
-            // 是每月的第一天 则新增月用气量
-            gasFlowMonth.setTotalFlowMonth(gasFlowDay.getTotalFlowDate());
-            gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());// 初始累积值为上个月的最后一个累积值
+        if (lastDay.get(Calendar.DATE) == 1) {
+            gasFlowMonth.setTotalFlowMonth(flowAccDelta.toString());
+            gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
             gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
             dataGasFlowMonthMapper.insert(gasFlowMonth);
         } else {
             // 更新月用气量
             Map<String, Object> monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
             if (null != monthExist) {
-                gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString())
-                        + Double.parseDouble(gasFlowDay.getTotalFlowDate())));
+                gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + flowAccDelta));
                 gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
                 gasFlowMonth.setId((Long) monthExist.get("id"));
                 dataGasFlowMonthMapper.updateById(gasFlowMonth);
             } else {
-                gasFlowMonth.setTotalFlowMonth(gasFlowDay.getTotalFlowDate());
-                gasFlowMonth.setFirstTotal("0");
+                gasFlowMonth.setTotalFlowMonth(flowAccDelta.toString());
+                gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
                 gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
                 dataGasFlowMonthMapper.insert(gasFlowMonth);
             }
         }
     }
 
-    private void intervalManyDayGasFlow(DataGasFlowDay gasFlowDay, Calendar lastDay, Map<String, Object> lastDayAcc, DataGasFlowMonth gasFlowMonth, double flowAccDelta, long delhour, int dayDelta) {
-        // 间隔多天平均值
-        double avgFlowDay = flowAccDelta / delhour * 24;
+    /**
+     * 间隔多天
+     */
+    private void intervalManyDayGasFlow(DataGasFlowDay gasFlowDay,
+                                        Calendar lastDay, Map<String, Object> lastDayAcc,
+                                        DataGasFlowMonth gasFlowMonth,
+                                        double avgFlowDay,
+                                        long delhour,
+                                        int dayDelta) {
+        Map<String, Object> monthExist = new HashMap<>();
         for (int i = 0; i < dayDelta; i++) {
             Double totalFlow = Double.parseDouble(lastDayAcc.get("totalFlow").toString()) + avgFlowDay * (i + 1);
-            gasFlowDay.setTotalFlow(df2.format(totalFlow.toString()));
+            gasFlowDay.setTotalFlow(totalFlow.toString());
             // 当日用气量 = （当日气表读数 - 昨日气表读数） / 天数
             gasFlowDay.setTotalFlowDate(df2.format(avgFlowDay));
             lastDay.add(Calendar.DATE, 1);
@@ -164,7 +180,7 @@
                 dataGasFlowMonthMapper.insert(gasFlowMonth);
             } else {
                 // 更新月用气量
-                Map<String, Object> monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
+                monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
                 if (null != monthExist) {
                     gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString()) + avgFlowDay));
                     gasFlowMonth.setEndTotal(gasFlowDay.getTotalFlow());
@@ -172,11 +188,37 @@
                     dataGasFlowMonthMapper.updateById(gasFlowMonth);
                 } else {
                     gasFlowMonth.setTotalFlowMonth(gasFlowDay.getTotalFlowDate());
-                    gasFlowMonth.setFirstTotal("0");
+                    gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
                     gasFlowMonth.setEndTotal(gasFlowDay.getTotalFlow());
                     dataGasFlowMonthMapper.insert(gasFlowMonth);
                 }
             }
         }
+        if (dayDelta != 0) {
+            //修正月统计最后的累计
+            Double lastTimeDiff = avgFlowDay + Double.valueOf(dayDelta * 24 - delhour) / 24 * avgFlowDay;
+            //更新最后月累计量
+            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString())+lastTimeDiff));
+            dataGasFlowMonthMapper.updateById(gasFlowMonth);
+        }
+    }
+
+    /**
+     * 之前没有记录
+     */
+    private Double initFlowGas(DataGasFlowDay gasFlowDay,
+                               DataGasFlow dataGasFlow,
+                               DataGasFlowMonth gasFlowMonth) {
+        // 没有找到最近的日用气量记录 则新增日及月用气量
+        gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
+        gasFlowDay.setTotalFlowDate(dataGasFlow.getTotalFlow());
+        dataGasFlowDayMapper.insert(gasFlowDay);
+        // 没有上一条记录 日用气量 = 当前读数
+        Double totalFlowDayRet = Double.parseDouble(dataGasFlow.getTotalFlow());
+        gasFlowMonth.setTotalFlowMonth(dataGasFlow.getTotalFlow());
+        gasFlowMonth.setFirstTotal("0");
+        gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
+        dataGasFlowMonthMapper.insert(gasFlowMonth);
+        return totalFlowDayRet;
     }
 }
\ No newline at end of file
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
index 17366ce..5f09884 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.system.service.IWaterMeterDataService;
 import lombok.extern.java.Log;
 import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomUtils;
 import org.hswebframework.utils.RandomUtil;
 import org.springframework.stereotype.Service;
@@ -20,7 +21,7 @@
 import java.util.Random;
 
 @Service
-@Log4j
+@Slf4j
 public class WaterMeterDataServiceImpl extends ServiceImpl<DataWaterMeterMapper, DataWaterMeter> implements IWaterMeterDataService {
 
     private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -51,56 +52,32 @@
         Calendar lastDay = Calendar.getInstance();
         if (null != lastDayAcc) {
             try {
-                lastDay.setTime(sdfDate.parse(lastDayAcc.get("uptime").toString()));
+                lastDay.setTime(sdf.parse(lastDayAcc.get("uptime").toString()));
             } catch (Exception ex) {
-                log.error("主题:水表列表展示，日期转换出错，异常信息{}", ex);
+                log.error("主题:水表数据接收日期转换出错{}，异常信息{}", lastDayAcc.get("uptime").toString(), ex);
             }
             waterMeterDay.put("date", sdfDate.format(lastDay.getTime()));
             waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7));
             Calendar today = Calendar.getInstance();
             today.setTime(dataWaterMeter.getUptime());
-            today.set(Calendar.HOUR, 0);
-            today.set(Calendar.MINUTE, 0);
-            today.set(Calendar.SECOND, 0);
-            // 计算间隔天数
-            long delta = today.getTimeInMillis() - lastDay.getTimeInMillis();
-            int dateDelta = (int) (delta / (3600 * 24 * 1000));
-            log.debug("前一天的----" + dataWaterMeter.getFlowAcc() + "最后一天的-------" + lastDayAcc.get("flowAcc"));
             // 计算与上一条日用水量的差值
             Double flowAccDelta = Double.parseDouble(dataWaterMeter.getFlowAcc()) - Double.parseDouble(lastDayAcc.get("flowAcc").toString());
+            long delta = today.getTimeInMillis() - lastDay.getTimeInMillis();
+            long dayDel = today.get(Calendar.DATE) - lastDay.get(Calendar.DATE);
             long delhour = delta / (3600 * 1000);
-            log.debug("时间1" + today.getTimeInMillis() + "时间2" + lastDay.getTimeInMillis() + "---------------------today" + today.get(Calendar.DATE) + "最后一天" + lastDay.get(Calendar.DATE) + "相差小时" + delhour);
-            //如果间隔为0，可能是同一天，或者是间隔一天，进行天的进一步判断
-            if (dateDelta == 0) {
-                long dayDel = today.get(Calendar.DATE) - lastDay.get(Calendar.DATE);
-                if (dayDel == 1) {
-                    // 间隔一天 日用水量=差值
-                    flowAccDayRet = flowAccDelta / delhour * 24;
-                    waterMeterDay.put("flowAccDate", df2.format(flowAccDayRet));
-                    intervalOfDayWaterMeter(waterMeterDay, lastDayAcc, waterMeterMonth, dataWaterMeter);
-                }
-            }
-            // 时间间隔为1天
-            if (dateDelta == 1) {
-                // 间隔一天 日用水量=差值
-                flowAccDayRet = flowAccDelta / delhour * 24;
-                waterMeterDay.put("flowAccDate", df2.format(flowAccDayRet));
-                intervalOfDayWaterMeter(waterMeterDay, lastDayAcc, waterMeterMonth, dataWaterMeter);
+            int dateDelta = (int) delhour / 24;
+            //如果间隔为1，可能是同一天，或者是间隔一天，进行时差的进一步判断
+            flowAccDayRet = flowAccDelta / delhour * 24;
+            if (dayDel == 0 && dateDelta == 0 && delhour > 0) {
+                noIntervalDayWaterMeter(waterMeterDay, lastDayAcc, flowAccDayRet, flowAccDelta, waterMeterMonth, dataWaterMeter);
+            } else if (dayDel == 1|| dateDelta == 1 ) {
+                intervalOfDayWaterMeter(waterMeterDay, lastDay, flowAccDayRet, flowAccDelta, lastDayAcc, waterMeterMonth, dataWaterMeter);
             } else {
-                intervalManyDayWaterMeter(waterMeterDay, lastDay, lastDayAcc, waterMeterMonth, flowAccDelta, delhour, dateDelta);
+                intervalManyDayWaterMeter(waterMeterDay, flowAccDayRet, lastDay, lastDayAcc, waterMeterMonth, delhour, dateDelta);
             }
         } else {
-            waterMeterDay.put("date", sdfDate.format(lastDay.getTime()));
-            waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7));
-            // 没有找到最近的日用水量记录 则新增日及月用水量
-            waterMeterDay.put("flowAcc", dataWaterMeter.getFlowAcc());
-            waterMeterDay.put("flowAccDate", dataWaterMeter.getFlowAcc());
-            this.baseMapper.insertDataWatermeterDay(waterMeterDay);
-            flowAccDayRet = Double.parseDouble(dataWaterMeter.getFlowAcc());
-            waterMeterMonth.put("flowAccMonth", dataWaterMeter.getFlowAcc());
-            waterMeterMonth.put("firstAcc", 0);
-            waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
-            this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
+            lastDay.setTime(dataWaterMeter.getUptime());
+            flowAccDayRet = initWaterMeter(waterMeterDay, waterMeterMonth, lastDay, dataWaterMeter);
         }
         return flowAccDayRet;
     }
@@ -111,43 +88,83 @@
     }
 
     /**
-     * @param waterMeterDay
-     * @param lastDayAcc
-     * @param waterMeterMonth
-     * @param dataWaterMeter
+     * 间隔0天,更新记录
      */
-    private void intervalOfDayWaterMeter(Map<String, Object> waterMeterDay,
+    private void noIntervalDayWaterMeter(Map<String, Object> waterMeterDay,
                                          Map<String, Object> lastDayAcc,
+                                         Double flowAccDayRet,
+                                         Double flowAccDelta,
                                          Map<String, Object> waterMeterMonth, DataWaterMeter dataWaterMeter) {
+        waterMeterDay.put("flowAccDate", df2.format(flowAccDayRet));
         waterMeterDay.put("flowAcc", dataWaterMeter.getFlowAcc()); // 当日水表读数
         // 当日用水量 = 当日水表读数 - 昨日水表读数
-        this.baseMapper.insertDataWatermeterDay(waterMeterDay);
-        // 更新月用水量
+        this.baseMapper.updateDataWatermeterDay(waterMeterDay);
         Map<String, Object> monthExist = this.baseMapper.isExistDataWatermeterMonth(waterMeterMonth.get("devCode").toString(), waterMeterMonth.get("month").toString());
         if (null != monthExist) {
-            waterMeterMonth.put("flowAccMonth", df2.format(Double.parseDouble(monthExist.get("flowAccMonth").toString()) + Double.parseDouble(waterMeterDay.get("flowAccDate").toString())));
+            waterMeterMonth.put("flowAccMonth", df2.format(Double.parseDouble(monthExist.get("flowAccMonth").toString()) + flowAccDelta));
             waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
             this.baseMapper.updateDataWatermeterMonth(waterMeterMonth, (Long) monthExist.get("id"));
         } else {
-            waterMeterMonth.put("flowAccMonth", waterMeterDay.get("flowAccDate"));
+            waterMeterMonth.put("flowAccMonth", flowAccDelta);
             waterMeterMonth.put("firstAcc", lastDayAcc.get("flowAcc").toString()); // 初始累积值为上个月的最后一个累积值
             waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
             this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
         }
     }
 
+    /**
+     * 间隔一天，可能存在不满24小时情况,不能用天作为月累计
+     */
+    private void intervalOfDayWaterMeter(Map<String, Object> waterMeterDay,
+                                         Calendar lastDay,
+                                         Double flowAccDayRet,
+                                         Double flowAccDelta,
+                                         Map<String, Object> lastDayAcc,
+                                         Map<String, Object> waterMeterMonth, DataWaterMeter dataWaterMeter) {
+        // 更新月用水量
+        lastDay.add(Calendar.DATE, 1);
+        waterMeterDay.put("date", sdfDate.format(lastDay.getTime()));
+        waterMeterDay.put("flowAccDate", df2.format(flowAccDayRet));
+        waterMeterDay.put("flowAcc", dataWaterMeter.getFlowAcc()); // 当日水表读数
+        // 当日用水量 = 当日水表读数 - 昨日水表读数
+        this.baseMapper.insertDataWatermeterDay(waterMeterDay);
+        if (lastDay.get(Calendar.DATE) == 1) {
+            // 是每月的第一天 则新增月用水量
+            waterMeterMonth.put("flowAccMonth", flowAccDelta);
+            waterMeterMonth.put("firstAcc", lastDayAcc.get("flowAcc").toString()); // 初始累积值为上个月的最后一个累积值
+            waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
+            this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
+        } else {
+            Map<String, Object> monthExist = this.baseMapper.isExistDataWatermeterMonth(waterMeterMonth.get("devCode").toString(), waterMeterMonth.get("month").toString());
+            if (null != monthExist) {
+                waterMeterMonth.put("flowAccMonth", df2.format(Double.parseDouble(monthExist.get("flowAccMonth").toString()) + flowAccDelta));
+                waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
+                this.baseMapper.updateDataWatermeterMonth(waterMeterMonth, (Long) monthExist.get("id"));
+            } else {
+                waterMeterMonth.put("flowAccMonth", flowAccDelta);
+                waterMeterMonth.put("firstAcc", lastDayAcc.get("flowAcc").toString()); // 初始累积值为上个月的最后一个累积值
+                waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
+                this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
+            }
+        }
+    }
+
+    /**
+     * 间隔多天
+     */
     private void intervalManyDayWaterMeter(Map<String, Object> waterMeterDay,
+                                           Double avgFlowAccDay,
                                            Calendar lastDay, Map<String, Object> lastDayAcc,
-                                           Map<String, Object> waterMeterMonth, Double flowAccDelta, Long dateHour, int dayDelta) {
-        // 间隔多天平均值
-        double avgFlowAccDay = flowAccDelta / dateHour * 24;
+                                           Map<String, Object> waterMeterMonth, Long dateHour, int dayDelta) {
+        // 更新月用水量
+        Map<String, Object> monthExist = new HashMap<>();
         for (int i = 0; i < dayDelta; i++) {
             waterMeterDay.put("flowAcc", df2.format(Double.parseDouble(lastDayAcc.get("flowAcc").toString()) + avgFlowAccDay * (i + 1))); // 当日水表读数
             // 当日用水量 = （当日水表读数 - 昨日水表读数） / 天数
             waterMeterDay.put("flowAccDate", df2.format(avgFlowAccDay));
             lastDay.add(Calendar.DATE, 1);
             waterMeterDay.put("date", sdfDate.format(lastDay.getTime()));
-             this.baseMapper.insertDataWatermeterDay(waterMeterDay);
+            this.baseMapper.insertDataWatermeterDay(waterMeterDay);
             waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7));
             if (lastDay.get(Calendar.DATE) == 1) {
                 // 是每月的第一天 则新增月用水量
@@ -157,7 +174,7 @@
                 this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
             } else {
                 // 更新月用水量
-                Map<String, Object> monthExist = this.baseMapper.isExistDataWatermeterMonth(waterMeterMonth.get("devCode").toString(), waterMeterMonth.get("month").toString());
+                monthExist = this.baseMapper.isExistDataWatermeterMonth(waterMeterMonth.get("devCode").toString(), waterMeterMonth.get("month").toString());
                 if (null != monthExist) {
                     waterMeterMonth.put("flowAccMonth", df2.format(Double.parseDouble(monthExist.get("flowAccMonth").toString()) + avgFlowAccDay));
                     waterMeterMonth.put("lastAcc", waterMeterDay.get("flowAcc"));
@@ -170,7 +187,32 @@
                 }
             }
         }
+        if (dayDelta != 0) {
+            //修正月统计最后的累计
+            Double lastTimeDiff = avgFlowAccDay + Double.valueOf(dayDelta * 24 - dateHour) / 24 * avgFlowAccDay;
+            //更新最后月累计量
+            waterMeterMonth.put("flowAccMonth", df2.format(Double.parseDouble(monthExist.get("flowAccMonth").toString()) + lastTimeDiff));
+            this.baseMapper.updateDataWatermeterMonth(waterMeterMonth, (Long) monthExist.get("id"));
+        }
+    }
 
+    /**
+     * 之前没有记录
+     */
+    private Double initWaterMeter(Map<String, Object> waterMeterDay,
+                                  Map<String, Object> waterMeterMonth, Calendar lastDay, DataWaterMeter dataWaterMeter) {
+        waterMeterDay.put("date", sdfDate.format(lastDay.getTime()));
+        waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7));
+        // 没有找到最近的日用水量记录 则新增日及月用水量
+        waterMeterDay.put("flowAcc", dataWaterMeter.getFlowAcc());
+        waterMeterDay.put("flowAccDate", dataWaterMeter.getFlowAcc());
+        this.baseMapper.insertDataWatermeterDay(waterMeterDay);
+        Double flowAccDayRet = Double.parseDouble(dataWaterMeter.getFlowAcc());
+        waterMeterMonth.put("flowAccMonth", dataWaterMeter.getFlowAcc());
+        waterMeterMonth.put("firstAcc", 0);
+        waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
+        this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
+        return flowAccDayRet;
     }
 
 }