diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
index d47a3dc..3cfe4a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@
 @Mapper
 public interface BusMapOverviewGisMapper {
 
-    List<DeviceMapVO> deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords);
+    List<DeviceMapVO> deviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("keywords") String keyWords);
 
     DeviceValueMapVO deviceValue(@Param("devcode") String devcode);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
index d47a3dc..3cfe4a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@
 @Mapper
 public interface BusMapOverviewGisMapper {
 
-    List<DeviceMapVO> deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords);
+    List<DeviceMapVO> deviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("keywords") String keyWords);
 
     DeviceValueMapVO deviceValue(@Param("devcode") String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index a5617b7..3e106d6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -28,7 +28,7 @@
 
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
-        position AS "location",onlineState AS "status"
+        position AS "location",onlineState AS "status",wellName AS "wellName"
         FROM device_view dv
         WHERE 1=1
         <if test="deviceType != null and deviceType !=''">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
index d47a3dc..3cfe4a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@
 @Mapper
 public interface BusMapOverviewGisMapper {
 
-    List<DeviceMapVO> deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords);
+    List<DeviceMapVO> deviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("keywords") String keyWords);
 
     DeviceValueMapVO deviceValue(@Param("devcode") String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index a5617b7..3e106d6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -28,7 +28,7 @@
 
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
-        position AS "location",onlineState AS "status"
+        position AS "location",onlineState AS "status",wellName AS "wellName"
         FROM device_view dv
         WHERE 1=1
         <if test="deviceType != null and deviceType !=''">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
index 0fa4aaa..7d8b67d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 
@@ -7,7 +8,7 @@
 
 public interface BusMapOverviewGisService {
 
-    List<DeviceMapVO> deviceList(String deviceType, String keyWords);
+    List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords);
 
     DeviceValueMapVO deviceValue(String devcode);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
index d47a3dc..3cfe4a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@
 @Mapper
 public interface BusMapOverviewGisMapper {
 
-    List<DeviceMapVO> deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords);
+    List<DeviceMapVO> deviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("keywords") String keyWords);
 
     DeviceValueMapVO deviceValue(@Param("devcode") String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index a5617b7..3e106d6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -28,7 +28,7 @@
 
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
-        position AS "location",onlineState AS "status"
+        position AS "location",onlineState AS "status",wellName AS "wellName"
         FROM device_view dv
         WHERE 1=1
         <if test="deviceType != null and deviceType !=''">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
index 0fa4aaa..7d8b67d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 
@@ -7,7 +8,7 @@
 
 public interface BusMapOverviewGisService {
 
-    List<DeviceMapVO> deviceList(String deviceType, String keyWords);
+    List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords);
 
     DeviceValueMapVO deviceValue(String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
index 724d73b..a3d5723 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dao.BusMapOverviewGisMapper;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,13 +21,19 @@
     private final BusMapOverviewGisMapper busMapOverviewGisMapper;
 
     @Override
-    public List<DeviceMapVO> deviceList(String deviceType, String keyWords) {
-        return busMapOverviewGisMapper.deviceList(deviceType, keyWords);
+    public List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords) {
+        return busMapOverviewGisMapper.deviceList(dataScope, deviceType, keyWords);
     }
 
     @Override
     public DeviceValueMapVO deviceValue(String devcode) {
-        return busMapOverviewGisMapper.deviceValue(devcode);
+        DeviceValueMapVO  deviceValueMapVO= busMapOverviewGisMapper.deviceValue(devcode);
+        if(ObjectUtils.isEmpty(deviceValueMapVO)){
+            DeviceValueMapVO deviceValue= new DeviceValueMapVO();
+            deviceValue.setCode(devcode);
+            return deviceValue;
+        }
+        return deviceValueMapVO;
     }
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
index d47a3dc..3cfe4a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@
 @Mapper
 public interface BusMapOverviewGisMapper {
 
-    List<DeviceMapVO> deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords);
+    List<DeviceMapVO> deviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("keywords") String keyWords);
 
     DeviceValueMapVO deviceValue(@Param("devcode") String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index a5617b7..3e106d6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -28,7 +28,7 @@
 
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
-        position AS "location",onlineState AS "status"
+        position AS "location",onlineState AS "status",wellName AS "wellName"
         FROM device_view dv
         WHERE 1=1
         <if test="deviceType != null and deviceType !=''">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
index 0fa4aaa..7d8b67d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 
@@ -7,7 +8,7 @@
 
 public interface BusMapOverviewGisService {
 
-    List<DeviceMapVO> deviceList(String deviceType, String keyWords);
+    List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords);
 
     DeviceValueMapVO deviceValue(String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
index 724d73b..a3d5723 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dao.BusMapOverviewGisMapper;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,13 +21,19 @@
     private final BusMapOverviewGisMapper busMapOverviewGisMapper;
 
     @Override
-    public List<DeviceMapVO> deviceList(String deviceType, String keyWords) {
-        return busMapOverviewGisMapper.deviceList(deviceType, keyWords);
+    public List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords) {
+        return busMapOverviewGisMapper.deviceList(dataScope, deviceType, keyWords);
     }
 
     @Override
     public DeviceValueMapVO deviceValue(String devcode) {
-        return busMapOverviewGisMapper.deviceValue(devcode);
+        DeviceValueMapVO  deviceValueMapVO= busMapOverviewGisMapper.deviceValue(devcode);
+        if(ObjectUtils.isEmpty(deviceValueMapVO)){
+            DeviceValueMapVO deviceValue= new DeviceValueMapVO();
+            deviceValue.setCode(devcode);
+            return deviceValue;
+        }
+        return deviceValueMapVO;
     }
 
 
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 5f0f292..886fc8f 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
@@ -227,7 +227,7 @@
     @RequestMapping(value = "/add")
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid @RequestBody  Device device, BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
index d47a3dc..3cfe4a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@
 @Mapper
 public interface BusMapOverviewGisMapper {
 
-    List<DeviceMapVO> deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords);
+    List<DeviceMapVO> deviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("keywords") String keyWords);
 
     DeviceValueMapVO deviceValue(@Param("devcode") String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index a5617b7..3e106d6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -28,7 +28,7 @@
 
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
-        position AS "location",onlineState AS "status"
+        position AS "location",onlineState AS "status",wellName AS "wellName"
         FROM device_view dv
         WHERE 1=1
         <if test="deviceType != null and deviceType !=''">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
index 0fa4aaa..7d8b67d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 
@@ -7,7 +8,7 @@
 
 public interface BusMapOverviewGisService {
 
-    List<DeviceMapVO> deviceList(String deviceType, String keyWords);
+    List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords);
 
     DeviceValueMapVO deviceValue(String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
index 724d73b..a3d5723 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dao.BusMapOverviewGisMapper;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,13 +21,19 @@
     private final BusMapOverviewGisMapper busMapOverviewGisMapper;
 
     @Override
-    public List<DeviceMapVO> deviceList(String deviceType, String keyWords) {
-        return busMapOverviewGisMapper.deviceList(deviceType, keyWords);
+    public List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords) {
+        return busMapOverviewGisMapper.deviceList(dataScope, deviceType, keyWords);
     }
 
     @Override
     public DeviceValueMapVO deviceValue(String devcode) {
-        return busMapOverviewGisMapper.deviceValue(devcode);
+        DeviceValueMapVO  deviceValueMapVO= busMapOverviewGisMapper.deviceValue(devcode);
+        if(ObjectUtils.isEmpty(deviceValueMapVO)){
+            DeviceValueMapVO deviceValue= new DeviceValueMapVO();
+            deviceValue.setCode(devcode);
+            return deviceValue;
+        }
+        return deviceValueMapVO;
     }
 
 
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 5f0f292..886fc8f 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
@@ -227,7 +227,7 @@
     @RequestMapping(value = "/add")
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid @RequestBody  Device device, BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
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 00d3915..57e785d 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
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("唯一性")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常");
         }
         return responseData;
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
index d47a3dc..3cfe4a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@
 @Mapper
 public interface BusMapOverviewGisMapper {
 
-    List<DeviceMapVO> deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords);
+    List<DeviceMapVO> deviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("keywords") String keyWords);
 
     DeviceValueMapVO deviceValue(@Param("devcode") String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index a5617b7..3e106d6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -28,7 +28,7 @@
 
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
-        position AS "location",onlineState AS "status"
+        position AS "location",onlineState AS "status",wellName AS "wellName"
         FROM device_view dv
         WHERE 1=1
         <if test="deviceType != null and deviceType !=''">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
index 0fa4aaa..7d8b67d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 
@@ -7,7 +8,7 @@
 
 public interface BusMapOverviewGisService {
 
-    List<DeviceMapVO> deviceList(String deviceType, String keyWords);
+    List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords);
 
     DeviceValueMapVO deviceValue(String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
index 724d73b..a3d5723 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dao.BusMapOverviewGisMapper;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,13 +21,19 @@
     private final BusMapOverviewGisMapper busMapOverviewGisMapper;
 
     @Override
-    public List<DeviceMapVO> deviceList(String deviceType, String keyWords) {
-        return busMapOverviewGisMapper.deviceList(deviceType, keyWords);
+    public List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords) {
+        return busMapOverviewGisMapper.deviceList(dataScope, deviceType, keyWords);
     }
 
     @Override
     public DeviceValueMapVO deviceValue(String devcode) {
-        return busMapOverviewGisMapper.deviceValue(devcode);
+        DeviceValueMapVO  deviceValueMapVO= busMapOverviewGisMapper.deviceValue(devcode);
+        if(ObjectUtils.isEmpty(deviceValueMapVO)){
+            DeviceValueMapVO deviceValue= new DeviceValueMapVO();
+            deviceValue.setCode(devcode);
+            return deviceValue;
+        }
+        return deviceValueMapVO;
     }
 
 
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 5f0f292..886fc8f 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
@@ -227,7 +227,7 @@
     @RequestMapping(value = "/add")
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid @RequestBody  Device device, BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
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 00d3915..57e785d 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
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("唯一性")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常");
         }
         return responseData;
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
index 07c65c7..a78413c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
@@ -59,14 +59,14 @@
         String password = "111111";
         SuccessResponseData resultData = new SuccessResponseData();
         //去除用户登录锁
-//        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
+        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
         super.getSession().setAttribute("isApp", false);
         Subject currentUser = ShiroKit.getSubject();
         UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray());
         token.setRememberMe(false);
         try {
             currentUser.login(token);
-//            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
+            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
         } catch (Exception var17) {
             resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode());
             resultData.setMessage(I18nFactory.getMessage("admin.nouser.error"));
@@ -113,7 +113,7 @@
         resultData.setData(new LoginSuccessDTO(session.getId().toString(), (String) null));
         resultData.setMessage(I18nFactory.getMessage("login.sucess"));
         this.publisher.publishEvent(new UserLoginEvent(LoginEventTypeEnum.LOGIN_ON, ShiroKit.getUser()));
-        this.sessionCacheManager.sessionCache(session, authUser.getAccount());
+//        this.sessionCacheManager.sessionCache(session, authUser.getAccount());
         return resultData;
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 804d656..066986a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -225,7 +225,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 9c60e79..a4b2e9d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -120,7 +120,7 @@
                 map.replace("alarmValue", alarmValue);
             }
             if ("浓度超限".equals(alarmContentName)) {
-                alarmValue += "%LEL";
+                alarmValue += "ppm";
                 map.replace("alarmValue", alarmValue);
             }
             if ("疑似开挖".equals(alarmContentName)) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index c3e0f73..5973ec8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -15,7 +15,7 @@
 
     <select id="selectListPage" resultType="MAP">
         SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType",
-        ALARM_CONTENT AS "alarmContent",ID AS id
+        ALARM_CONTENT AS "alarmContent",ID AS "id"
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType != null and alarmType !=-1">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
index 31adf46..e63152a 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewGisController.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.controller;
 
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,6 +21,7 @@
 public class BusMapOverviewGisController extends BaseController {
 
     private final BusMapOverviewGisService busMapOverviewGisService;
+    private final AbstractPermissionContext permissionService;
 
     /*
      * 获取列表
@@ -26,7 +29,8 @@
     @RequestMapping(value = "/deviceList")
     public Object deviceList(@RequestParam(required = false) String keywords,
                              @RequestParam(required = false) String deviceType) {
-        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(deviceType, keywords);
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMapVO> mapList = busMapOverviewGisService.deviceList(dataScope,deviceType, keywords);
         return ResponseData.success(mapList);
     }
 
@@ -36,6 +40,7 @@
     @RequestMapping(value = "/deviceValue")
     public Object deviceValue(@RequestParam(required = true) String code) {
         DeviceValueMapVO deviceValue = busMapOverviewGisService.deviceValue(code);
+
         return ResponseData.success(deviceValue);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
index d47a3dc..3cfe4a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/BusMapOverviewGisMapper.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@
 @Mapper
 public interface BusMapOverviewGisMapper {
 
-    List<DeviceMapVO> deviceList(@Param("deviceType") String deviceType, @Param("keywords") String keyWords);
+    List<DeviceMapVO> deviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("keywords") String keyWords);
 
     DeviceValueMapVO deviceValue(@Param("devcode") String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
index a5617b7..3e106d6 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMapOverviewGisMapper.xml
@@ -28,7 +28,7 @@
 
     <select id="deviceList" resultType="com.casic.missiles.modular.system.model.DeviceMapVO">
         SELECT id AS "id",lat AS "lat",lng AS "lng",devicename AS "name",dv.devcode as "code",
-        position AS "location",onlineState AS "status"
+        position AS "location",onlineState AS "status",wellName AS "wellName"
         FROM device_view dv
         WHERE 1=1
         <if test="deviceType != null and deviceType !=''">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
index 0fa4aaa..7d8b67d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/BusMapOverviewGisService.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
 
@@ -7,7 +8,7 @@
 
 public interface BusMapOverviewGisService {
 
-    List<DeviceMapVO> deviceList(String deviceType, String keyWords);
+    List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords);
 
     DeviceValueMapVO deviceValue(String devcode);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
index 724d73b..a3d5723 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/BusMapOverviewGisServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dao.BusMapOverviewGisMapper;
 import com.casic.missiles.modular.system.model.DeviceMapVO;
 import com.casic.missiles.modular.system.model.DeviceValueMapVO;
@@ -19,13 +21,19 @@
     private final BusMapOverviewGisMapper busMapOverviewGisMapper;
 
     @Override
-    public List<DeviceMapVO> deviceList(String deviceType, String keyWords) {
-        return busMapOverviewGisMapper.deviceList(deviceType, keyWords);
+    public List<DeviceMapVO> deviceList(DataScope dataScope, String deviceType, String keyWords) {
+        return busMapOverviewGisMapper.deviceList(dataScope, deviceType, keyWords);
     }
 
     @Override
     public DeviceValueMapVO deviceValue(String devcode) {
-        return busMapOverviewGisMapper.deviceValue(devcode);
+        DeviceValueMapVO  deviceValueMapVO= busMapOverviewGisMapper.deviceValue(devcode);
+        if(ObjectUtils.isEmpty(deviceValueMapVO)){
+            DeviceValueMapVO deviceValue= new DeviceValueMapVO();
+            deviceValue.setCode(devcode);
+            return deviceValue;
+        }
+        return deviceValueMapVO;
     }
 
 
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 5f0f292..886fc8f 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
@@ -227,7 +227,7 @@
     @RequestMapping(value = "/add")
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid @RequestBody  Device device, BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
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 00d3915..57e785d 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
@@ -136,7 +136,7 @@
             responseData.setCode(200);
         } catch (DataAccessException dax) {
             log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax);
-            responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常");
+            responseData.setMessage(dax.getMessage().contains("唯一性")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常");
         }
         return responseData;
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
index 07c65c7..a78413c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
@@ -59,14 +59,14 @@
         String password = "111111";
         SuccessResponseData resultData = new SuccessResponseData();
         //去除用户登录锁
-//        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
+        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
         super.getSession().setAttribute("isApp", false);
         Subject currentUser = ShiroKit.getSubject();
         UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray());
         token.setRememberMe(false);
         try {
             currentUser.login(token);
-//            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
+            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
         } catch (Exception var17) {
             resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode());
             resultData.setMessage(I18nFactory.getMessage("admin.nouser.error"));
@@ -113,7 +113,7 @@
         resultData.setData(new LoginSuccessDTO(session.getId().toString(), (String) null));
         resultData.setMessage(I18nFactory.getMessage("login.sucess"));
         this.publisher.publishEvent(new UserLoginEvent(LoginEventTypeEnum.LOGIN_ON, ShiroKit.getUser()));
-        this.sessionCacheManager.sessionCache(session, authUser.getAccount());
+//        this.sessionCacheManager.sessionCache(session, authUser.getAccount());
         return resultData;
     }
 
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 179d91c..26c7076 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -46,7 +46,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "cz";
+            username = "dazhou";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();