diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 1a1605d..9d60185 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.impl.BusWellInfoServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -128,4 +129,33 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/updateArea")
+    public void updateArea() {
+        List<Map<String, Object>> areaNameList = busWellInfoService.getAllAreaName();
+        Map<String, String> nameMap = new HashMap<>();
+        for (Map<String, Object> name : areaNameList) {
+            nameMap.put(name.get("id").toString(), name.get("name").toString());
+        }
+
+        List<Map<String, Object>> areaList = busWellInfoService.getAllAreas();
+        for (Map<String, Object> area : areaList) {
+            String pids = area.get("pids").toString().substring(4);
+            String id = area.get("id").toString();
+            String areaName = area.get("area_name").toString();
+
+            String fullName = "";
+            if (ToolUtil.isNotEmpty(pids) == true) {
+                String[] pidList = pids.split(",");
+                for (int i = 0; i < pidList.length; i++) {
+                    String pid = pidList[i].substring(1, pidList[i].length() - 1);
+                    String pidName = nameMap.get(pid);
+                    fullName += pidName + "/";
+                }
+            }
+            fullName += areaName;
+
+            busWellInfoService.setAreaFullName(fullName, id);
+        }
+    }
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 1a1605d..9d60185 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.impl.BusWellInfoServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -128,4 +129,33 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/updateArea")
+    public void updateArea() {
+        List<Map<String, Object>> areaNameList = busWellInfoService.getAllAreaName();
+        Map<String, String> nameMap = new HashMap<>();
+        for (Map<String, Object> name : areaNameList) {
+            nameMap.put(name.get("id").toString(), name.get("name").toString());
+        }
+
+        List<Map<String, Object>> areaList = busWellInfoService.getAllAreas();
+        for (Map<String, Object> area : areaList) {
+            String pids = area.get("pids").toString().substring(4);
+            String id = area.get("id").toString();
+            String areaName = area.get("area_name").toString();
+
+            String fullName = "";
+            if (ToolUtil.isNotEmpty(pids) == true) {
+                String[] pidList = pids.split(",");
+                for (int i = 0; i < pidList.length; i++) {
+                    String pid = pidList[i].substring(1, pidList[i].length() - 1);
+                    String pidName = nameMap.get(pid);
+                    fullName += pidName + "/";
+                }
+            }
+            fullName += areaName;
+
+            busWellInfoService.setAreaFullName(fullName, id);
+        }
+    }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 8ffeab9..96f77ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,AREAFULLNAME,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -122,14 +122,16 @@
     <select id="selectDeviceForMap" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT
         <include refid="view_sql"/>
-        FROM DEVICE_VIEW
-        WHERE VALID = '1'
+        FROM DEVICE_VIEW as dv
+        WHERE dv.VALID = '1'
         <if test="devType != null and devType !=''">
             and deviceType = #{devType}
         </if>
         <if test="keywords != null and keywords !=''">
             and (DEVCODE LIKE <include refid="keywords_sql"/>
-            OR wellCode LIKE <include refid="keywords_sql"/>)
+            OR wellCode LIKE <include refid="keywords_sql"/>
+            OR POSITION LIKE <include refid="keywords_sql"/>
+            OR AREAFULLNAME like <include refid="keywords_sql"/>)
         </if>
     </select>
     <sql id="logTime_toChar" databaseId="mysql">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 1a1605d..9d60185 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.impl.BusWellInfoServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -128,4 +129,33 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/updateArea")
+    public void updateArea() {
+        List<Map<String, Object>> areaNameList = busWellInfoService.getAllAreaName();
+        Map<String, String> nameMap = new HashMap<>();
+        for (Map<String, Object> name : areaNameList) {
+            nameMap.put(name.get("id").toString(), name.get("name").toString());
+        }
+
+        List<Map<String, Object>> areaList = busWellInfoService.getAllAreas();
+        for (Map<String, Object> area : areaList) {
+            String pids = area.get("pids").toString().substring(4);
+            String id = area.get("id").toString();
+            String areaName = area.get("area_name").toString();
+
+            String fullName = "";
+            if (ToolUtil.isNotEmpty(pids) == true) {
+                String[] pidList = pids.split(",");
+                for (int i = 0; i < pidList.length; i++) {
+                    String pid = pidList[i].substring(1, pidList[i].length() - 1);
+                    String pidName = nameMap.get(pid);
+                    fullName += pidName + "/";
+                }
+            }
+            fullName += areaName;
+
+            busWellInfoService.setAreaFullName(fullName, id);
+        }
+    }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 8ffeab9..96f77ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,AREAFULLNAME,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -122,14 +122,16 @@
     <select id="selectDeviceForMap" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT
         <include refid="view_sql"/>
-        FROM DEVICE_VIEW
-        WHERE VALID = '1'
+        FROM DEVICE_VIEW as dv
+        WHERE dv.VALID = '1'
         <if test="devType != null and devType !=''">
             and deviceType = #{devType}
         </if>
         <if test="keywords != null and keywords !=''">
             and (DEVCODE LIKE <include refid="keywords_sql"/>
-            OR wellCode LIKE <include refid="keywords_sql"/>)
+            OR wellCode LIKE <include refid="keywords_sql"/>
+            OR POSITION LIKE <include refid="keywords_sql"/>
+            OR AREAFULLNAME like <include refid="keywords_sql"/>)
         </if>
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
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 d007a4a..adbcc3a 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -80,4 +81,8 @@
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
 
     DeviceInfoDto selectDeviceById(@Param("id") Long id);
+
+    List<Map<String, Object>> getAllAreas();
+    List<Map<String, Object>> getAllAreaName();
+    void setAreaFullName(@Param("fullname") String fullName, @Param("id") String id);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 1a1605d..9d60185 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.impl.BusWellInfoServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -128,4 +129,33 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/updateArea")
+    public void updateArea() {
+        List<Map<String, Object>> areaNameList = busWellInfoService.getAllAreaName();
+        Map<String, String> nameMap = new HashMap<>();
+        for (Map<String, Object> name : areaNameList) {
+            nameMap.put(name.get("id").toString(), name.get("name").toString());
+        }
+
+        List<Map<String, Object>> areaList = busWellInfoService.getAllAreas();
+        for (Map<String, Object> area : areaList) {
+            String pids = area.get("pids").toString().substring(4);
+            String id = area.get("id").toString();
+            String areaName = area.get("area_name").toString();
+
+            String fullName = "";
+            if (ToolUtil.isNotEmpty(pids) == true) {
+                String[] pidList = pids.split(",");
+                for (int i = 0; i < pidList.length; i++) {
+                    String pid = pidList[i].substring(1, pidList[i].length() - 1);
+                    String pidName = nameMap.get(pid);
+                    fullName += pidName + "/";
+                }
+            }
+            fullName += areaName;
+
+            busWellInfoService.setAreaFullName(fullName, id);
+        }
+    }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 8ffeab9..96f77ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,AREAFULLNAME,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -122,14 +122,16 @@
     <select id="selectDeviceForMap" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT
         <include refid="view_sql"/>
-        FROM DEVICE_VIEW
-        WHERE VALID = '1'
+        FROM DEVICE_VIEW as dv
+        WHERE dv.VALID = '1'
         <if test="devType != null and devType !=''">
             and deviceType = #{devType}
         </if>
         <if test="keywords != null and keywords !=''">
             and (DEVCODE LIKE <include refid="keywords_sql"/>
-            OR wellCode LIKE <include refid="keywords_sql"/>)
+            OR wellCode LIKE <include refid="keywords_sql"/>
+            OR POSITION LIKE <include refid="keywords_sql"/>
+            OR AREAFULLNAME like <include refid="keywords_sql"/>)
         </if>
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
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 d007a4a..adbcc3a 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -80,4 +81,8 @@
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
 
     DeviceInfoDto selectDeviceById(@Param("id") Long id);
+
+    List<Map<String, Object>> getAllAreas();
+    List<Map<String, Object>> getAllAreaName();
+    void setAreaFullName(@Param("fullname") String fullName, @Param("id") String id);
 }
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 89c6fb5..ad85f31 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
@@ -461,4 +461,19 @@
         WHERE valid = 1
           and id = #{id} limit 1
     </select>
+
+    <select id="getAllAreas" resultType="map">
+        select id, area_name, pids from sys_area where pids is not null
+    </select>
+
+    <select id="getAllAreaName" resultType="map">
+        select id, area_name as name from sys_area where pids is not null
+    </select>
+
+    <update id="setAreaFullName">
+        UPDATE
+        sys_area
+        SET FULLNAME = #{fullname}
+        WHERE id = #{id}
+    </update>
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 1a1605d..9d60185 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.impl.BusWellInfoServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -128,4 +129,33 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/updateArea")
+    public void updateArea() {
+        List<Map<String, Object>> areaNameList = busWellInfoService.getAllAreaName();
+        Map<String, String> nameMap = new HashMap<>();
+        for (Map<String, Object> name : areaNameList) {
+            nameMap.put(name.get("id").toString(), name.get("name").toString());
+        }
+
+        List<Map<String, Object>> areaList = busWellInfoService.getAllAreas();
+        for (Map<String, Object> area : areaList) {
+            String pids = area.get("pids").toString().substring(4);
+            String id = area.get("id").toString();
+            String areaName = area.get("area_name").toString();
+
+            String fullName = "";
+            if (ToolUtil.isNotEmpty(pids) == true) {
+                String[] pidList = pids.split(",");
+                for (int i = 0; i < pidList.length; i++) {
+                    String pid = pidList[i].substring(1, pidList[i].length() - 1);
+                    String pidName = nameMap.get(pid);
+                    fullName += pidName + "/";
+                }
+            }
+            fullName += areaName;
+
+            busWellInfoService.setAreaFullName(fullName, id);
+        }
+    }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 8ffeab9..96f77ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,AREAFULLNAME,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -122,14 +122,16 @@
     <select id="selectDeviceForMap" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT
         <include refid="view_sql"/>
-        FROM DEVICE_VIEW
-        WHERE VALID = '1'
+        FROM DEVICE_VIEW as dv
+        WHERE dv.VALID = '1'
         <if test="devType != null and devType !=''">
             and deviceType = #{devType}
         </if>
         <if test="keywords != null and keywords !=''">
             and (DEVCODE LIKE <include refid="keywords_sql"/>
-            OR wellCode LIKE <include refid="keywords_sql"/>)
+            OR wellCode LIKE <include refid="keywords_sql"/>
+            OR POSITION LIKE <include refid="keywords_sql"/>
+            OR AREAFULLNAME like <include refid="keywords_sql"/>)
         </if>
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
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 d007a4a..adbcc3a 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -80,4 +81,8 @@
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
 
     DeviceInfoDto selectDeviceById(@Param("id") Long id);
+
+    List<Map<String, Object>> getAllAreas();
+    List<Map<String, Object>> getAllAreaName();
+    void setAreaFullName(@Param("fullname") String fullName, @Param("id") String id);
 }
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 89c6fb5..ad85f31 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
@@ -461,4 +461,19 @@
         WHERE valid = 1
           and id = #{id} limit 1
     </select>
+
+    <select id="getAllAreas" resultType="map">
+        select id, area_name, pids from sys_area where pids is not null
+    </select>
+
+    <select id="getAllAreaName" resultType="map">
+        select id, area_name as name from sys_area where pids is not null
+    </select>
+
+    <update id="setAreaFullName">
+        UPDATE
+        sys_area
+        SET FULLNAME = #{fullname}
+        WHERE id = #{id}
+    </update>
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index 2998fde..c8574da 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -61,4 +62,7 @@
 
     DeviceInfoDto selectDeviceById(Long id);
 
+    List<Map<String, Object>> getAllAreas();
+    List<Map<String, Object>> getAllAreaName();
+    void setAreaFullName(String fullName, String id);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 1a1605d..9d60185 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.service.IAlarmNowViewService;
 import com.casic.missiles.modular.system.service.IBusWellInfoService;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.modular.system.service.impl.BusWellInfoServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -128,4 +129,33 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/updateArea")
+    public void updateArea() {
+        List<Map<String, Object>> areaNameList = busWellInfoService.getAllAreaName();
+        Map<String, String> nameMap = new HashMap<>();
+        for (Map<String, Object> name : areaNameList) {
+            nameMap.put(name.get("id").toString(), name.get("name").toString());
+        }
+
+        List<Map<String, Object>> areaList = busWellInfoService.getAllAreas();
+        for (Map<String, Object> area : areaList) {
+            String pids = area.get("pids").toString().substring(4);
+            String id = area.get("id").toString();
+            String areaName = area.get("area_name").toString();
+
+            String fullName = "";
+            if (ToolUtil.isNotEmpty(pids) == true) {
+                String[] pidList = pids.split(",");
+                for (int i = 0; i < pidList.length; i++) {
+                    String pid = pidList[i].substring(1, pidList[i].length() - 1);
+                    String pidName = nameMap.get(pid);
+                    fullName += pidName + "/";
+                }
+            }
+            fullName += areaName;
+
+            busWellInfoService.setAreaFullName(fullName, id);
+        }
+    }
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 8ffeab9..96f77ff 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
@@ -15,7 +15,7 @@
         <result column="VERSION" property="version"/>
     </resultMap>
     <sql id="view_sql">
-        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
+        ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,AREAFULLNAME,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE,
         <include refid="installdate_toChar"/>
         as INSTALLDATE
     </sql>
@@ -122,14 +122,16 @@
     <select id="selectDeviceForMap" resultType="com.casic.missiles.modular.system.dto.DeviceDto">
         SELECT
         <include refid="view_sql"/>
-        FROM DEVICE_VIEW
-        WHERE VALID = '1'
+        FROM DEVICE_VIEW as dv
+        WHERE dv.VALID = '1'
         <if test="devType != null and devType !=''">
             and deviceType = #{devType}
         </if>
         <if test="keywords != null and keywords !=''">
             and (DEVCODE LIKE <include refid="keywords_sql"/>
-            OR wellCode LIKE <include refid="keywords_sql"/>)
+            OR wellCode LIKE <include refid="keywords_sql"/>
+            OR POSITION LIKE <include refid="keywords_sql"/>
+            OR AREAFULLNAME like <include refid="keywords_sql"/>)
         </if>
     </select>
     <sql id="logTime_toChar" databaseId="mysql">
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 d007a4a..adbcc3a 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
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -80,4 +81,8 @@
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
 
     DeviceInfoDto selectDeviceById(@Param("id") Long id);
+
+    List<Map<String, Object>> getAllAreas();
+    List<Map<String, Object>> getAllAreaName();
+    void setAreaFullName(@Param("fullname") String fullName, @Param("id") String id);
 }
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 89c6fb5..ad85f31 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
@@ -461,4 +461,19 @@
         WHERE valid = 1
           and id = #{id} limit 1
     </select>
+
+    <select id="getAllAreas" resultType="map">
+        select id, area_name, pids from sys_area where pids is not null
+    </select>
+
+    <select id="getAllAreaName" resultType="map">
+        select id, area_name as name from sys_area where pids is not null
+    </select>
+
+    <update id="setAreaFullName">
+        UPDATE
+        sys_area
+        SET FULLNAME = #{fullname}
+        WHERE id = #{id}
+    </update>
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index 2998fde..c8574da 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -61,4 +62,7 @@
 
     DeviceInfoDto selectDeviceById(Long id);
 
+    List<Map<String, Object>> getAllAreas();
+    List<Map<String, Object>> getAllAreaName();
+    void setAreaFullName(String fullName, String id);
 }
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 f80bd46..59ec1ba 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
@@ -635,4 +635,19 @@
     public DeviceInfoDto selectDeviceById(Long id) {
         return this.baseMapper.selectDeviceById(id);
     }
+
+    @Override
+    public List<Map<String, Object>> getAllAreas() {
+        return this.baseMapper.getAllAreas();
+    }
+
+    @Override
+    public List<Map<String, Object>> getAllAreaName() {
+        return this.baseMapper.getAllAreaName();
+    }
+
+    @Override
+    public void setAreaFullName(String fullName, String id) {
+        this.baseMapper.setAreaFullName(fullName, id);
+    }
 }