diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 8316f46..b0136dc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -326,6 +326,13 @@
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
 
+    @ApiOperation("统计阀门数量")
+    @RequestMapping(value = "/valve/count")
+    @ResponseBody
+    public Object valveCount() {
+        return new SuccessResponseData(deviceService.getWaterMeterCount());
+    }
+
 
     @RequestMapping(value = "/getAreas")
     @ResponseBody

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 8316f46..b0136dc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -326,6 +326,13 @@
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
 
+    @ApiOperation("统计阀门数量")
+    @RequestMapping(value = "/valve/count")
+    @ResponseBody
+    public Object valveCount() {
+        return new SuccessResponseData(deviceService.getWaterMeterCount());
+    }
+
 
     @RequestMapping(value = "/getAreas")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
index eaa2073..466ef95 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
@@ -27,14 +27,4 @@
     public Object overview() {
         return new SuccessResponseData(deviceService.getOverview());
     }
-
-//    @ApiOperation("一级分区各区用水量")
-//    @RequestMapping(value = "/countByFirstArea")
-//    @ResponseBody
-//    public Object countByFirstArea(String devType, String startTime, String endTime) {
-//        if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) {
-//            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
-//        }
-//        return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime));
-//    }
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 8316f46..b0136dc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -326,6 +326,13 @@
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
 
+    @ApiOperation("统计阀门数量")
+    @RequestMapping(value = "/valve/count")
+    @ResponseBody
+    public Object valveCount() {
+        return new SuccessResponseData(deviceService.getWaterMeterCount());
+    }
+
 
     @RequestMapping(value = "/getAreas")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
index eaa2073..466ef95 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
@@ -27,14 +27,4 @@
     public Object overview() {
         return new SuccessResponseData(deviceService.getOverview());
     }
-
-//    @ApiOperation("一级分区各区用水量")
-//    @RequestMapping(value = "/countByFirstArea")
-//    @ResponseBody
-//    public Object countByFirstArea(String devType, String startTime, String endTime) {
-//        if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) {
-//            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
-//        }
-//        return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime));
-//    }
 }
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 2ff6766..fd6bc31 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
@@ -97,17 +97,12 @@
     /**
      * 今日用水量
      */
-    String getWaterMeterDay();
-
-    /**
-     * 昨日用水量
-     */
-    String getWaterMeterYesterday();
+    Map<String, Object> getWaterMeterDay(@Param("date") String date, @Param("area") String area);
 
     /**
      * 噪声
      */
-    String getNoiseData();
+    Map<String, Object> getNoiseData(@Param("date") String date);
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
 

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 8316f46..b0136dc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -326,6 +326,13 @@
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
 
+    @ApiOperation("统计阀门数量")
+    @RequestMapping(value = "/valve/count")
+    @ResponseBody
+    public Object valveCount() {
+        return new SuccessResponseData(deviceService.getWaterMeterCount());
+    }
+
 
     @RequestMapping(value = "/getAreas")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
index eaa2073..466ef95 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
@@ -27,14 +27,4 @@
     public Object overview() {
         return new SuccessResponseData(deviceService.getOverview());
     }
-
-//    @ApiOperation("一级分区各区用水量")
-//    @RequestMapping(value = "/countByFirstArea")
-//    @ResponseBody
-//    public Object countByFirstArea(String devType, String startTime, String endTime) {
-//        if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) {
-//            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
-//        }
-//        return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime));
-//    }
 }
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 2ff6766..fd6bc31 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
@@ -97,17 +97,12 @@
     /**
      * 今日用水量
      */
-    String getWaterMeterDay();
-
-    /**
-     * 昨日用水量
-     */
-    String getWaterMeterYesterday();
+    Map<String, Object> getWaterMeterDay(@Param("date") String date, @Param("area") String area);
 
     /**
      * 噪声
      */
-    String getNoiseData();
+    Map<String, Object> getNoiseData(@Param("date") String date);
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
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 5c26568..bc64955 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
@@ -1003,8 +1003,8 @@
     </select>
 
     <select id="getWaterMeterCount" resultType="string">
-        SELECT COUNT(DISTINCT dw.DEVCODE) AS total
-        FROM data_watermeter AS dw
+        SELECT COUNT(DISTINCT dv.DEVCODE) AS total
+        FROM device_view AS dv where dv.valid = 1 and dv.deviceType = 13
     </select>
 
     <select id="selectAlarmCountByDay" resultType="map">
@@ -1034,21 +1034,21 @@
         and dv.devcode = dwm.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
-    <select id="getWaterMeterDay" resultType="string">
-        SELECT SUM(dwd.FLOW_ACC_DATE) AS today
-        FROM data_watermeter_day AS dwd
-        WHERE TO_DAYS(dwd.DATE) = TO_DAYS(NOW())
+    <select id="getWaterMeterDay" resultType="map">
+        SELECT SUM(dwd.FLOW_ACC_DATE) AS todayAcc
+        FROM data_watermeter_day AS dwd, device_view as dv
+        WHERE dwd.`DATE` = #{date}
+        <if test="area != null and area !=''">
+            and dv.area like CONCAT(#{area}, '%')
+        </if>
+        and dv.devcode = dwd.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
-    <select id="getWaterMeterYesterday" resultType="string">
-        SELECT SUM(dwd.FLOW_ACC_DATE) AS today
-        FROM data_watermeter_day AS dwd
-        WHERE TO_DAYS(NOW()) - TO_DAYS(dwd.DATE) = 1
-    </select>
-
-    <select id="getNoiseData" resultType="string">
-        SELECT SUM(dn.DDATA) AS sound
-        FROM data_noise AS dn
+    <select id="getNoiseData" resultType="map">
+        SELECT ifnull(AVG(dn.DDATA), 0) AS sound
+        FROM data_noise AS dn, device_view as dv
+        where DATE_FORMAT(dn.UPTIME, '%Y-%m-%d') = #{date}
+        and dv.devcode = dn.devcode and dv.valid = 1 and dv.deviceType = '8'
     </select>
 
     <select id="countByFirstArea" resultType="map">

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 8316f46..b0136dc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -326,6 +326,13 @@
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
 
+    @ApiOperation("统计阀门数量")
+    @RequestMapping(value = "/valve/count")
+    @ResponseBody
+    public Object valveCount() {
+        return new SuccessResponseData(deviceService.getWaterMeterCount());
+    }
+
 
     @RequestMapping(value = "/getAreas")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
index eaa2073..466ef95 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java
@@ -27,14 +27,4 @@
     public Object overview() {
         return new SuccessResponseData(deviceService.getOverview());
     }
-
-//    @ApiOperation("一级分区各区用水量")
-//    @RequestMapping(value = "/countByFirstArea")
-//    @ResponseBody
-//    public Object countByFirstArea(String devType, String startTime, String endTime) {
-//        if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) {
-//            throw new GunsException(GunsExceptionEnum.REQUEST_NULL);
-//        }
-//        return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime));
-//    }
 }
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 2ff6766..fd6bc31 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
@@ -97,17 +97,12 @@
     /**
      * 今日用水量
      */
-    String getWaterMeterDay();
-
-    /**
-     * 昨日用水量
-     */
-    String getWaterMeterYesterday();
+    Map<String, Object> getWaterMeterDay(@Param("date") String date, @Param("area") String area);
 
     /**
      * 噪声
      */
-    String getNoiseData();
+    Map<String, Object> getNoiseData(@Param("date") String date);
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
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 5c26568..bc64955 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
@@ -1003,8 +1003,8 @@
     </select>
 
     <select id="getWaterMeterCount" resultType="string">
-        SELECT COUNT(DISTINCT dw.DEVCODE) AS total
-        FROM data_watermeter AS dw
+        SELECT COUNT(DISTINCT dv.DEVCODE) AS total
+        FROM device_view AS dv where dv.valid = 1 and dv.deviceType = 13
     </select>
 
     <select id="selectAlarmCountByDay" resultType="map">
@@ -1034,21 +1034,21 @@
         and dv.devcode = dwm.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
-    <select id="getWaterMeterDay" resultType="string">
-        SELECT SUM(dwd.FLOW_ACC_DATE) AS today
-        FROM data_watermeter_day AS dwd
-        WHERE TO_DAYS(dwd.DATE) = TO_DAYS(NOW())
+    <select id="getWaterMeterDay" resultType="map">
+        SELECT SUM(dwd.FLOW_ACC_DATE) AS todayAcc
+        FROM data_watermeter_day AS dwd, device_view as dv
+        WHERE dwd.`DATE` = #{date}
+        <if test="area != null and area !=''">
+            and dv.area like CONCAT(#{area}, '%')
+        </if>
+        and dv.devcode = dwd.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
-    <select id="getWaterMeterYesterday" resultType="string">
-        SELECT SUM(dwd.FLOW_ACC_DATE) AS today
-        FROM data_watermeter_day AS dwd
-        WHERE TO_DAYS(NOW()) - TO_DAYS(dwd.DATE) = 1
-    </select>
-
-    <select id="getNoiseData" resultType="string">
-        SELECT SUM(dn.DDATA) AS sound
-        FROM data_noise AS dn
+    <select id="getNoiseData" resultType="map">
+        SELECT ifnull(AVG(dn.DDATA), 0) AS sound
+        FROM data_noise AS dn, device_view as dv
+        where DATE_FORMAT(dn.UPTIME, '%Y-%m-%d') = #{date}
+        and dv.devcode = dn.devcode and dv.valid = 1 and dv.deviceType = '8'
     </select>
 
     <select id="countByFirstArea" resultType="map">
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 4c5ebc7..83d2ec9 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
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.*;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -578,24 +579,23 @@
         String year = sdfY.format(calendar.getTime());
         String month = sdfM.format(calendar.getTime());
         String date = sdfD.format(calendar.getTime());
+
         Map<String, Object> waterMeter = this.baseMapper.getWaterMeter(year);
         Map<String, Object> monthAcc = this.baseMapper.getWaterMeterMonth(month);
-        String todayAcc = this.baseMapper.getWaterMeterDay();
-        String sound = this.baseMapper.getNoiseData();
+        Map<String, Object> todayAcc = this.baseMapper.getWaterMeterDay(date, null);
+        Map<String, Object> prodTodayAcc = this.baseMapper.getWaterMeterDay(date, "11");
+        Map<String, Object> sound = this.baseMapper.getNoiseData(date);
 
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("total", df2.format((Double) waterMeter.get("total")));
         resultMap.put("month", df2.format((Double) monthAcc.get("monthAcc")));
-        resultMap.put("today", todayAcc);
-        resultMap.put("sound", sound);
+        resultMap.put("today", df2.format((Double) todayAcc.get("todayAcc")));
+        resultMap.put("prodution", df2.format((Double) prodTodayAcc.get("todayAcc")));
+        resultMap.put("sound", df2.format((Double) sound.get("sound")));
+
         return resultMap;
     }
 
-//    @Override
-//    public List<Map<String, Object>> countByFirstArea(String devType, String startTime, String endTime) {
-//        return this.baseMapper.countByFirstArea(devType, startTime, endTime);
-//    }
-
     @Override
     public List<Map<String, Object>> getAreas() {
         return this.baseMapper.getAreas();