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 6e1c63b..a277471 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +21,10 @@
 public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
 
     DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+    Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
+    Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void insertDataWatermeterDay(@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/DataWaterMeterMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
index 6e1c63b..a277471 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +21,10 @@
 public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
 
     DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+    Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
+    Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void insertDataWatermeterDay(@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/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index d07dbda..3f5865b 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
@@ -26,6 +26,34 @@
         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
     </select>
+    
+    <select id="selectLatestDayAccByDevice" resultType="map">
+        SELECT DEVCODE, FLOW_ACC_DATE as flowAccDate, DATE, FLOW_ACC as flowAcc
+        FROM data_watermeter_day
+        WHERE DEVCODE = #{devcode} AND unix_timestamp(DATE) &lt; unix_timestamp(#{date}) order by DATE desc limit 1
+    </select>
+
+    <insert id="insertDataWatermeterDay" parameterType="Map">
+        INSERT INTO data_watermeter_day (WELL_CODE, DEVCODE, FLOW_ACC_DATE, FLOW_ACC, DATE)
+        VALUES (#{dataDay.wellCode}, #{dataDay.devCode}, #{dataDay.flowAccDate}, #{dataDay.flowAcc}, #{dataDay.date})
+    </insert>
+
+    <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
+        WHERE DEVCODE = #{devcode} and MONTH = #{month}
+        LIMIT 1
+    </select>
+
+    <insert id="insertDataWatermeterMonth" parameterType="Map">
+        INSERT INTO data_watermeter_month (WELL_CODE, DEVCODE, FLOW_ACC_MONTH, FIRST_ACC, LAST_ACC, MONTH)
+        VALUES (#{dataMonth.wellCode}, #{dataMonth.devCode}, #{dataMonth.flowAccMonth}, #{dataMonth.firstAcc}, #{dataMonth.lastAcc}, #{dataMonth.month})
+    </insert>
+
+    <update id="updateDataWatermeterMonth" parameterType="Map">
+        UPDATE data_watermeter_month SET FLOW_ACC_MONTH = #{dataMonth.flowAccMonth}, LAST_ACC = #{dataMonth.lastAcc}
+        WHERE ID = #{id}
+    </update>
 
 
     <select id="selectDataScopePage" resultType="com.casic.missiles.modular.system.model.BusWellInfo"

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 6e1c63b..a277471 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +21,10 @@
 public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
 
     DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+    Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
+    Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void insertDataWatermeterDay(@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/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index d07dbda..3f5865b 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
@@ -26,6 +26,34 @@
         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
     </select>
+    
+    <select id="selectLatestDayAccByDevice" resultType="map">
+        SELECT DEVCODE, FLOW_ACC_DATE as flowAccDate, DATE, FLOW_ACC as flowAcc
+        FROM data_watermeter_day
+        WHERE DEVCODE = #{devcode} AND unix_timestamp(DATE) &lt; unix_timestamp(#{date}) order by DATE desc limit 1
+    </select>
+
+    <insert id="insertDataWatermeterDay" parameterType="Map">
+        INSERT INTO data_watermeter_day (WELL_CODE, DEVCODE, FLOW_ACC_DATE, FLOW_ACC, DATE)
+        VALUES (#{dataDay.wellCode}, #{dataDay.devCode}, #{dataDay.flowAccDate}, #{dataDay.flowAcc}, #{dataDay.date})
+    </insert>
+
+    <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
+        WHERE DEVCODE = #{devcode} and MONTH = #{month}
+        LIMIT 1
+    </select>
+
+    <insert id="insertDataWatermeterMonth" parameterType="Map">
+        INSERT INTO data_watermeter_month (WELL_CODE, DEVCODE, FLOW_ACC_MONTH, FIRST_ACC, LAST_ACC, MONTH)
+        VALUES (#{dataMonth.wellCode}, #{dataMonth.devCode}, #{dataMonth.flowAccMonth}, #{dataMonth.firstAcc}, #{dataMonth.lastAcc}, #{dataMonth.month})
+    </insert>
+
+    <update id="updateDataWatermeterMonth" parameterType="Map">
+        UPDATE data_watermeter_month SET FLOW_ACC_MONTH = #{dataMonth.flowAccMonth}, LAST_ACC = #{dataMonth.lastAcc}
+        WHERE ID = #{id}
+    </update>
 
 
     <select id="selectDataScopePage" resultType="com.casic.missiles.modular.system.model.BusWellInfo"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java
index 2ed6970..71ed7ba 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java
@@ -8,8 +8,6 @@
 public interface IWaterMeterDataService extends IService<DataWaterMeter> {
 
     boolean saveWaterMeterData(DataWaterMeter dataWaterMeter);
-    boolean insertWaterMeterDay(Map<String, Object> waterMeterDay);
-    boolean updateWaterMeterMonth(Map<String, Object> waterMeterMonth);
 
-    DataWaterMeter selectLatestRecordByDevcode(String devcode, String uptime);
+    Map<String, Object> selectLatestDayAccByDevice(String devcode, String date);
 }

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 6e1c63b..a277471 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +21,10 @@
 public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
 
     DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+    Map<String, Object> selectLatestDayAccByDevice(@Param("devcode") String devcode, @Param("date") String date);
+    Map<String, Object> isExistDataWatermeterMonth(@Param("devcode") String devcode, @Param("month") String month);
+
+    void insertDataWatermeterDay(@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/DataWaterMeterMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
index d07dbda..3f5865b 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
@@ -26,6 +26,34 @@
         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
     </select>
+    
+    <select id="selectLatestDayAccByDevice" resultType="map">
+        SELECT DEVCODE, FLOW_ACC_DATE as flowAccDate, DATE, FLOW_ACC as flowAcc
+        FROM data_watermeter_day
+        WHERE DEVCODE = #{devcode} AND unix_timestamp(DATE) &lt; unix_timestamp(#{date}) order by DATE desc limit 1
+    </select>
+
+    <insert id="insertDataWatermeterDay" parameterType="Map">
+        INSERT INTO data_watermeter_day (WELL_CODE, DEVCODE, FLOW_ACC_DATE, FLOW_ACC, DATE)
+        VALUES (#{dataDay.wellCode}, #{dataDay.devCode}, #{dataDay.flowAccDate}, #{dataDay.flowAcc}, #{dataDay.date})
+    </insert>
+
+    <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
+        WHERE DEVCODE = #{devcode} and MONTH = #{month}
+        LIMIT 1
+    </select>
+
+    <insert id="insertDataWatermeterMonth" parameterType="Map">
+        INSERT INTO data_watermeter_month (WELL_CODE, DEVCODE, FLOW_ACC_MONTH, FIRST_ACC, LAST_ACC, MONTH)
+        VALUES (#{dataMonth.wellCode}, #{dataMonth.devCode}, #{dataMonth.flowAccMonth}, #{dataMonth.firstAcc}, #{dataMonth.lastAcc}, #{dataMonth.month})
+    </insert>
+
+    <update id="updateDataWatermeterMonth" parameterType="Map">
+        UPDATE data_watermeter_month SET FLOW_ACC_MONTH = #{dataMonth.flowAccMonth}, LAST_ACC = #{dataMonth.lastAcc}
+        WHERE ID = #{id}
+    </update>
 
 
     <select id="selectDataScopePage" resultType="com.casic.missiles.modular.system.model.BusWellInfo"
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java
index 2ed6970..71ed7ba 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java
@@ -8,8 +8,6 @@
 public interface IWaterMeterDataService extends IService<DataWaterMeter> {
 
     boolean saveWaterMeterData(DataWaterMeter dataWaterMeter);
-    boolean insertWaterMeterDay(Map<String, Object> waterMeterDay);
-    boolean updateWaterMeterMonth(Map<String, Object> waterMeterMonth);
 
-    DataWaterMeter selectLatestRecordByDevcode(String devcode, String uptime);
+    Map<String, Object> selectLatestDayAccByDevice(String devcode, String date);
 }
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 66765ea..1d77a78 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
@@ -8,8 +8,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.Calendar;
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -17,6 +19,8 @@
 public class WaterMeterDataServiceImpl extends ServiceImpl<DataWaterMeterMapper, DataWaterMeter> implements IWaterMeterDataService {
 
     private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+    private DecimalFormat df2 = new DecimalFormat("0.00");
 
     @Override
     @Transactional
@@ -24,36 +28,118 @@
         // 1. 保存原始记录
         this.baseMapper.insert(dataWaterMeter);
 
-        // 2. 查询上一个最近的原始记录
-        DataWaterMeter lastRec = this.selectLatestRecordByDevcode(dataWaterMeter.getDevcode(), sdf.format(dataWaterMeter.getUptime()));
-        if (null != lastRec) {
-            double lastFlowAcc = Double.parseDouble(lastRec.getFlowAcc());
-            Date lastTime = lastRec.getUptime();
+        // 日用水量
+        Map<String, Object> waterMeterDay = new HashMap<>();
+        waterMeterDay.put("wellCode", dataWaterMeter.getWellCode());
+        waterMeterDay.put("devCode", dataWaterMeter.getDevcode());
+        waterMeterDay.put("date", sdfDate.format(dataWaterMeter.getUptime()));
 
-            double flowAccDelt = Double.parseDouble(dataWaterMeter.getFlowAcc()) - lastFlowAcc;
-            long tmDelt = dataWaterMeter.getUptime().getTime() - lastTime.getTime();
+        // 月用水量
+        Map<String, Object> waterMeterMonth = new HashMap<>();
+        waterMeterMonth.put("wellCode", dataWaterMeter.getWellCode());
+        waterMeterMonth.put("devCode", dataWaterMeter.getDevcode());
+        waterMeterMonth.put("month", sdfDate.format(dataWaterMeter.getUptime()).substring(0, 7));
 
-            // 计算日用水量
+        // 2. 查询上一个最近的日用水量记录
+        Map<String, Object> lastDayAcc = this.selectLatestDayAccByDevice(dataWaterMeter.getDevcode(), sdfDate.format(dataWaterMeter.getUptime()));
+        if (null != lastDayAcc) {
+            Calendar today = Calendar.getInstance();
+            today.setTime(dataWaterMeter.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));
 
-            // 计算和刷新月累计用水量
+                Double flowAccDelta = Double.parseDouble(dataWaterMeter.getFlowAcc()) - Double.parseDouble(lastDayAcc.get("flowAcc").toString());
+
+                // 时间间隔为1天
+                if (dateDelta == 1) {
+                    waterMeterDay.put("flowAcc", dataWaterMeter.getFlowAcc()); // 当日水表读数
+                    // 当日用水量 = 当日水表读数 - 昨日水表读数
+                    waterMeterDay.put("flowAccDate", df2.format(flowAccDelta));
+                    this.baseMapper.insertDataWatermeterDay(waterMeterDay);
+
+                    if (today.get(Calendar.DATE) == 1) {
+                        // 是每月的第一天 则新增月用水量
+                        waterMeterMonth.put("flowAccMonth", waterMeterDay.get("flowAccDate"));
+                        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()) + Double.parseDouble(waterMeterDay.get("flowAccDate").toString())));
+                            waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
+
+                            this.baseMapper.updateDataWatermeterMonth(waterMeterMonth, (Long) monthExist.get("id"));
+                        } else {
+                            waterMeterMonth.put("flowAccMonth", waterMeterDay.get("flowAccDate"));
+                            waterMeterMonth.put("firstAcc", 0);
+                            waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
+                            this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
+                        }
+                    }
+                } else {
+                    // 间隔多天
+                    double avgFlowAccDay = flowAccDelta / dateDelta;
+                    for (int i = 0; i < dateDelta; 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);
+
+                        waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7));
+                        if (lastDay.get(Calendar.DATE) == 1) {
+                            // 是每月的第一天 则新增月用水量
+                            waterMeterMonth.put("flowAccMonth", waterMeterDay.get("flowAccDate"));
+                            waterMeterMonth.put("firstAcc", df2.format(Double.parseDouble(lastDayAcc.get("flowAcc").toString()) + avgFlowAccDay * i));
+                            waterMeterMonth.put("lastAcc", waterMeterDay.get("flowAcc"));
+                            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()) + avgFlowAccDay));
+                                waterMeterMonth.put("lastAcc", waterMeterDay.get("flowAcc"));
+
+                                this.baseMapper.updateDataWatermeterMonth(waterMeterMonth, (Long) monthExist.get("id"));
+                            } else {
+                                waterMeterMonth.put("flowAccMonth", waterMeterDay.get("flowAccDate"));
+                                waterMeterMonth.put("firstAcc", 0);
+                                waterMeterMonth.put("lastAcc", waterMeterDay.get("flowAcc"));
+                                this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
+                            }
+                        }
+                    }
+                }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        } else {
+            // 没有找到最近的日用水量记录 则新增日及月用水量
+            waterMeterDay.put("flowAcc", dataWaterMeter.getFlowAcc());
+            waterMeterDay.put("flowAccDate", dataWaterMeter.getFlowAcc());
+            this.baseMapper.insertDataWatermeterDay(waterMeterDay);
+
+            waterMeterMonth.put("flowAccMonth", dataWaterMeter.getFlowAcc());
+            waterMeterMonth.put("firstAcc", 0);
+            waterMeterMonth.put("lastAcc", dataWaterMeter.getFlowAcc());
+            this.baseMapper.insertDataWatermeterMonth(waterMeterMonth);
         }
 
         return true;
     }
 
     @Override
-    public boolean insertWaterMeterDay(Map<String, Object> waterMeterDay) {
-        return false;
-    }
-
-    @Override
-    public boolean updateWaterMeterMonth(Map<String, Object> waterMeterMonth) {
-        return false;
-    }
-
-    @Override
-    public DataWaterMeter selectLatestRecordByDevcode(String devcode, String uptime) {
-        return this.baseMapper.selectLatestRecordByDevcode(devcode, uptime);
+    public Map<String, Object> selectLatestDayAccByDevice(String devcode, String date) {
+        return this.baseMapper.selectLatestDayAccByDevice(devcode, date);
     }
 }