diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java
index f06802c..80e6dea 100644
--- a/src/main/java/org/well/well/base/DeviceTypeEnum.java
+++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java
@@ -21,7 +21,9 @@
 //    Dig("开挖监测仪", 16),
     NoiseDig("噪声开挖监测仪", 17),
     Locator("井盖定位监测仪", 18),
-    Meter("水质监测仪", 19);
+    Meter("水质监测仪", 19),
+    FLOWGAUGE("流量计", 20),
+    RAINGAUGE("雨量计", 21);
 
 
     // 成员变量

diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java
index f06802c..80e6dea 100644
--- a/src/main/java/org/well/well/base/DeviceTypeEnum.java
+++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java
@@ -21,7 +21,9 @@
 //    Dig("开挖监测仪", 16),
     NoiseDig("噪声开挖监测仪", 17),
     Locator("井盖定位监测仪", 18),
-    Meter("水质监测仪", 19);
+    Meter("水质监测仪", 19),
+    FLOWGAUGE("流量计", 20),
+    RAINGAUGE("雨量计", 21);
 
 
     // 成员变量
diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java
index 9ae68d2..2318b7f 100644
--- a/src/main/java/org/well/well/manager/DeviceManager.java
+++ b/src/main/java/org/well/well/manager/DeviceManager.java
@@ -123,6 +123,21 @@
                             " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" +
                             " DEVCODE=:devCode";
                     findDeviceDataInSevenDays(device, sql);
+                }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){
+                    sql = "select * from data_meter " +
+                            " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" +
+                            " DEVCODE=:devCode";
+                    findDeviceDataInSevenDays(device, sql);
+                }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){
+                    sql = "select * from data_flowmeter " +
+                            " where date_format(logtime,'%Y-%m-%d')>=:beg and" +
+                            " DEVCODE=:devCode";
+                    findDeviceDataInSevenDays(device, sql);
+                }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){
+                    sql = "select * from data_hyetometer " +
+                            " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" +
+                            " DEVCODE=:devCode";
+                    findDeviceDataInSevenDays(device, sql);
                 }
             }
         }