diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 4926343..8fd8a96 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -54,11 +54,11 @@
         return sysDictMapper.getAlarmContentByName(sName);
     }
 
-    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode")
-    public Map<String ,Object> getWellInfoViaCode(String wellCode)
+    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId")
+    public Map<String ,Object> getWellInfoViaCode(String wellCode,Long deptId)
     {
         Map<String ,Object> retMap = new HashMap<>();
-        retMap = sysDictMapper.getWellInfoViaCode(wellCode);
+        retMap = sysDictMapper.getWellInfoViaCode(wellCode,deptId);
         return retMap;
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 4926343..8fd8a96 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -54,11 +54,11 @@
         return sysDictMapper.getAlarmContentByName(sName);
     }
 
-    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode")
-    public Map<String ,Object> getWellInfoViaCode(String wellCode)
+    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId")
+    public Map<String ,Object> getWellInfoViaCode(String wellCode,Long deptId)
     {
         Map<String ,Object> retMap = new HashMap<>();
-        retMap = sysDictMapper.getWellInfoViaCode(wellCode);
+        retMap = sysDictMapper.getWellInfoViaCode(wellCode,deptId);
         return retMap;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 7184c28..78b04d7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,7 +30,7 @@
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
     String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode,@Param("deptId") Long deptId);
 //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
     String getUsernameById(@Param("id") long id);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 4926343..8fd8a96 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -54,11 +54,11 @@
         return sysDictMapper.getAlarmContentByName(sName);
     }
 
-    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode")
-    public Map<String ,Object> getWellInfoViaCode(String wellCode)
+    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId")
+    public Map<String ,Object> getWellInfoViaCode(String wellCode,Long deptId)
     {
         Map<String ,Object> retMap = new HashMap<>();
-        retMap = sysDictMapper.getWellInfoViaCode(wellCode);
+        retMap = sysDictMapper.getWellInfoViaCode(wellCode,deptId);
         return retMap;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 7184c28..78b04d7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,7 +30,7 @@
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
     String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode,@Param("deptId") Long deptId);
 //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
     String getUsernameById(@Param("id") long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 36e65a7..5a84a1e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -91,7 +91,8 @@
         SELECT ID as wellId,POSITION as position,DEPTID as deptid
          ,ifnull(STAFF,'') as staff ,ifnull(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
+        and DEPTID = #{deptId}
     </select>
 
     <select id="getAlarmContentName" resultType="String">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 4926343..8fd8a96 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -54,11 +54,11 @@
         return sysDictMapper.getAlarmContentByName(sName);
     }
 
-    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode")
-    public Map<String ,Object> getWellInfoViaCode(String wellCode)
+    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId")
+    public Map<String ,Object> getWellInfoViaCode(String wellCode,Long deptId)
     {
         Map<String ,Object> retMap = new HashMap<>();
-        retMap = sysDictMapper.getWellInfoViaCode(wellCode);
+        retMap = sysDictMapper.getWellInfoViaCode(wellCode,deptId);
         return retMap;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 7184c28..78b04d7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,7 +30,7 @@
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
     String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode,@Param("deptId") Long deptId);
 //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
     String getUsernameById(@Param("id") long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 36e65a7..5a84a1e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -91,7 +91,8 @@
         SELECT ID as wellId,POSITION as position,DEPTID as deptid
          ,ifnull(STAFF,'') as staff ,ifnull(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
+        and DEPTID = #{deptId}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
index 87463f8..a0bb9cb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
@@ -35,7 +35,8 @@
 
         //设置闸井相关字段
         String wellCode = map.get("wellCode").toString();
-        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode);
+        Long deptId = Long.valueOf(map.get("deptid").toString());
+        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode,deptId);
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 4926343..8fd8a96 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -54,11 +54,11 @@
         return sysDictMapper.getAlarmContentByName(sName);
     }
 
-    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode")
-    public Map<String ,Object> getWellInfoViaCode(String wellCode)
+    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId")
+    public Map<String ,Object> getWellInfoViaCode(String wellCode,Long deptId)
     {
         Map<String ,Object> retMap = new HashMap<>();
-        retMap = sysDictMapper.getWellInfoViaCode(wellCode);
+        retMap = sysDictMapper.getWellInfoViaCode(wellCode,deptId);
         return retMap;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 7184c28..78b04d7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,7 +30,7 @@
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
     String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode,@Param("deptId") Long deptId);
 //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
     String getUsernameById(@Param("id") long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 36e65a7..5a84a1e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -91,7 +91,8 @@
         SELECT ID as wellId,POSITION as position,DEPTID as deptid
          ,ifnull(STAFF,'') as staff ,ifnull(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
+        and DEPTID = #{deptId}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
index 87463f8..a0bb9cb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
@@ -35,7 +35,8 @@
 
         //设置闸井相关字段
         String wellCode = map.get("wellCode").toString();
-        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode);
+        Long deptId = Long.valueOf(map.get("deptid").toString());
+        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode,deptId);
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
index 5e47f6e..ccdbc46 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
@@ -17,7 +17,8 @@
 
         // 设置闸井相关字段
         String wellCode = map.get("wellCode").toString();
-        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode);
+        Long deptId = Long.valueOf(map.get("deptid").toString());
+        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode,deptId);
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 4926343..8fd8a96 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -54,11 +54,11 @@
         return sysDictMapper.getAlarmContentByName(sName);
     }
 
-    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode")
-    public Map<String ,Object> getWellInfoViaCode(String wellCode)
+    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId")
+    public Map<String ,Object> getWellInfoViaCode(String wellCode,Long deptId)
     {
         Map<String ,Object> retMap = new HashMap<>();
-        retMap = sysDictMapper.getWellInfoViaCode(wellCode);
+        retMap = sysDictMapper.getWellInfoViaCode(wellCode,deptId);
         return retMap;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 7184c28..78b04d7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,7 +30,7 @@
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
     String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode,@Param("deptId") Long deptId);
 //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
     String getUsernameById(@Param("id") long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 36e65a7..5a84a1e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -91,7 +91,8 @@
         SELECT ID as wellId,POSITION as position,DEPTID as deptid
          ,ifnull(STAFF,'') as staff ,ifnull(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
+        and DEPTID = #{deptId}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
index 87463f8..a0bb9cb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
@@ -35,7 +35,8 @@
 
         //设置闸井相关字段
         String wellCode = map.get("wellCode").toString();
-        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode);
+        Long deptId = Long.valueOf(map.get("deptid").toString());
+        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode,deptId);
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
index 5e47f6e..ccdbc46 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
@@ -17,7 +17,8 @@
 
         // 设置闸井相关字段
         String wellCode = map.get("wellCode").toString();
-        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode);
+        Long deptId = Long.valueOf(map.get("deptid").toString());
+        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode,deptId);
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr);
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 a4a2fdd..1458656 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
@@ -181,13 +181,17 @@
     </select>
 
     <select id="gasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+
+
         SELECT
-        STRENGTH AS data,UPTIME AS logtime
-        FROM data_gas
-        WHERE DEVCODE = #{devcode}
-        ORDER BY UPTIME
-        DESC
-        LIMIT 1
+            STRENGTH AS DATA,
+            UPTIME AS logtime
+        FROM
+            data_gas
+        WHERE
+                UPTIME = ( SELECT MAX( UPTIME ) FROM data_gas WHERE DEVCODE = #{devcode} )
+            LIMIT 1
+
     </select>
 
     <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 4926343..8fd8a96 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -54,11 +54,11 @@
         return sysDictMapper.getAlarmContentByName(sName);
     }
 
-    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#wellCode")
-    public Map<String ,Object> getWellInfoViaCode(String wellCode)
+    @Cacheable(value = "CONSTANT", key = "'wellInfo-'+#deptId")
+    public Map<String ,Object> getWellInfoViaCode(String wellCode,Long deptId)
     {
         Map<String ,Object> retMap = new HashMap<>();
-        retMap = sysDictMapper.getWellInfoViaCode(wellCode);
+        retMap = sysDictMapper.getWellInfoViaCode(wellCode,deptId);
         return retMap;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 7184c28..78b04d7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,7 +30,7 @@
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
     String getJobStatusNameByCodeNum(@Param("jobStatus") String jobStatus);
     String getDictNameByCodeCodeNum(@Param("codeNum") String codeNum,@Param("code") String code);
-    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
+    Map<String,Object> getWellInfoViaCode(@Param("wellCode") String wellCode,@Param("deptId") Long deptId);
 //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
     String getUsernameById(@Param("id") long id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 36e65a7..5a84a1e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -91,7 +91,8 @@
         SELECT ID as wellId,POSITION as position,DEPTID as deptid
          ,ifnull(STAFF,'') as staff ,ifnull(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
+        and DEPTID = #{deptId}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
index 87463f8..a0bb9cb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmJobWarpper.java
@@ -35,7 +35,8 @@
 
         //设置闸井相关字段
         String wellCode = map.get("wellCode").toString();
-        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode);
+        Long deptId = Long.valueOf(map.get("deptid").toString());
+        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode,deptId);
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
index 5e47f6e..ccdbc46 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/warpper/AlarmRecordWarpper.java
@@ -17,7 +17,8 @@
 
         // 设置闸井相关字段
         String wellCode = map.get("wellCode").toString();
-        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode);
+        Long deptId = Long.valueOf(map.get("deptid").toString());
+        Map<String,Object> wellInfoMap = EhcacheConstant.retBean().getWellInfoViaCode(wellCode,deptId);
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = ToolUtil.isEmpty(deptidStr)? -1: Long.valueOf(deptidStr);
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 a4a2fdd..1458656 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
@@ -181,13 +181,17 @@
     </select>
 
     <select id="gasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+
+
         SELECT
-        STRENGTH AS data,UPTIME AS logtime
-        FROM data_gas
-        WHERE DEVCODE = #{devcode}
-        ORDER BY UPTIME
-        DESC
-        LIMIT 1
+            STRENGTH AS DATA,
+            UPTIME AS logtime
+        FROM
+            data_gas
+        WHERE
+                UPTIME = ( SELECT MAX( UPTIME ) FROM data_gas WHERE DEVCODE = #{devcode} )
+            LIMIT 1
+
     </select>
 
     <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 1792c15..3db3461 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -8,9 +8,9 @@
 #    url: jdbc:mysql://172.27.33.49:3306/smartwell_br?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
 #    username: brzj
 #    password: 9Uhsr&U7H%8
-    url: jdbc:mysql://111.198.10.15:11102/smartwell_br_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+    url: jdbc:mysql://111.198.10.15:21703/smartwell_br?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
     username: root
-    password: Casic203!
+    password: root
     initial-size: 2
     min-idle: 1
   jms: