diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index de868cb..16545a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,6 +39,12 @@
           AND WELL_CODE = #{wellCode}
     </select>
 
+    <select id="selectWellByDevcode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT wellId as wellId, wellcode as WELLCODE, DEPTID
+        FROM device_view
+        where VALID = '1' AND DEVCODE = #{devcode}
+    </select>
+
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index de868cb..16545a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,6 +39,12 @@
           AND WELL_CODE = #{wellCode}
     </select>
 
+    <select id="selectWellByDevcode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT wellId as wellId, wellcode as WELLCODE, DEPTID
+        FROM device_view
+        where VALID = '1' AND DEVCODE = #{devcode}
+    </select>
+
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index cee784c..2634c58 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,6 +40,14 @@
      */
     DeviceWellDto selectWellIdByCode(String wellCode);
 
+    /**
+     * 根据设备编号查询关联的闸井ID
+     * from DEVICE_VIEW
+     * @param devcode
+     * @return
+     */
+    DeviceWellDto selectWellByDevcode(String devcode);
+
 
     Device getDeviceByDevCode(String devCode);
 

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index de868cb..16545a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,6 +39,12 @@
           AND WELL_CODE = #{wellCode}
     </select>
 
+    <select id="selectWellByDevcode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT wellId as wellId, wellcode as WELLCODE, DEPTID
+        FROM device_view
+        where VALID = '1' AND DEVCODE = #{devcode}
+    </select>
+
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index cee784c..2634c58 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,6 +40,14 @@
      */
     DeviceWellDto selectWellIdByCode(String wellCode);
 
+    /**
+     * 根据设备编号查询关联的闸井ID
+     * from DEVICE_VIEW
+     * @param devcode
+     * @return
+     */
+    DeviceWellDto selectWellByDevcode(String devcode);
+
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 68632ce..aed1460 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -188,6 +188,11 @@
     }
 
     @Override
+    public DeviceWellDto selectWellByDevcode(String devcode) {
+        return this.baseMapper.selectWellByDevcode(devcode);
+    }
+
+    @Override
     public DeviceConcentratorDto selectDeviceConcentorByCode(String concenCode) {
         return this.baseMapper.selectDeviceConcentorByCode(concenCode);
     }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index de868cb..16545a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,6 +39,12 @@
           AND WELL_CODE = #{wellCode}
     </select>
 
+    <select id="selectWellByDevcode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT wellId as wellId, wellcode as WELLCODE, DEPTID
+        FROM device_view
+        where VALID = '1' AND DEVCODE = #{devcode}
+    </select>
+
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index cee784c..2634c58 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,6 +40,14 @@
      */
     DeviceWellDto selectWellIdByCode(String wellCode);
 
+    /**
+     * 根据设备编号查询关联的闸井ID
+     * from DEVICE_VIEW
+     * @param devcode
+     * @return
+     */
+    DeviceWellDto selectWellByDevcode(String devcode);
+
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 68632ce..aed1460 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -188,6 +188,11 @@
     }
 
     @Override
+    public DeviceWellDto selectWellByDevcode(String devcode) {
+        return this.baseMapper.selectWellByDevcode(devcode);
+    }
+
+    @Override
     public DeviceConcentratorDto selectDeviceConcentorByCode(String concenCode) {
         return this.baseMapper.selectDeviceConcentorByCode(concenCode);
     }
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
new file mode 100644
index 0000000..6e1c63b
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 闸井信息表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
+
+    DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+}

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index de868cb..16545a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,6 +39,12 @@
           AND WELL_CODE = #{wellCode}
     </select>
 
+    <select id="selectWellByDevcode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT wellId as wellId, wellcode as WELLCODE, DEPTID
+        FROM device_view
+        where VALID = '1' AND DEVCODE = #{devcode}
+    </select>
+
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index cee784c..2634c58 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,6 +40,14 @@
      */
     DeviceWellDto selectWellIdByCode(String wellCode);
 
+    /**
+     * 根据设备编号查询关联的闸井ID
+     * from DEVICE_VIEW
+     * @param devcode
+     * @return
+     */
+    DeviceWellDto selectWellByDevcode(String devcode);
+
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 68632ce..aed1460 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -188,6 +188,11 @@
     }
 
     @Override
+    public DeviceWellDto selectWellByDevcode(String devcode) {
+        return this.baseMapper.selectWellByDevcode(devcode);
+    }
+
+    @Override
     public DeviceConcentratorDto selectDeviceConcentorByCode(String concenCode) {
         return this.baseMapper.selectDeviceConcentorByCode(concenCode);
     }
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
new file mode 100644
index 0000000..6e1c63b
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 闸井信息表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
+
+    DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+}
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
new file mode 100644
index 0000000..d07dbda
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DataWaterMeterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="CELL" property="cell"/>
+        <result column="FLOW_ACC" property="flowAcc"/>
+        <result column="FLOW" property="flow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+        <result column="STATUS" property="status"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, CELL AS cell, FLOW_ACC AS flowAcc, FLOW AS flow, UPTIME AS uptime, LOGTIME AS logtime, DESCN AS descn, STATUS AS status
+    </sql>
+
+    <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
+    </select>
+
+
+    <select id="selectDataScopePage" resultType="com.casic.missiles.modular.system.model.BusWellInfo"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        IFNULL(deviceCount,0) AS deviceCount
+        FROM bus_well_info w
+        LEFT JOIN
+        (SELECT COUNT(1) AS deviceCount ,well_id
+        FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c
+        ON w.id = c.well_id
+        WHERE w.VALID = '1'
+        <if test="wellType != null and wellType !=''">
+            and w.well_Type = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.deptid = #{deptid}
+        </if>
+        <if test="bfzt != null and bfzt != '' ">
+            and w.bfzt = #{bfzt}
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (w.WELL_CODE like
+            <include refid="keywords_sql"/>
+            or w.POSITION like
+            <include refid="keywords_sql"/>)
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and w.AREA like <include refid="keywords_sql"/>
+        </if>
+    </select>
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords} || '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="DeviceInWellInfo_Column_List">
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
+    </sql>
+
+    <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
+        SELECT
+        <include refid="DeviceInWellInfo_Column_List"/>
+        FROM bus_device d
+        LEFT OUTER JOIN base_device_type t
+        ON d.DEVICE_TYPE = t.ID
+        WHERE d.ID
+        IN (
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID=1
+        )
+    </select>
+
+
+    <sql id="WatchData_Column_List">
+        d
+        .
+        ID
+        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+    </sql>
+
+    <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        <include refid="WatchData_Column_List"/>
+        FROM bus_device d
+        LEFT OUTER JOIN base_device_type t
+        ON d.DEVICE_TYPE = t.ID
+        WHERE d.ID
+        IN (
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID=1
+        )
+    </select>
+
+    <select id="wellcoverData" resultType="com.casic.missiles.modular.system.dto.DeviceData"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT descn AS data,
+               logtime
+        FROM data_wellcover
+        WHERE devcode = #{devcode}
+        ORDER BY logtime
+                DESC LIMIT 1
+    </select>
+
+    <select id="liquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT l.LIQUIDDATA AS data,
+               l.UPTIME     AS logtime
+        FROM data_liquid l
+        WHERE DEVCODE = #{devcode}
+        ORDER BY l.UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="harmfulgasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS data,
+               UPTIME                                     AS logtime
+        FROM data_harmful_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="gasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
+               UPTIME                              AS logtime
+        FROM data_temp_hum
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="digData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DDATA  AS data,
+               UPTIME AS logtime
+        FROM data_dig
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="noiseData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DDATA  AS data,
+               UPTIME AS logtime
+        FROM data_noise
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="wellcoverlocaData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(LNG, ', ', LAT) AS data,
+               LOGTIME                AS logtime
+        FROM data_wellcover_loca
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+
+    <select id="bfztCountData" resultType="com.casic.missiles.modular.system.dto.BfztCountDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        COUNT(id) total,
+        SUM(CASE WHEN BFZT='1' THEN 1 ELSE 0 END ) bfWell,
+        SUM(CASE WHEN BFZT='0' THEN 1 ELSE 0 END ) cfWell
+        FROM bus_well_info
+        WHERE VALID='1'
+        <choose>
+            <when test="isApp == true">
+                AND responsible_dept
+            </when>
+            <when test="isApp == false">
+                AND deptid
+            </when>
+        </choose>
+        IN
+        <foreach collection="deptIds" index="index" item="i" open="("
+                 separator="," close=")">
+            #{i}
+        </foreach>
+    </select>
+
+    <select id="selectDataScope" resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
+        w.bfzt, w.position,w.id
+        FROM bus_well_info w
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1'
+    </select>
+
+    <select id="getBatchExportData" fetchSize="1000"
+            resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
+        w.bfzt, w.position,w.id, IFNULL(deviceCount,0) AS deviceCount
+        FROM bus_well_info w
+        LEFT JOIN
+        (SELECT COUNT(1) AS deviceCount ,well_id
+        FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c
+        ON w.id = c.well_id
+        WHERE w.VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="deviceCountData" resultType="Integer"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT COUNT(1)
+        FROM bus_device_well d
+        WHERE d.VALID = '1'
+        <if test="id != null and id !=''">
+            AND d.WELL_ID = #{id}
+        </if>
+    </select>
+
+    <select id="deptNameData" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT d.simplename
+        FROM sys_dept d
+        WHERE 1 = 1
+        <if test="deptid != null and deptid !=''">
+            AND d.id = #{deptid}
+        </if>
+    </select>
+
+    <select id="getAreaId" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.id
+        FROM sys_area r,
+             sys_area a
+        WHERE r.area_name = #{qu}
+          AND a.area_name
+            LIKE CONCAT('%', #{area}, '%')
+          AND r.id = a.pid
+    </select>
+
+    <select id="getArea" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.area_name
+        FROM sys_area a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="getAreaPId" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.pid
+        FROM sys_area a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="getWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1'
+    </select>
+
+    <select id="getAlarmWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
+    </select>
+
+    <select id="getNotAlarmWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
+    </select>
+
+    <update id="updateBatchBfcf">
+        UPDATE
+        bus_well_info
+        SET bfzt = #{bfzt}
+        WHERE VALID = '1'
+        <if test="wellType != null and wellType !=''">
+            and well_Type = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and deptid = #{deptid}
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (WELL_CODE like
+            <include refid="keywords_sql"/>
+            or POSITION like
+            <include refid="keywords_sql"/>
+            )
+        </if>
+
+        <if test="deptIds != null">
+            AND deptid IN
+            <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                #{i}
+            </foreach>
+        </if>
+    </update>
+
+    <select id="isExistWellCode" resultType="Boolean">
+        SELECT COUNT(1)
+        FROM bus_well_info w
+        WHERE VALID = '1'
+          AND w.WELL_CODE = #{wellCode}
+    </select>
+
+    <select id="getWellListAll" resultType="com.casic.missiles.modular.system.model.BusWellInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info
+    </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+
+    <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+        SELECT id,
+               devcode,
+               deviceName,
+               deviceType,
+               deviceTypeName,
+               wellId,
+               deptid,
+               wellCode,
+               POSITION,
+               onlineState,
+               coordinateX,
+               coordinateY,
+               latBaidu,
+               lngBaidu,
+               latGaode,
+               lngGaode
+        FROM device_overview_view
+        WHERE valid = 1
+    </select>
+    <select id="selectDeviceById" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+        SELECT id,
+               devcode,
+               deviceName,
+               deviceType,
+               deviceTypeName,
+               wellId,
+               deptid,
+               deptName,
+               wellCode,
+               POSITION as position,
+               onlineState,
+               coordinateX,
+               coordinateY,
+               latBaidu,
+               lngBaidu,
+               latGaode,
+               lngGaode
+        FROM device_overview_view
+        WHERE valid = 1
+          and id = #{id} limit 1
+    </select>
+</mapper>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index de868cb..16545a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,6 +39,12 @@
           AND WELL_CODE = #{wellCode}
     </select>
 
+    <select id="selectWellByDevcode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT wellId as wellId, wellcode as WELLCODE, DEPTID
+        FROM device_view
+        where VALID = '1' AND DEVCODE = #{devcode}
+    </select>
+
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index cee784c..2634c58 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,6 +40,14 @@
      */
     DeviceWellDto selectWellIdByCode(String wellCode);
 
+    /**
+     * 根据设备编号查询关联的闸井ID
+     * from DEVICE_VIEW
+     * @param devcode
+     * @return
+     */
+    DeviceWellDto selectWellByDevcode(String devcode);
+
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 68632ce..aed1460 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -188,6 +188,11 @@
     }
 
     @Override
+    public DeviceWellDto selectWellByDevcode(String devcode) {
+        return this.baseMapper.selectWellByDevcode(devcode);
+    }
+
+    @Override
     public DeviceConcentratorDto selectDeviceConcentorByCode(String concenCode) {
         return this.baseMapper.selectDeviceConcentorByCode(concenCode);
     }
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
new file mode 100644
index 0000000..6e1c63b
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 闸井信息表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
+
+    DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+}
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
new file mode 100644
index 0000000..d07dbda
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DataWaterMeterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="CELL" property="cell"/>
+        <result column="FLOW_ACC" property="flowAcc"/>
+        <result column="FLOW" property="flow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+        <result column="STATUS" property="status"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, CELL AS cell, FLOW_ACC AS flowAcc, FLOW AS flow, UPTIME AS uptime, LOGTIME AS logtime, DESCN AS descn, STATUS AS status
+    </sql>
+
+    <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
+    </select>
+
+
+    <select id="selectDataScopePage" resultType="com.casic.missiles.modular.system.model.BusWellInfo"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        IFNULL(deviceCount,0) AS deviceCount
+        FROM bus_well_info w
+        LEFT JOIN
+        (SELECT COUNT(1) AS deviceCount ,well_id
+        FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c
+        ON w.id = c.well_id
+        WHERE w.VALID = '1'
+        <if test="wellType != null and wellType !=''">
+            and w.well_Type = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.deptid = #{deptid}
+        </if>
+        <if test="bfzt != null and bfzt != '' ">
+            and w.bfzt = #{bfzt}
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (w.WELL_CODE like
+            <include refid="keywords_sql"/>
+            or w.POSITION like
+            <include refid="keywords_sql"/>)
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and w.AREA like <include refid="keywords_sql"/>
+        </if>
+    </select>
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords} || '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="DeviceInWellInfo_Column_List">
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
+    </sql>
+
+    <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
+        SELECT
+        <include refid="DeviceInWellInfo_Column_List"/>
+        FROM bus_device d
+        LEFT OUTER JOIN base_device_type t
+        ON d.DEVICE_TYPE = t.ID
+        WHERE d.ID
+        IN (
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID=1
+        )
+    </select>
+
+
+    <sql id="WatchData_Column_List">
+        d
+        .
+        ID
+        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+    </sql>
+
+    <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        <include refid="WatchData_Column_List"/>
+        FROM bus_device d
+        LEFT OUTER JOIN base_device_type t
+        ON d.DEVICE_TYPE = t.ID
+        WHERE d.ID
+        IN (
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID=1
+        )
+    </select>
+
+    <select id="wellcoverData" resultType="com.casic.missiles.modular.system.dto.DeviceData"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT descn AS data,
+               logtime
+        FROM data_wellcover
+        WHERE devcode = #{devcode}
+        ORDER BY logtime
+                DESC LIMIT 1
+    </select>
+
+    <select id="liquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT l.LIQUIDDATA AS data,
+               l.UPTIME     AS logtime
+        FROM data_liquid l
+        WHERE DEVCODE = #{devcode}
+        ORDER BY l.UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="harmfulgasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS data,
+               UPTIME                                     AS logtime
+        FROM data_harmful_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="gasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
+               UPTIME                              AS logtime
+        FROM data_temp_hum
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="digData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DDATA  AS data,
+               UPTIME AS logtime
+        FROM data_dig
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="noiseData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DDATA  AS data,
+               UPTIME AS logtime
+        FROM data_noise
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="wellcoverlocaData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(LNG, ', ', LAT) AS data,
+               LOGTIME                AS logtime
+        FROM data_wellcover_loca
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+
+    <select id="bfztCountData" resultType="com.casic.missiles.modular.system.dto.BfztCountDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        COUNT(id) total,
+        SUM(CASE WHEN BFZT='1' THEN 1 ELSE 0 END ) bfWell,
+        SUM(CASE WHEN BFZT='0' THEN 1 ELSE 0 END ) cfWell
+        FROM bus_well_info
+        WHERE VALID='1'
+        <choose>
+            <when test="isApp == true">
+                AND responsible_dept
+            </when>
+            <when test="isApp == false">
+                AND deptid
+            </when>
+        </choose>
+        IN
+        <foreach collection="deptIds" index="index" item="i" open="("
+                 separator="," close=")">
+            #{i}
+        </foreach>
+    </select>
+
+    <select id="selectDataScope" resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
+        w.bfzt, w.position,w.id
+        FROM bus_well_info w
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1'
+    </select>
+
+    <select id="getBatchExportData" fetchSize="1000"
+            resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
+        w.bfzt, w.position,w.id, IFNULL(deviceCount,0) AS deviceCount
+        FROM bus_well_info w
+        LEFT JOIN
+        (SELECT COUNT(1) AS deviceCount ,well_id
+        FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c
+        ON w.id = c.well_id
+        WHERE w.VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="deviceCountData" resultType="Integer"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT COUNT(1)
+        FROM bus_device_well d
+        WHERE d.VALID = '1'
+        <if test="id != null and id !=''">
+            AND d.WELL_ID = #{id}
+        </if>
+    </select>
+
+    <select id="deptNameData" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT d.simplename
+        FROM sys_dept d
+        WHERE 1 = 1
+        <if test="deptid != null and deptid !=''">
+            AND d.id = #{deptid}
+        </if>
+    </select>
+
+    <select id="getAreaId" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.id
+        FROM sys_area r,
+             sys_area a
+        WHERE r.area_name = #{qu}
+          AND a.area_name
+            LIKE CONCAT('%', #{area}, '%')
+          AND r.id = a.pid
+    </select>
+
+    <select id="getArea" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.area_name
+        FROM sys_area a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="getAreaPId" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.pid
+        FROM sys_area a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="getWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1'
+    </select>
+
+    <select id="getAlarmWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
+    </select>
+
+    <select id="getNotAlarmWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
+    </select>
+
+    <update id="updateBatchBfcf">
+        UPDATE
+        bus_well_info
+        SET bfzt = #{bfzt}
+        WHERE VALID = '1'
+        <if test="wellType != null and wellType !=''">
+            and well_Type = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and deptid = #{deptid}
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (WELL_CODE like
+            <include refid="keywords_sql"/>
+            or POSITION like
+            <include refid="keywords_sql"/>
+            )
+        </if>
+
+        <if test="deptIds != null">
+            AND deptid IN
+            <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                #{i}
+            </foreach>
+        </if>
+    </update>
+
+    <select id="isExistWellCode" resultType="Boolean">
+        SELECT COUNT(1)
+        FROM bus_well_info w
+        WHERE VALID = '1'
+          AND w.WELL_CODE = #{wellCode}
+    </select>
+
+    <select id="getWellListAll" resultType="com.casic.missiles.modular.system.model.BusWellInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info
+    </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+
+    <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+        SELECT id,
+               devcode,
+               deviceName,
+               deviceType,
+               deviceTypeName,
+               wellId,
+               deptid,
+               wellCode,
+               POSITION,
+               onlineState,
+               coordinateX,
+               coordinateY,
+               latBaidu,
+               lngBaidu,
+               latGaode,
+               lngGaode
+        FROM device_overview_view
+        WHERE valid = 1
+    </select>
+    <select id="selectDeviceById" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+        SELECT id,
+               devcode,
+               deviceName,
+               deviceType,
+               deviceTypeName,
+               wellId,
+               deptid,
+               deptName,
+               wellCode,
+               POSITION as position,
+               onlineState,
+               coordinateX,
+               coordinateY,
+               latBaidu,
+               lngBaidu,
+               latGaode,
+               lngGaode
+        FROM device_overview_view
+        WHERE valid = 1
+          and id = #{id} limit 1
+    </select>
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
new file mode 100644
index 0000000..6d68b47
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
@@ -0,0 +1,88 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 水表原始记录
+ * </p>
+ *
+ * @author tanyue
+ * @since 2022-03-20
+ */
+@TableName("data_watermeter")
+@Data
+public class DataWaterMeter extends Model<DataWaterMeter> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 井编号
+     */
+    @NotEmpty(message="井编号不能为空")
+    @TableField("WELL_CODE")
+    private String wellCode;
+    /**
+     * 设备编号
+     */
+    @NotEmpty(message="设备编号不能为空")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 电池电量
+     */
+    @TableField("CELL")
+    private String cell;
+    /**
+     * 累计用水量
+     */
+    @NotEmpty(message="累计用水量不能为空")
+    @TableField("FLOW_ACC")
+    private String flowAcc;
+    /**
+     * 瞬时用水量
+     */
+    @TableField("FLOW")
+    private String flow;
+    /**
+     * 上传时间
+     */
+    @TableField("UPTIME")
+    private Date uptime;
+    /**
+     * 记录时间
+     */
+    @NotEmpty(message="记录时间不能为空")
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 描述
+     */
+    @TableField("DESCN")
+    private String descn;
+    /**
+     * 状态
+     */
+    @TableField("STATUS")
+    private String status;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index de868cb..16545a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,6 +39,12 @@
           AND WELL_CODE = #{wellCode}
     </select>
 
+    <select id="selectWellByDevcode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT wellId as wellId, wellcode as WELLCODE, DEPTID
+        FROM device_view
+        where VALID = '1' AND DEVCODE = #{devcode}
+    </select>
+
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index cee784c..2634c58 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,6 +40,14 @@
      */
     DeviceWellDto selectWellIdByCode(String wellCode);
 
+    /**
+     * 根据设备编号查询关联的闸井ID
+     * from DEVICE_VIEW
+     * @param devcode
+     * @return
+     */
+    DeviceWellDto selectWellByDevcode(String devcode);
+
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 68632ce..aed1460 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -188,6 +188,11 @@
     }
 
     @Override
+    public DeviceWellDto selectWellByDevcode(String devcode) {
+        return this.baseMapper.selectWellByDevcode(devcode);
+    }
+
+    @Override
     public DeviceConcentratorDto selectDeviceConcentorByCode(String concenCode) {
         return this.baseMapper.selectDeviceConcentorByCode(concenCode);
     }
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
new file mode 100644
index 0000000..6e1c63b
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 闸井信息表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
+
+    DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+}
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
new file mode 100644
index 0000000..d07dbda
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DataWaterMeterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="CELL" property="cell"/>
+        <result column="FLOW_ACC" property="flowAcc"/>
+        <result column="FLOW" property="flow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+        <result column="STATUS" property="status"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, CELL AS cell, FLOW_ACC AS flowAcc, FLOW AS flow, UPTIME AS uptime, LOGTIME AS logtime, DESCN AS descn, STATUS AS status
+    </sql>
+
+    <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
+    </select>
+
+
+    <select id="selectDataScopePage" resultType="com.casic.missiles.modular.system.model.BusWellInfo"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        IFNULL(deviceCount,0) AS deviceCount
+        FROM bus_well_info w
+        LEFT JOIN
+        (SELECT COUNT(1) AS deviceCount ,well_id
+        FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c
+        ON w.id = c.well_id
+        WHERE w.VALID = '1'
+        <if test="wellType != null and wellType !=''">
+            and w.well_Type = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.deptid = #{deptid}
+        </if>
+        <if test="bfzt != null and bfzt != '' ">
+            and w.bfzt = #{bfzt}
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (w.WELL_CODE like
+            <include refid="keywords_sql"/>
+            or w.POSITION like
+            <include refid="keywords_sql"/>)
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and w.AREA like <include refid="keywords_sql"/>
+        </if>
+    </select>
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords} || '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="DeviceInWellInfo_Column_List">
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
+    </sql>
+
+    <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
+        SELECT
+        <include refid="DeviceInWellInfo_Column_List"/>
+        FROM bus_device d
+        LEFT OUTER JOIN base_device_type t
+        ON d.DEVICE_TYPE = t.ID
+        WHERE d.ID
+        IN (
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID=1
+        )
+    </select>
+
+
+    <sql id="WatchData_Column_List">
+        d
+        .
+        ID
+        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+    </sql>
+
+    <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        <include refid="WatchData_Column_List"/>
+        FROM bus_device d
+        LEFT OUTER JOIN base_device_type t
+        ON d.DEVICE_TYPE = t.ID
+        WHERE d.ID
+        IN (
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID=1
+        )
+    </select>
+
+    <select id="wellcoverData" resultType="com.casic.missiles.modular.system.dto.DeviceData"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT descn AS data,
+               logtime
+        FROM data_wellcover
+        WHERE devcode = #{devcode}
+        ORDER BY logtime
+                DESC LIMIT 1
+    </select>
+
+    <select id="liquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT l.LIQUIDDATA AS data,
+               l.UPTIME     AS logtime
+        FROM data_liquid l
+        WHERE DEVCODE = #{devcode}
+        ORDER BY l.UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="harmfulgasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS data,
+               UPTIME                                     AS logtime
+        FROM data_harmful_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="gasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
+               UPTIME                              AS logtime
+        FROM data_temp_hum
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="digData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DDATA  AS data,
+               UPTIME AS logtime
+        FROM data_dig
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="noiseData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DDATA  AS data,
+               UPTIME AS logtime
+        FROM data_noise
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="wellcoverlocaData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(LNG, ', ', LAT) AS data,
+               LOGTIME                AS logtime
+        FROM data_wellcover_loca
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+
+    <select id="bfztCountData" resultType="com.casic.missiles.modular.system.dto.BfztCountDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        COUNT(id) total,
+        SUM(CASE WHEN BFZT='1' THEN 1 ELSE 0 END ) bfWell,
+        SUM(CASE WHEN BFZT='0' THEN 1 ELSE 0 END ) cfWell
+        FROM bus_well_info
+        WHERE VALID='1'
+        <choose>
+            <when test="isApp == true">
+                AND responsible_dept
+            </when>
+            <when test="isApp == false">
+                AND deptid
+            </when>
+        </choose>
+        IN
+        <foreach collection="deptIds" index="index" item="i" open="("
+                 separator="," close=")">
+            #{i}
+        </foreach>
+    </select>
+
+    <select id="selectDataScope" resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
+        w.bfzt, w.position,w.id
+        FROM bus_well_info w
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1'
+    </select>
+
+    <select id="getBatchExportData" fetchSize="1000"
+            resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
+        w.bfzt, w.position,w.id, IFNULL(deviceCount,0) AS deviceCount
+        FROM bus_well_info w
+        LEFT JOIN
+        (SELECT COUNT(1) AS deviceCount ,well_id
+        FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c
+        ON w.id = c.well_id
+        WHERE w.VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="deviceCountData" resultType="Integer"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT COUNT(1)
+        FROM bus_device_well d
+        WHERE d.VALID = '1'
+        <if test="id != null and id !=''">
+            AND d.WELL_ID = #{id}
+        </if>
+    </select>
+
+    <select id="deptNameData" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT d.simplename
+        FROM sys_dept d
+        WHERE 1 = 1
+        <if test="deptid != null and deptid !=''">
+            AND d.id = #{deptid}
+        </if>
+    </select>
+
+    <select id="getAreaId" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.id
+        FROM sys_area r,
+             sys_area a
+        WHERE r.area_name = #{qu}
+          AND a.area_name
+            LIKE CONCAT('%', #{area}, '%')
+          AND r.id = a.pid
+    </select>
+
+    <select id="getArea" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.area_name
+        FROM sys_area a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="getAreaPId" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.pid
+        FROM sys_area a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="getWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1'
+    </select>
+
+    <select id="getAlarmWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
+    </select>
+
+    <select id="getNotAlarmWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
+    </select>
+
+    <update id="updateBatchBfcf">
+        UPDATE
+        bus_well_info
+        SET bfzt = #{bfzt}
+        WHERE VALID = '1'
+        <if test="wellType != null and wellType !=''">
+            and well_Type = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and deptid = #{deptid}
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (WELL_CODE like
+            <include refid="keywords_sql"/>
+            or POSITION like
+            <include refid="keywords_sql"/>
+            )
+        </if>
+
+        <if test="deptIds != null">
+            AND deptid IN
+            <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                #{i}
+            </foreach>
+        </if>
+    </update>
+
+    <select id="isExistWellCode" resultType="Boolean">
+        SELECT COUNT(1)
+        FROM bus_well_info w
+        WHERE VALID = '1'
+          AND w.WELL_CODE = #{wellCode}
+    </select>
+
+    <select id="getWellListAll" resultType="com.casic.missiles.modular.system.model.BusWellInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info
+    </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+
+    <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+        SELECT id,
+               devcode,
+               deviceName,
+               deviceType,
+               deviceTypeName,
+               wellId,
+               deptid,
+               wellCode,
+               POSITION,
+               onlineState,
+               coordinateX,
+               coordinateY,
+               latBaidu,
+               lngBaidu,
+               latGaode,
+               lngGaode
+        FROM device_overview_view
+        WHERE valid = 1
+    </select>
+    <select id="selectDeviceById" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+        SELECT id,
+               devcode,
+               deviceName,
+               deviceType,
+               deviceTypeName,
+               wellId,
+               deptid,
+               deptName,
+               wellCode,
+               POSITION as position,
+               onlineState,
+               coordinateX,
+               coordinateY,
+               latBaidu,
+               lngBaidu,
+               latGaode,
+               lngGaode
+        FROM device_overview_view
+        WHERE valid = 1
+          and id = #{id} limit 1
+    </select>
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
new file mode 100644
index 0000000..6d68b47
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
@@ -0,0 +1,88 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 水表原始记录
+ * </p>
+ *
+ * @author tanyue
+ * @since 2022-03-20
+ */
+@TableName("data_watermeter")
+@Data
+public class DataWaterMeter extends Model<DataWaterMeter> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 井编号
+     */
+    @NotEmpty(message="井编号不能为空")
+    @TableField("WELL_CODE")
+    private String wellCode;
+    /**
+     * 设备编号
+     */
+    @NotEmpty(message="设备编号不能为空")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 电池电量
+     */
+    @TableField("CELL")
+    private String cell;
+    /**
+     * 累计用水量
+     */
+    @NotEmpty(message="累计用水量不能为空")
+    @TableField("FLOW_ACC")
+    private String flowAcc;
+    /**
+     * 瞬时用水量
+     */
+    @TableField("FLOW")
+    private String flow;
+    /**
+     * 上传时间
+     */
+    @TableField("UPTIME")
+    private Date uptime;
+    /**
+     * 记录时间
+     */
+    @NotEmpty(message="记录时间不能为空")
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 描述
+     */
+    @TableField("DESCN")
+    private String descn;
+    /**
+     * 状态
+     */
+    @TableField("STATUS")
+    private String status;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}
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
new file mode 100644
index 0000000..2ed6970
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+
+import java.util.Map;
+
+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);
+}

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
new file mode 100644
index 0000000..335cd41
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -0,0 +1,89 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.modular.system.dto.DeviceWellDto;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+@Controller
+@RequestMapping("/meter")
+public class WaterMeterDataReceiver extends BaseController {
+
+    @Resource
+    private IWaterMeterDataService waterMeterDataService;
+
+    @Resource
+    private IDeviceService deviceService;
+
+    @RequestMapping(value = "/data/recv")
+    @ResponseBody
+    public Object dataRecv(@RequestBody(required = true) Map<String, Object> meterData) throws ParseException {
+        // 判断必填字段
+        if (meterData.containsKey("MeterAddr") == false) {
+            return ResponseData.error("设备地址字段缺失");
+        }
+        if (meterData.containsKey("MeterNumber") == false) {
+            return ResponseData.error("水表读数字段缺失");
+        }
+        if (meterData.containsKey("ReadDate") == false) {
+            return ResponseData.error("上报时间字段缺失");
+        }
+
+        // 创建原始记录对象
+        DataWaterMeter dataWaterMeter = new DataWaterMeter();
+
+        // 赋值设备地址
+        String meterAddr = meterData.get("MeterAddr").toString();
+        dataWaterMeter.setDevcode(meterAddr);
+
+        // 赋值井编号
+        DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
+        if (null == wellDto) {
+            log.info("没有找到" + meterAddr + "对应的井编号");
+            return ResponseData.success();
+        }
+        dataWaterMeter.setWellCode(wellDto.getWellCode());
+
+        // 赋值水表读数
+        Double meterNumber = 0.0;
+        String numType = meterData.get("MeterNumber").getClass().getSimpleName();
+        if (numType.equals("String")) {
+            meterNumber = Double.parseDouble(meterData.get("MeterNumber").toString());
+        } else if (numType.equals("BigDecimal")) {
+            meterNumber = ((Number) meterData.get("MeterNumber")).doubleValue();
+        }
+        dataWaterMeter.setFlowAcc(String.valueOf(meterNumber));
+
+        // 赋值数据采集时间
+        String readDate = meterData.get("ReadDate").toString();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        dataWaterMeter.setUptime(sdf.parse(readDate));
+
+        // 赋值阀门状态
+        if (meterData.containsKey("ValveStatus") == true) {
+            dataWaterMeter.setStatus(meterData.get("ValveStatus").toString());
+        }
+
+        dataWaterMeter.setLogtime(Calendar.getInstance().getTime());
+
+        // 保存到数据库 同时计算日/月用水量
+        waterMeterDataService.saveWaterMeterData(dataWaterMeter);
+
+        return ResponseData.success();
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index ae94fc5..9e4fb24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,6 +23,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode);
     List<Long> getAreaIds(@Param("areaId") Long areaId);
 
     String getArea(@Param("id") String id);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index de868cb..16545a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,6 +39,12 @@
           AND WELL_CODE = #{wellCode}
     </select>
 
+    <select id="selectWellByDevcode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT wellId as wellId, wellcode as WELLCODE, DEPTID
+        FROM device_view
+        where VALID = '1' AND DEVCODE = #{devcode}
+    </select>
+
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index cee784c..2634c58 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,6 +40,14 @@
      */
     DeviceWellDto selectWellIdByCode(String wellCode);
 
+    /**
+     * 根据设备编号查询关联的闸井ID
+     * from DEVICE_VIEW
+     * @param devcode
+     * @return
+     */
+    DeviceWellDto selectWellByDevcode(String devcode);
+
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 68632ce..aed1460 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -188,6 +188,11 @@
     }
 
     @Override
+    public DeviceWellDto selectWellByDevcode(String devcode) {
+        return this.baseMapper.selectWellByDevcode(devcode);
+    }
+
+    @Override
     public DeviceConcentratorDto selectDeviceConcentorByCode(String concenCode) {
         return this.baseMapper.selectDeviceConcentorByCode(concenCode);
     }
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
new file mode 100644
index 0000000..6e1c63b
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/DataWaterMeterMapper.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 闸井信息表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-13
+ */
+public interface DataWaterMeterMapper extends BaseMapper<DataWaterMeter> {
+
+    DataWaterMeter selectLatestRecordByDevcode(@Param("devcode") String devcode, @Param("uptime") String uptime);
+}
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
new file mode 100644
index 0000000..d07dbda
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataWaterMeterMapper.xml
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.modular.system.dao.DataWaterMeterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.DataWaterMeter">
+        <id column="ID" property="id"/>
+        <result column="WELL_CODE" property="wellCode"/>
+        <result column="DEVCODE" property="devcode"/>
+        <result column="CELL" property="cell"/>
+        <result column="FLOW_ACC" property="flowAcc"/>
+        <result column="FLOW" property="flow"/>
+        <result column="UPTIME" property="uptime"/>
+        <result column="LOGTIME" property="logtime"/>
+        <result column="DESCN" property="descn"/>
+        <result column="STATUS" property="status"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID
+        AS id, WELL_CODE AS wellCode, DEVCODE AS devcode, CELL AS cell, FLOW_ACC AS flowAcc, FLOW AS flow, UPTIME AS uptime, LOGTIME AS logtime, DESCN AS descn, STATUS AS status
+    </sql>
+
+    <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
+    </select>
+
+
+    <select id="selectDataScopePage" resultType="com.casic.missiles.modular.system.model.BusWellInfo"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        IFNULL(deviceCount,0) AS deviceCount
+        FROM bus_well_info w
+        LEFT JOIN
+        (SELECT COUNT(1) AS deviceCount ,well_id
+        FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c
+        ON w.id = c.well_id
+        WHERE w.VALID = '1'
+        <if test="wellType != null and wellType !=''">
+            and w.well_Type = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.deptid = #{deptid}
+        </if>
+        <if test="bfzt != null and bfzt != '' ">
+            and w.bfzt = #{bfzt}
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (w.WELL_CODE like
+            <include refid="keywords_sql"/>
+            or w.POSITION like
+            <include refid="keywords_sql"/>)
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and w.AREA like <include refid="keywords_sql"/>
+        </if>
+    </select>
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords} || '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+
+    <sql id="DeviceInWellInfo_Column_List">
+        d.ID AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.TYPE_NAME AS typeName
+    </sql>
+
+    <select id="getDeviceInWellInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInWellInfo">
+        SELECT
+        <include refid="DeviceInWellInfo_Column_List"/>
+        FROM bus_device d
+        LEFT OUTER JOIN base_device_type t
+        ON d.DEVICE_TYPE = t.ID
+        WHERE d.ID
+        IN (
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID=1
+        )
+    </select>
+
+
+    <sql id="WatchData_Column_List">
+        d
+        .
+        ID
+        AS deviceId, DEVCODE AS devcode, INSTALL_DATE AS installDate, ONLINE_STATE AS onlineState, t.WATCH_TYPE AS watchType, t.id as type
+    </sql>
+
+    <select id="watchData" resultType="com.casic.missiles.modular.system.dto.WatchDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        <include refid="WatchData_Column_List"/>
+        FROM bus_device d
+        LEFT OUTER JOIN base_device_type t
+        ON d.DEVICE_TYPE = t.ID
+        WHERE d.ID
+        IN (
+        SELECT dw.DEVICE_ID
+        FROM bus_device_well dw
+        WHERE dw.WELL_ID = #{id}
+        AND dw.VALID=1
+        )
+    </select>
+
+    <select id="wellcoverData" resultType="com.casic.missiles.modular.system.dto.DeviceData"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT descn AS data,
+               logtime
+        FROM data_wellcover
+        WHERE devcode = #{devcode}
+        ORDER BY logtime
+                DESC LIMIT 1
+    </select>
+
+    <select id="liquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT l.LIQUIDDATA AS data,
+               l.UPTIME     AS logtime
+        FROM data_liquid l
+        WHERE DEVCODE = #{devcode}
+        ORDER BY l.UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="harmfulgasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS data,
+               UPTIME                                     AS logtime
+        FROM data_harmful_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="gasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
+               UPTIME                              AS logtime
+        FROM data_temp_hum
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="digData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DDATA  AS data,
+               UPTIME AS logtime
+        FROM data_dig
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="noiseData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DDATA  AS data,
+               UPTIME AS logtime
+        FROM data_noise
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="wellcoverlocaData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT CONCAT(LNG, ', ', LAT) AS data,
+               LOGTIME                AS logtime
+        FROM data_wellcover_loca
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+
+    <select id="bfztCountData" resultType="com.casic.missiles.modular.system.dto.BfztCountDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        COUNT(id) total,
+        SUM(CASE WHEN BFZT='1' THEN 1 ELSE 0 END ) bfWell,
+        SUM(CASE WHEN BFZT='0' THEN 1 ELSE 0 END ) cfWell
+        FROM bus_well_info
+        WHERE VALID='1'
+        <choose>
+            <when test="isApp == true">
+                AND responsible_dept
+            </when>
+            <when test="isApp == false">
+                AND deptid
+            </when>
+        </choose>
+        IN
+        <foreach collection="deptIds" index="index" item="i" open="("
+                 separator="," close=")">
+            #{i}
+        </foreach>
+    </select>
+
+    <select id="selectDataScope" resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
+        w.bfzt, w.position,w.id
+        FROM bus_well_info w
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1'
+    </select>
+
+    <select id="getBatchExportData" fetchSize="1000"
+            resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
+        w.bfzt, w.position,w.id, IFNULL(deviceCount,0) AS deviceCount
+        FROM bus_well_info w
+        LEFT JOIN
+        (SELECT COUNT(1) AS deviceCount ,well_id
+        FROM bus_device_well d WHERE d.VALID = '1' GROUP BY well_id) c
+        ON w.id = c.well_id
+        WHERE w.VALID = '1'
+        <if test="keywords != null and keywords !=''">
+            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+    </select>
+
+    <select id="deviceCountData" resultType="Integer"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT COUNT(1)
+        FROM bus_device_well d
+        WHERE d.VALID = '1'
+        <if test="id != null and id !=''">
+            AND d.WELL_ID = #{id}
+        </if>
+    </select>
+
+    <select id="deptNameData" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT d.simplename
+        FROM sys_dept d
+        WHERE 1 = 1
+        <if test="deptid != null and deptid !=''">
+            AND d.id = #{deptid}
+        </if>
+    </select>
+
+    <select id="getAreaId" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.id
+        FROM sys_area r,
+             sys_area a
+        WHERE r.area_name = #{qu}
+          AND a.area_name
+            LIKE CONCAT('%', #{area}, '%')
+          AND r.id = a.pid
+    </select>
+
+    <select id="getArea" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.area_name
+        FROM sys_area a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="getAreaPId" resultType="String"
+            parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT a.pid
+        FROM sys_area a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="getWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1'
+    </select>
+
+    <select id="getAlarmWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
+    </select>
+
+    <select id="getNotAlarmWellList" resultType="com.casic.missiles.modular.system.dto.BusWellInfoDto">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info w WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (w.WELL_CODE LIKE CONCAT('%',#{keywords},'%') OR w.POSITION LIKE CONCAT('%',#{keywords},'%'))
+        </if>
+        <if test="wellType != null and wellType !=''">
+            and w.WELL_TYPE = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
+    </select>
+
+    <update id="updateBatchBfcf">
+        UPDATE
+        bus_well_info
+        SET bfzt = #{bfzt}
+        WHERE VALID = '1'
+        <if test="wellType != null and wellType !=''">
+            and well_Type = #{wellType}
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and deptid = #{deptid}
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (WELL_CODE like
+            <include refid="keywords_sql"/>
+            or POSITION like
+            <include refid="keywords_sql"/>
+            )
+        </if>
+
+        <if test="deptIds != null">
+            AND deptid IN
+            <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                #{i}
+            </foreach>
+        </if>
+    </update>
+
+    <select id="isExistWellCode" resultType="Boolean">
+        SELECT COUNT(1)
+        FROM bus_well_info w
+        WHERE VALID = '1'
+          AND w.WELL_CODE = #{wellCode}
+    </select>
+
+    <select id="getWellListAll" resultType="com.casic.missiles.modular.system.model.BusWellInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM bus_well_info
+    </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+
+    <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+        SELECT id,
+               devcode,
+               deviceName,
+               deviceType,
+               deviceTypeName,
+               wellId,
+               deptid,
+               wellCode,
+               POSITION,
+               onlineState,
+               coordinateX,
+               coordinateY,
+               latBaidu,
+               lngBaidu,
+               latGaode,
+               lngGaode
+        FROM device_overview_view
+        WHERE valid = 1
+    </select>
+    <select id="selectDeviceById" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+        SELECT id,
+               devcode,
+               deviceName,
+               deviceType,
+               deviceTypeName,
+               wellId,
+               deptid,
+               deptName,
+               wellCode,
+               POSITION as position,
+               onlineState,
+               coordinateX,
+               coordinateY,
+               latBaidu,
+               lngBaidu,
+               latGaode,
+               lngGaode
+        FROM device_overview_view
+        WHERE valid = 1
+          and id = #{id} limit 1
+    </select>
+</mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
new file mode 100644
index 0000000..6d68b47
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
@@ -0,0 +1,88 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 水表原始记录
+ * </p>
+ *
+ * @author tanyue
+ * @since 2022-03-20
+ */
+@TableName("data_watermeter")
+@Data
+public class DataWaterMeter extends Model<DataWaterMeter> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 井编号
+     */
+    @NotEmpty(message="井编号不能为空")
+    @TableField("WELL_CODE")
+    private String wellCode;
+    /**
+     * 设备编号
+     */
+    @NotEmpty(message="设备编号不能为空")
+    @TableField("DEVCODE")
+    private String devcode;
+    /**
+     * 电池电量
+     */
+    @TableField("CELL")
+    private String cell;
+    /**
+     * 累计用水量
+     */
+    @NotEmpty(message="累计用水量不能为空")
+    @TableField("FLOW_ACC")
+    private String flowAcc;
+    /**
+     * 瞬时用水量
+     */
+    @TableField("FLOW")
+    private String flow;
+    /**
+     * 上传时间
+     */
+    @TableField("UPTIME")
+    private Date uptime;
+    /**
+     * 记录时间
+     */
+    @NotEmpty(message="记录时间不能为空")
+    @TableField("LOGTIME")
+    private Date logtime;
+    /**
+     * 描述
+     */
+    @TableField("DESCN")
+    private String descn;
+    /**
+     * 状态
+     */
+    @TableField("STATUS")
+    private String status;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}
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
new file mode 100644
index 0000000..2ed6970
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IWaterMeterDataService.java
@@ -0,0 +1,15 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+
+import java.util.Map;
+
+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);
+}
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
new file mode 100644
index 0000000..66765ea
--- /dev/null
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
@@ -0,0 +1,59 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DataWaterMeterMapper;
+import com.casic.missiles.modular.system.model.DataWaterMeter;
+import com.casic.missiles.modular.system.service.IWaterMeterDataService;
+import lombok.extern.java.Log;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+@Service
+@Log
+public class WaterMeterDataServiceImpl extends ServiceImpl<DataWaterMeterMapper, DataWaterMeter> implements IWaterMeterDataService {
+
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    @Override
+    @Transactional
+    public boolean saveWaterMeterData(DataWaterMeter dataWaterMeter) {
+        // 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();
+
+            double flowAccDelt = Double.parseDouble(dataWaterMeter.getFlowAcc()) - lastFlowAcc;
+            long tmDelt = dataWaterMeter.getUptime().getTime() - lastTime.getTime();
+
+            // 计算日用水量
+
+
+            // 计算和刷新月累计用水量
+        }
+
+        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);
+    }
+}