diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });
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 6528cc1..a376ba8 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
@@ -108,4 +108,6 @@
     String getNoiseData();
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> getAreas();
 }

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });
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 6528cc1..a376ba8 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
@@ -108,4 +108,6 @@
     String getNoiseData();
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> getAreas();
 }
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 c328098..eee62f1 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
@@ -105,14 +105,11 @@
             <include refid="endtime_sql"/>
         </if>
         <if test="keywords != null and keywords !=''">
-            and (DEVCODE like
-            <include refid="keywords_sql"/>
-            OR wellCode LIKE
-            <include refid="keywords_sql"/>
-            )
+            and (DEVCODE LIKE <include refid="keywords_sql"/>
+            OR wellCode LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId !=''">
-            and area LIKE #{areaId}
+            and area LIKE <include refid="keywords_sql"/>
         </if>
         ORDER BY INSTALLDATE DESC
     </select>
@@ -598,17 +595,10 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE
@@ -976,7 +966,6 @@
                  join device_view as dv on dv.DEVCODE = dwm.DEVCODE
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
-          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectDeviceData" resultType="map">
@@ -1066,4 +1055,9 @@
             AND dv.deviceType = #{devType}
         </if>
     </select>
+
+    <select id="getAreas" resultType="map">
+        SELECT *
+        FROM sys_area
+    </select>
 </mapper>

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });
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 6528cc1..a376ba8 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
@@ -108,4 +108,6 @@
     String getNoiseData();
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> getAreas();
 }
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 c328098..eee62f1 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
@@ -105,14 +105,11 @@
             <include refid="endtime_sql"/>
         </if>
         <if test="keywords != null and keywords !=''">
-            and (DEVCODE like
-            <include refid="keywords_sql"/>
-            OR wellCode LIKE
-            <include refid="keywords_sql"/>
-            )
+            and (DEVCODE LIKE <include refid="keywords_sql"/>
+            OR wellCode LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId !=''">
-            and area LIKE #{areaId}
+            and area LIKE <include refid="keywords_sql"/>
         </if>
         ORDER BY INSTALLDATE DESC
     </select>
@@ -598,17 +595,10 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE
@@ -976,7 +966,6 @@
                  join device_view as dv on dv.DEVCODE = dwm.DEVCODE
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
-          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectDeviceData" resultType="map">
@@ -1066,4 +1055,9 @@
             AND dv.deviceType = #{devType}
         </if>
     </select>
+
+    <select id="getAreas" resultType="map">
+        SELECT *
+        FROM sys_area
+    </select>
 </mapper>
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 c5a9389..cee784c 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
@@ -199,4 +199,6 @@
      * @return {@link List<Map>}
      */
 //    List<Map<String, Object>> countByFirstArea(String devType, String startTime, String endTime);
+
+    List<Map<String,Object>>  getAreas();
 }

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });
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 6528cc1..a376ba8 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
@@ -108,4 +108,6 @@
     String getNoiseData();
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> getAreas();
 }
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 c328098..eee62f1 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
@@ -105,14 +105,11 @@
             <include refid="endtime_sql"/>
         </if>
         <if test="keywords != null and keywords !=''">
-            and (DEVCODE like
-            <include refid="keywords_sql"/>
-            OR wellCode LIKE
-            <include refid="keywords_sql"/>
-            )
+            and (DEVCODE LIKE <include refid="keywords_sql"/>
+            OR wellCode LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId !=''">
-            and area LIKE #{areaId}
+            and area LIKE <include refid="keywords_sql"/>
         </if>
         ORDER BY INSTALLDATE DESC
     </select>
@@ -598,17 +595,10 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE
@@ -976,7 +966,6 @@
                  join device_view as dv on dv.DEVCODE = dwm.DEVCODE
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
-          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectDeviceData" resultType="map">
@@ -1066,4 +1055,9 @@
             AND dv.deviceType = #{devType}
         </if>
     </select>
+
+    <select id="getAreas" resultType="map">
+        SELECT *
+        FROM sys_area
+    </select>
 </mapper>
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 c5a9389..cee784c 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
@@ -199,4 +199,6 @@
      * @return {@link List<Map>}
      */
 //    List<Map<String, Object>> countByFirstArea(String devType, String startTime, String endTime);
+
+    List<Map<String,Object>>  getAreas();
 }
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 52d3e88..bf94a23 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
@@ -569,4 +569,9 @@
 //    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();
+    }
 }

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });
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 6528cc1..a376ba8 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
@@ -108,4 +108,6 @@
     String getNoiseData();
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> getAreas();
 }
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 c328098..eee62f1 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
@@ -105,14 +105,11 @@
             <include refid="endtime_sql"/>
         </if>
         <if test="keywords != null and keywords !=''">
-            and (DEVCODE like
-            <include refid="keywords_sql"/>
-            OR wellCode LIKE
-            <include refid="keywords_sql"/>
-            )
+            and (DEVCODE LIKE <include refid="keywords_sql"/>
+            OR wellCode LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId !=''">
-            and area LIKE #{areaId}
+            and area LIKE <include refid="keywords_sql"/>
         </if>
         ORDER BY INSTALLDATE DESC
     </select>
@@ -598,17 +595,10 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE
@@ -976,7 +966,6 @@
                  join device_view as dv on dv.DEVCODE = dwm.DEVCODE
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
-          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectDeviceData" resultType="map">
@@ -1066,4 +1055,9 @@
             AND dv.deviceType = #{devType}
         </if>
     </select>
+
+    <select id="getAreas" resultType="map">
+        SELECT *
+        FROM sys_area
+    </select>
 </mapper>
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 c5a9389..cee784c 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
@@ -199,4 +199,6 @@
      * @return {@link List<Map>}
      */
 //    List<Map<String, Object>> countByFirstArea(String devType, String startTime, String endTime);
+
+    List<Map<String,Object>>  getAreas();
 }
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 52d3e88..bf94a23 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
@@ -569,4 +569,9 @@
 //    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();
+    }
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 5c2ada9..b6acdee 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -85,7 +85,7 @@
             responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
         }
-        areaId += "%";
+//        areaId += "%";
         List<BusWellInfo> list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId);
         page.setRecords(list);
         return new SuccessResponseData(super.packForBT(page));

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });
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 6528cc1..a376ba8 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
@@ -108,4 +108,6 @@
     String getNoiseData();
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> getAreas();
 }
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 c328098..eee62f1 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
@@ -105,14 +105,11 @@
             <include refid="endtime_sql"/>
         </if>
         <if test="keywords != null and keywords !=''">
-            and (DEVCODE like
-            <include refid="keywords_sql"/>
-            OR wellCode LIKE
-            <include refid="keywords_sql"/>
-            )
+            and (DEVCODE LIKE <include refid="keywords_sql"/>
+            OR wellCode LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId !=''">
-            and area LIKE #{areaId}
+            and area LIKE <include refid="keywords_sql"/>
         </if>
         ORDER BY INSTALLDATE DESC
     </select>
@@ -598,17 +595,10 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE
@@ -976,7 +966,6 @@
                  join device_view as dv on dv.DEVCODE = dwm.DEVCODE
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
-          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectDeviceData" resultType="map">
@@ -1066,4 +1055,9 @@
             AND dv.deviceType = #{devType}
         </if>
     </select>
+
+    <select id="getAreas" resultType="map">
+        SELECT *
+        FROM sys_area
+    </select>
 </mapper>
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 c5a9389..cee784c 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
@@ -199,4 +199,6 @@
      * @return {@link List<Map>}
      */
 //    List<Map<String, Object>> countByFirstArea(String devType, String startTime, String endTime);
+
+    List<Map<String,Object>>  getAreas();
 }
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 52d3e88..bf94a23 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
@@ -569,4 +569,9 @@
 //    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();
+    }
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 5c2ada9..b6acdee 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -85,7 +85,7 @@
             responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
         }
-        areaId += "%";
+//        areaId += "%";
         List<BusWellInfo> list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId);
         page.setRecords(list);
         return new SuccessResponseData(super.packForBT(page));
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index f7a64c7..d007a4a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -1,10 +1,10 @@
 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.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -60,6 +60,7 @@
     String getAreaId(@Param("qu") String qu, @Param("area") String area);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });
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 6528cc1..a376ba8 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
@@ -108,4 +108,6 @@
     String getNoiseData();
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> getAreas();
 }
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 c328098..eee62f1 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
@@ -105,14 +105,11 @@
             <include refid="endtime_sql"/>
         </if>
         <if test="keywords != null and keywords !=''">
-            and (DEVCODE like
-            <include refid="keywords_sql"/>
-            OR wellCode LIKE
-            <include refid="keywords_sql"/>
-            )
+            and (DEVCODE LIKE <include refid="keywords_sql"/>
+            OR wellCode LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId !=''">
-            and area LIKE #{areaId}
+            and area LIKE <include refid="keywords_sql"/>
         </if>
         ORDER BY INSTALLDATE DESC
     </select>
@@ -598,17 +595,10 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE
@@ -976,7 +966,6 @@
                  join device_view as dv on dv.DEVCODE = dwm.DEVCODE
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
-          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectDeviceData" resultType="map">
@@ -1066,4 +1055,9 @@
             AND dv.deviceType = #{devType}
         </if>
     </select>
+
+    <select id="getAreas" resultType="map">
+        SELECT *
+        FROM sys_area
+    </select>
 </mapper>
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 c5a9389..cee784c 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
@@ -199,4 +199,6 @@
      * @return {@link List<Map>}
      */
 //    List<Map<String, Object>> countByFirstArea(String devType, String startTime, String endTime);
+
+    List<Map<String,Object>>  getAreas();
 }
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 52d3e88..bf94a23 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
@@ -569,4 +569,9 @@
 //    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();
+    }
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 5c2ada9..b6acdee 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -85,7 +85,7 @@
             responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
         }
-        areaId += "%";
+//        areaId += "%";
         List<BusWellInfo> list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId);
         page.setRecords(list);
         return new SuccessResponseData(super.packForBT(page));
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index f7a64c7..d007a4a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -1,10 +1,10 @@
 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.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -60,6 +60,7 @@
     String getAreaId(@Param("qu") String qu, @Param("area") String area);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index b884b6a..70f5325 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -73,32 +73,21 @@
             and (w.WELL_CODE like
             <include refid="keywords_sql"/>
             or w.POSITION like
-            <include refid="keywords_sql"/>
-            )
+            <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId != ''">
-            and w.AREA like #{areaId}
+            and w.AREA like <include refid="keywords_sql"/>
         </if>
     </select>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        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
+        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">

diff --git a/casic-device/pom.xml b/casic-device/pom.xml
index 2f74cd0..8f02469 100644
--- a/casic-device/pom.xml
+++ b/casic-device/pom.xml
@@ -133,6 +133,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-admin-area</artifactId>
+            <version>1.0.1.alpha</version>
+        </dependency>
         <!-- mq end -->
     </dependencies>
     <build>
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 8d4750e..8316f46 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
@@ -27,6 +27,7 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
+import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
@@ -77,6 +78,9 @@
     @Autowired
     private IDeviceModelsService deviceModelsService;
 
+    @Autowired
+    private IAreaService iAreaService;
+
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
@@ -312,7 +316,7 @@
         return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime));
     }
 
-//    @ApiOperation("统计设备在一定时间段内报警数")
+    //    @ApiOperation("统计设备在一定时间段内报警数")
 //    @RequestMapping(value = "/alarmCountByDay")
 //    @ResponseBody
 //    public Object alarmCountByDay(String beginTime, String endTime) {
@@ -321,4 +325,12 @@
 //        }
 //        return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime));
 //    }
+
+
+    @RequestMapping(value = "/getAreas")
+    @ResponseBody
+    public Object getAreas() {
+        //设备类型列表查询
+        return ResponseData.success(iAreaService.selectList(null));
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index 107a876..17556c7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -42,7 +43,7 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
+//        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId);
 
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -52,17 +53,34 @@
         list.forEach(deviceDto -> {
             // 获取日月年用水量和最近的读数
             Map<String, Object> dayMeter = deviceService.selectWaterMeterDay(deviceDto.getDevcode(), date);
-            deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            if (dayMeter == null) {
+                deviceDto.setDayCount("0");
+            } else {
+                deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString());
+            }
 
             Map<String, Object> monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7));
-            deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            if (monthMeter == null) {
+                deviceDto.setMonthCount("0");
+            } else {
+                deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString());
+            }
 
             Map<String, Object> totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4));
-            deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            if (totalMeter == null) {
+                deviceDto.setTotalCount("0");
+            } else {
+                deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString());
+            }
 
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
-            deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
-            deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            if (meterRec == null) {
+                deviceDto.setWatchNum("0");
+                deviceDto.setUptime(sdf4.format(new Date()));
+            } else {
+                deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString());
+                deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
+            }
 
             deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()));
         });
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 6528cc1..a376ba8 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
@@ -108,4 +108,6 @@
     String getNoiseData();
 
 //    List<Map<String, Object>> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> getAreas();
 }
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 c328098..eee62f1 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
@@ -105,14 +105,11 @@
             <include refid="endtime_sql"/>
         </if>
         <if test="keywords != null and keywords !=''">
-            and (DEVCODE like
-            <include refid="keywords_sql"/>
-            OR wellCode LIKE
-            <include refid="keywords_sql"/>
-            )
+            and (DEVCODE LIKE <include refid="keywords_sql"/>
+            OR wellCode LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId !=''">
-            and area LIKE #{areaId}
+            and area LIKE <include refid="keywords_sql"/>
         </if>
         ORDER BY INSTALLDATE DESC
     </select>
@@ -598,17 +595,10 @@
     </select>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="begintime_sql" databaseId="oracle">
         TO_DATE
@@ -976,7 +966,6 @@
                  join device_view as dv on dv.DEVCODE = dwm.DEVCODE
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
-          AND dwm.MONTH LIKE CONCAT(#{year}, '%')
     </select>
 
     <select id="selectDeviceData" resultType="map">
@@ -1066,4 +1055,9 @@
             AND dv.deviceType = #{devType}
         </if>
     </select>
+
+    <select id="getAreas" resultType="map">
+        SELECT *
+        FROM sys_area
+    </select>
 </mapper>
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 c5a9389..cee784c 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
@@ -199,4 +199,6 @@
      * @return {@link List<Map>}
      */
 //    List<Map<String, Object>> countByFirstArea(String devType, String startTime, String endTime);
+
+    List<Map<String,Object>>  getAreas();
 }
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 52d3e88..bf94a23 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
@@ -569,4 +569,9 @@
 //    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();
+    }
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 5c2ada9..b6acdee 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -85,7 +85,7 @@
             responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
         }
-        areaId += "%";
+//        areaId += "%";
         List<BusWellInfo> list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId);
         page.setRecords(list);
         return new SuccessResponseData(super.packForBT(page));
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index f7a64c7..d007a4a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -1,10 +1,10 @@
 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.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -60,6 +60,7 @@
     String getAreaId(@Param("qu") String qu, @Param("area") String area);
 
     String getArea(@Param("id") String id);
+
     String getAreaPId(@Param("id") String id);
 
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index b884b6a..70f5325 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -73,32 +73,21 @@
             and (w.WELL_CODE like
             <include refid="keywords_sql"/>
             or w.POSITION like
-            <include refid="keywords_sql"/>
-            )
+            <include refid="keywords_sql"/>)
         </if>
         <if test="areaId != null and areaId != ''">
-            and w.AREA like #{areaId}
+            and w.AREA like <include refid="keywords_sql"/>
         </if>
     </select>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||
-        #{keywords}
-        ||
-        '%'
+        '%' || #{keywords} || '%'
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
-        CONCAT
-        ('%',
-        #{keywords},
-        '%'
-        )
+        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
+        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">
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index ba94905..a1f2137 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -435,12 +435,13 @@
     public String getAreaFullNameById(String area) {
         String fullName = this.baseMapper.getArea(area);
         String pid = this.baseMapper.getAreaPId(area);
-        if (pid.equals("0")) {
-            return fullName;
-        } else {
-            fullName = getAreaFullNameById(pid) + "/" + fullName;
-            return fullName;
-        }
+//        if (pid.equals("0")) {
+//            return fullName;
+//        } else {
+//            fullName = getAreaFullNameById(pid) + "/" + fullName;
+//            return fullName;
+//        }
+        return fullName;
     }
 
     @Override