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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {

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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }

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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 

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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 

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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 649bd4f..52bb600 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -129,7 +129,7 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
+        WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
             <include refid="keywords_sql"/>

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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 649bd4f..52bb600 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -129,7 +129,7 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
+        WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 9419c23..8f91400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -11,7 +11,7 @@
 
     <select id="wellStaticsByDept" resultType="map">
         SELECT
-            A.wellCount ,
+            A.wellCount   AS  "wellCount",
             A.deptid,
             SD.simple_name as "deptName",
             SD.pid

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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 649bd4f..52bb600 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -129,7 +129,7 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
+        WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 9419c23..8f91400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -11,7 +11,7 @@
 
     <select id="wellStaticsByDept" resultType="map">
         SELECT
-            A.wellCount ,
+            A.wellCount   AS  "wellCount",
             A.deptid,
             SD.simple_name as "deptName",
             SD.pid
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 5b43751..253565e 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
@@ -86,10 +86,10 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
-    <select id="getUserByDeptId" resultType="String">
+    <select id="getUserByDeptId" resultType="com.casic.missiles.modular.system.model.User">
         select *
         from sys_user
-        where dept_id =#{deptid};
+        where dept_id in ( #{deptid} )
     </select>
 
     <select id="getSimpleDeptNameById" 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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 649bd4f..52bb600 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -129,7 +129,7 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
+        WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 9419c23..8f91400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -11,7 +11,7 @@
 
     <select id="wellStaticsByDept" resultType="map">
         SELECT
-            A.wellCount ,
+            A.wellCount   AS  "wellCount",
             A.deptid,
             SD.simple_name as "deptName",
             SD.pid
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 5b43751..253565e 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
@@ -86,10 +86,10 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
-    <select id="getUserByDeptId" resultType="String">
+    <select id="getUserByDeptId" resultType="com.casic.missiles.modular.system.model.User">
         select *
         from sys_user
-        where dept_id =#{deptid};
+        where dept_id in ( #{deptid} )
     </select>
 
     <select id="getSimpleDeptNameById" resultType="String">
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 5ed287e..f022dc7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -26,7 +26,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 设备ID
      */
@@ -96,11 +96,11 @@
         this.jobStatus = jobStatus;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = 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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 649bd4f..52bb600 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -129,7 +129,7 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
+        WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 9419c23..8f91400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -11,7 +11,7 @@
 
     <select id="wellStaticsByDept" resultType="map">
         SELECT
-            A.wellCount ,
+            A.wellCount   AS  "wellCount",
             A.deptid,
             SD.simple_name as "deptName",
             SD.pid
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 5b43751..253565e 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
@@ -86,10 +86,10 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
-    <select id="getUserByDeptId" resultType="String">
+    <select id="getUserByDeptId" resultType="com.casic.missiles.modular.system.model.User">
         select *
         from sys_user
-        where dept_id =#{deptid};
+        where dept_id in ( #{deptid} )
     </select>
 
     <select id="getSimpleDeptNameById" resultType="String">
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 5ed287e..f022dc7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -26,7 +26,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 设备ID
      */
@@ -96,11 +96,11 @@
         this.jobStatus = jobStatus;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
index ee3443d..1df9c50 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
@@ -33,4 +33,9 @@
     BusWellInfo getById(Long id);
 
     BusWellInfo selectOne(QueryWrapper<BusWellInfo> busWellInfoEntityWrapper);
+
+    Long  getDeptIdsByDevcode(String  devcode);
+
+
+
 }

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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 649bd4f..52bb600 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -129,7 +129,7 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
+        WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 9419c23..8f91400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -11,7 +11,7 @@
 
     <select id="wellStaticsByDept" resultType="map">
         SELECT
-            A.wellCount ,
+            A.wellCount   AS  "wellCount",
             A.deptid,
             SD.simple_name as "deptName",
             SD.pid
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 5b43751..253565e 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
@@ -86,10 +86,10 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
-    <select id="getUserByDeptId" resultType="String">
+    <select id="getUserByDeptId" resultType="com.casic.missiles.modular.system.model.User">
         select *
         from sys_user
-        where dept_id =#{deptid};
+        where dept_id in ( #{deptid} )
     </select>
 
     <select id="getSimpleDeptNameById" resultType="String">
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 5ed287e..f022dc7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -26,7 +26,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 设备ID
      */
@@ -96,11 +96,11 @@
         this.jobStatus = jobStatus;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
index ee3443d..1df9c50 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
@@ -33,4 +33,9 @@
     BusWellInfo getById(Long id);
 
     BusWellInfo selectOne(QueryWrapper<BusWellInfo> busWellInfoEntityWrapper);
+
+    Long  getDeptIdsByDevcode(String  devcode);
+
+
+
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 3746665..f455fa2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -43,6 +43,8 @@
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
 
 
+    Long getDeptIdsByDevcode(@Param("devcode")String  devcode);
+
     void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List<Long> deptIds);
 
     void updateCoordinates(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("LNG_BAIDU") List<Long> deptIds);

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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 649bd4f..52bb600 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -129,7 +129,7 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
+        WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 9419c23..8f91400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -11,7 +11,7 @@
 
     <select id="wellStaticsByDept" resultType="map">
         SELECT
-            A.wellCount ,
+            A.wellCount   AS  "wellCount",
             A.deptid,
             SD.simple_name as "deptName",
             SD.pid
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 5b43751..253565e 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
@@ -86,10 +86,10 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
-    <select id="getUserByDeptId" resultType="String">
+    <select id="getUserByDeptId" resultType="com.casic.missiles.modular.system.model.User">
         select *
         from sys_user
-        where dept_id =#{deptid};
+        where dept_id in ( #{deptid} )
     </select>
 
     <select id="getSimpleDeptNameById" resultType="String">
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 5ed287e..f022dc7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -26,7 +26,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 设备ID
      */
@@ -96,11 +96,11 @@
         this.jobStatus = jobStatus;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
index ee3443d..1df9c50 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
@@ -33,4 +33,9 @@
     BusWellInfo getById(Long id);
 
     BusWellInfo selectOne(QueryWrapper<BusWellInfo> busWellInfoEntityWrapper);
+
+    Long  getDeptIdsByDevcode(String  devcode);
+
+
+
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 3746665..f455fa2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -43,6 +43,8 @@
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
 
 
+    Long getDeptIdsByDevcode(@Param("devcode")String  devcode);
+
     void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List<Long> deptIds);
 
     void updateCoordinates(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("LNG_BAIDU") List<Long> deptIds);
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 924d2fa..ee3e181 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
@@ -183,6 +183,17 @@
         </if>
     </select>
 
+
+    <select id="getDeptIdsByDevcode" resultType="Long">
+        SELECT  datascope  AS deptIds
+        FROM sys_role
+        where   DEPT_ID= (SELECT bwi.deptid
+        FROM bus_device bd
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
+        JOIN bus_well_info bwi ON bwi.id=bdw.well_id
+        WHERE  bd.devcode=#{devcode})
+    </select>
+
     <select id="getAreaId" resultType="String"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT a.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 0d30c7b..f7a0920 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
@@ -65,6 +65,7 @@
         return retMap;
     }
 
+
     @Cacheable(value = "CONSTANT", key = "'jobStatus-'+#jobStatus")
     public String getJobStatusNameByCodeNum( String jobStatus)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 0725980..7f536b3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -32,6 +32,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -331,16 +332,17 @@
             AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
             if (alarmJob != null) {
                 sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+                if (StrUtil.isNotBlank(msg)) {
+                    sendAlarm(msg, userClientViewList,alarmJob);//推送告警至app和pc端
+                }
             }
         }
-        if (StrUtil.isNotBlank(msg)) {
-            sendAlarm(msg, userClientViewList);//推送告警至app和pc端
-        }
-
     }
 
+    @Resource
+    private AbstractPermissionContext iCommonPermissionService;
 
-    public void sendAlarm(String msg, List<UserClientView> userClientViewList) {
+    public void sendAlarm(String msg, List<UserClientView> userClientViewList,AlarmJob alarmJob) {
         List<String> clientIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         for (UserClientView userClientView : userClientViewList) {
@@ -362,8 +364,9 @@
             logger.info("告警消息app端找不到责任人，未推送:" + msg);
         }
         // PC推送,推给信息办
-        // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
+//        List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506", null, false);
+       Long deptIds= busWellInfoService.getDeptIdsByDevcode(alarmJob.getDevcode());
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(deptIds);
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index 462d8b4..ce6b82f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -4,6 +4,7 @@
 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.core.util.EhcacheConstant;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.SuccessResponseData;
@@ -79,8 +80,8 @@
             dataMap.put("id", busWellInfo.getId());
             dataMap.put("wellCode", busWellInfo.getWellCode());
             dataMap.put("deptId", busWellInfo.getDeptid());
-            dataMap.put("deptName", permissionService.getDeptService().getDeptName(String.valueOf(busWellInfo.getDeptid())));
-            dataMap.put("wellTypeName", busWellInfo.getWellTypeName());
+            dataMap.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(String.valueOf(busWellInfo.getDeptid()))));
+            dataMap.put("wellTypeName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(busWellInfo.getWellType(),"sluicewellType"));
             dataMap.put("position", busWellInfo.getPosition());
             dataMap.put("deep", busWellInfo.getDeep());
 
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 21119fb..cecb025 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
@@ -49,6 +49,7 @@
 
     Map<String, Object> getWellInfoViaCode(@Param("wellCode") String wellCode);
 
+
     //    String getAlarmContentName(@Param("id") int id,@Param("deviceType") int deviceType,@Param("alarmType") int alarmType);
     String getDBtime();
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 649bd4f..52bb600 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -129,7 +129,7 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
+        WHERE STATUS = '1'
         <if test="keywords!='' and keywords!=null">
             and ar.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 9419c23..8f91400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -11,7 +11,7 @@
 
     <select id="wellStaticsByDept" resultType="map">
         SELECT
-            A.wellCount ,
+            A.wellCount   AS  "wellCount",
             A.deptid,
             SD.simple_name as "deptName",
             SD.pid
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 5b43751..253565e 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
@@ -86,10 +86,10 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
-    <select id="getUserByDeptId" resultType="String">
+    <select id="getUserByDeptId" resultType="com.casic.missiles.modular.system.model.User">
         select *
         from sys_user
-        where dept_id =#{deptid};
+        where dept_id in ( #{deptid} )
     </select>
 
     <select id="getSimpleDeptNameById" resultType="String">
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 5ed287e..f022dc7 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -26,7 +26,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 设备ID
      */
@@ -96,11 +96,11 @@
         this.jobStatus = jobStatus;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
index ee3443d..1df9c50 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
@@ -33,4 +33,9 @@
     BusWellInfo getById(Long id);
 
     BusWellInfo selectOne(QueryWrapper<BusWellInfo> busWellInfoEntityWrapper);
+
+    Long  getDeptIdsByDevcode(String  devcode);
+
+
+
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 3746665..f455fa2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -43,6 +43,8 @@
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
 
 
+    Long getDeptIdsByDevcode(@Param("devcode")String  devcode);
+
     void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List<Long> deptIds);
 
     void updateCoordinates(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("LNG_BAIDU") List<Long> deptIds);
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 924d2fa..ee3e181 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
@@ -183,6 +183,17 @@
         </if>
     </select>
 
+
+    <select id="getDeptIdsByDevcode" resultType="Long">
+        SELECT  datascope  AS deptIds
+        FROM sys_role
+        where   DEPT_ID= (SELECT bwi.deptid
+        FROM bus_device bd
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
+        JOIN bus_well_info bwi ON bwi.id=bdw.well_id
+        WHERE  bd.devcode=#{devcode})
+    </select>
+
     <select id="getAreaId" resultType="String"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT a.id
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index ccaee69..6fc892d 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -63,7 +63,7 @@
         wellInfo.setResponsibleDeptName(service.getDeptService().getDeptName(wellInfo.getResponsibleDept()));
         wellInfo.setBfztName(dictService.getDictNameByCode("bfZt", wellInfo.getBfzt()));
         wellInfo.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType()));
-        wellInfo.setQu(StrUtil.isEmpty(wellInfo.getArea())?"":this.getAreaPid(Long.valueOf(wellInfo.getArea())));
+        wellInfo.setQu(StrUtil.isEmpty(wellInfo.getArea()) ? "" : this.getAreaPid(Long.valueOf(wellInfo.getArea())));
         return wellInfo;
     }
 
@@ -241,6 +241,10 @@
         return this.getOne(busWellInfoEntityWrapper);
     }
 
+    public Long getDeptIdsByDevcode(String devcode) {
+        return this.baseMapper.getDeptIdsByDevcode(devcode);
+    }
+
 
     @Override
     public String getAreaPid(Long id) {