diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4e439ae..c3db5c1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -40,8 +40,7 @@
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4e439ae..c3db5c1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -40,8 +40,7 @@
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 393589c..0c8309b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -63,6 +63,11 @@
 
     DeviceData H2sData(@Param("devcode") String devcode);
 
+    DeviceData gasDector(@Param("devcode") String devcode);
+
+    DeviceData hydrantData(@Param("devcode") String devcode);
+
+
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4e439ae..c3db5c1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -40,8 +40,7 @@
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 393589c..0c8309b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -63,6 +63,11 @@
 
     DeviceData H2sData(@Param("devcode") String devcode);
 
+    DeviceData gasDector(@Param("devcode") String devcode);
+
+    DeviceData hydrantData(@Param("devcode") String devcode);
+
+
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 31483e6..d4837d3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -174,6 +174,7 @@
         LIMIT 1
     </select>
 
+
     <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
                UPTIME                              AS logtime
@@ -269,6 +270,24 @@
                 DESC LIMIT 1
     </select>
 
+    <select id="gasDector" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT strength  AS data,
+               UPTIME     AS logtime
+        FROM  data_gas_dector
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+        DESC LIMIT 1
+    </select>
+
+    <select id="hydrantData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DESCN AS data,
+              logtime     AS logtime
+        FROM data_hydrant
+        WHERE DEVCODE = #{devcode}
+        ORDER BY logtime
+        DESC LIMIT 1
+    </select>
+
     <select id="selectLiquidDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -678,7 +697,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType AS  "deviceType",
+        deviceType AS "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -687,10 +706,10 @@
         STATUS,
         DEPTID,
         wellcode as "wellcode",
-        wellId  AS  "wellId",
-        deviceId AS  "deviceId",
+        wellId AS "wellId",
+        deviceId AS "deviceId",
         valid,
-        deviceTypeName  AS "deviceTypeName"
+        deviceTypeName AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -1298,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME  DESC
+        ORDER BY dh.UPTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4e439ae..c3db5c1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -40,8 +40,7 @@
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 393589c..0c8309b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -63,6 +63,11 @@
 
     DeviceData H2sData(@Param("devcode") String devcode);
 
+    DeviceData gasDector(@Param("devcode") String devcode);
+
+    DeviceData hydrantData(@Param("devcode") String devcode);
+
+
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 31483e6..d4837d3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -174,6 +174,7 @@
         LIMIT 1
     </select>
 
+
     <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
                UPTIME                              AS logtime
@@ -269,6 +270,24 @@
                 DESC LIMIT 1
     </select>
 
+    <select id="gasDector" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT strength  AS data,
+               UPTIME     AS logtime
+        FROM  data_gas_dector
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+        DESC LIMIT 1
+    </select>
+
+    <select id="hydrantData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DESCN AS data,
+              logtime     AS logtime
+        FROM data_hydrant
+        WHERE DEVCODE = #{devcode}
+        ORDER BY logtime
+        DESC LIMIT 1
+    </select>
+
     <select id="selectLiquidDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -678,7 +697,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType AS  "deviceType",
+        deviceType AS "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -687,10 +706,10 @@
         STATUS,
         DEPTID,
         wellcode as "wellcode",
-        wellId  AS  "wellId",
-        deviceId AS  "deviceId",
+        wellId AS "wellId",
+        deviceId AS "deviceId",
         valid,
-        deviceTypeName  AS "deviceTypeName"
+        deviceTypeName AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -1298,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME  DESC
+        ORDER BY dh.UPTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index a92f739..79812d2 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -34,12 +34,11 @@
     private String rsrp;
     private String pci;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
-    @ExcelProperty("设备类型名称")
-    private String deviceTypeName;
+    private String logtime;
     @ExcelProperty("设备类型")
+    private String deviceTypeName;
     private String deviceType;
     @ExcelProperty("点位编号")
     private String wellCode;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4e439ae..c3db5c1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -40,8 +40,7 @@
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 393589c..0c8309b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -63,6 +63,11 @@
 
     DeviceData H2sData(@Param("devcode") String devcode);
 
+    DeviceData gasDector(@Param("devcode") String devcode);
+
+    DeviceData hydrantData(@Param("devcode") String devcode);
+
+
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 31483e6..d4837d3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -174,6 +174,7 @@
         LIMIT 1
     </select>
 
+
     <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
                UPTIME                              AS logtime
@@ -269,6 +270,24 @@
                 DESC LIMIT 1
     </select>
 
+    <select id="gasDector" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT strength  AS data,
+               UPTIME     AS logtime
+        FROM  data_gas_dector
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+        DESC LIMIT 1
+    </select>
+
+    <select id="hydrantData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DESCN AS data,
+              logtime     AS logtime
+        FROM data_hydrant
+        WHERE DEVCODE = #{devcode}
+        ORDER BY logtime
+        DESC LIMIT 1
+    </select>
+
     <select id="selectLiquidDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -678,7 +697,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType AS  "deviceType",
+        deviceType AS "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -687,10 +706,10 @@
         STATUS,
         DEPTID,
         wellcode as "wellcode",
-        wellId  AS  "wellId",
-        deviceId AS  "deviceId",
+        wellId AS "wellId",
+        deviceId AS "deviceId",
         valid,
-        deviceTypeName  AS "deviceTypeName"
+        deviceTypeName AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -1298,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME  DESC
+        ORDER BY dh.UPTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index a92f739..79812d2 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -34,12 +34,11 @@
     private String rsrp;
     private String pci;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
-    @ExcelProperty("设备类型名称")
-    private String deviceTypeName;
+    private String logtime;
     @ExcelProperty("设备类型")
+    private String deviceTypeName;
     private String deviceType;
     @ExcelProperty("点位编号")
     private String wellCode;
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index ed2ab62..f2c4b96 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -34,9 +34,9 @@
     @ExcelProperty("浓度值")
     private Double concentration;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
+    private String logtime;
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4e439ae..c3db5c1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -40,8 +40,7 @@
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 393589c..0c8309b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -63,6 +63,11 @@
 
     DeviceData H2sData(@Param("devcode") String devcode);
 
+    DeviceData gasDector(@Param("devcode") String devcode);
+
+    DeviceData hydrantData(@Param("devcode") String devcode);
+
+
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 31483e6..d4837d3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -174,6 +174,7 @@
         LIMIT 1
     </select>
 
+
     <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
                UPTIME                              AS logtime
@@ -269,6 +270,24 @@
                 DESC LIMIT 1
     </select>
 
+    <select id="gasDector" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT strength  AS data,
+               UPTIME     AS logtime
+        FROM  data_gas_dector
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+        DESC LIMIT 1
+    </select>
+
+    <select id="hydrantData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DESCN AS data,
+              logtime     AS logtime
+        FROM data_hydrant
+        WHERE DEVCODE = #{devcode}
+        ORDER BY logtime
+        DESC LIMIT 1
+    </select>
+
     <select id="selectLiquidDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -678,7 +697,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType AS  "deviceType",
+        deviceType AS "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -687,10 +706,10 @@
         STATUS,
         DEPTID,
         wellcode as "wellcode",
-        wellId  AS  "wellId",
-        deviceId AS  "deviceId",
+        wellId AS "wellId",
+        deviceId AS "deviceId",
         valid,
-        deviceTypeName  AS "deviceTypeName"
+        deviceTypeName AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -1298,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME  DESC
+        ORDER BY dh.UPTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index a92f739..79812d2 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -34,12 +34,11 @@
     private String rsrp;
     private String pci;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
-    @ExcelProperty("设备类型名称")
-    private String deviceTypeName;
+    private String logtime;
     @ExcelProperty("设备类型")
+    private String deviceTypeName;
     private String deviceType;
     @ExcelProperty("点位编号")
     private String wellCode;
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index ed2ab62..f2c4b96 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -34,9 +34,9 @@
     @ExcelProperty("浓度值")
     private Double concentration;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
+    private String logtime;
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 7cef8c4..c4acf27 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
     }
 
     @Override
@@ -213,6 +213,25 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
+            case "可燃气体":
+                deviceData = this.baseMapper.gasDector(devcode);
+                if (ObjectUtil.isNotEmpty(deviceData)) {
+                    deviceDataDto.setTypeName("液化气浓度");
+                    deviceDataDto.setValue(deviceData.getData() + "%LEL");
+                    deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                    deviceDataDtoList.add(deviceDataDto);
+                }
+
+                break;
+            case "消防栓防盗水监测仪":
+                deviceData = this.baseMapper.hydrantData(devcode);
+                if (ObjectUtil.isNotEmpty(deviceData)) {
+                    deviceDataDto.setTypeName("消防栓状态");
+                    deviceDataDto.setValue(deviceData.getData());
+                    deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                    deviceDataDtoList.add(deviceDataDto);
+                }
+                break;
 
             default://未知设备
                 log.info("未知设备！");
@@ -410,8 +429,8 @@
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("燃气泄漏");
                         watchDataDto.setType("12");
-                        watchDataDto.setValue(deviceData.getData()+ "%LEL");
-                        watchDataDto.setData(deviceData.getData()+ "%LEL");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
                         watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
                         watchDataDtos.add(watchDataDto);
                     }
@@ -421,12 +440,40 @@
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
                         watchDataDto.setType("14");
-                        watchDataDto.setValue(deviceData.getData()+ "%LEL");
-                        watchDataDto.setData(deviceData.getData()+ "%LEL");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
                         watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
                         watchDataDtos.add(watchDataDto);
                     }
                     break;
+                case "可燃气体":
+                    deviceData = this.baseMapper.gasDector(deviceInWellInfo.getDevcode());
+                    if (ObjectUtil.isNotEmpty(deviceData)) {
+                        watchDataDto.setWatchType("液化气浓度");
+                        watchDataDto.setType("101");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
+                        watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                        watchDataDtos.add(watchDataDto);
+                    }
+
+                    break;
+                case "消防栓防盗水监测仪":
+                    deviceData = this.baseMapper.hydrantData(deviceInWellInfo.getDevcode());
+                    if (ObjectUtil.isNotEmpty(deviceData)) {
+                        watchDataDto.setWatchType("消防栓状态");
+                        watchDataDto.setType("11");
+                        watchDataDto.setValue(deviceData.getData());
+                        watchDataDto.setData(deviceData.getData());
+                        watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+
+                    } else {
+                        watchDataDto.setValue("无数据");
+                        watchDataDto.setData("无数据");
+                    }
+                    watchDataDtos.add(watchDataDto);
+                    break;
+
                 default://未知设备
                     log.info("未知设备！");
                     break;
@@ -438,60 +485,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -580,7 +627,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -597,12 +644,12 @@
         return responseData;
     }
 
-    public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
+    public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid) {
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
             h2sDataDtoList.forEach(
-                    h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
+                    h2sDataDto -> h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
             page.setRecords(h2sDataDtoList);
             responseData.setData(page);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4e439ae..c3db5c1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -40,8 +40,7 @@
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 393589c..0c8309b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -63,6 +63,11 @@
 
     DeviceData H2sData(@Param("devcode") String devcode);
 
+    DeviceData gasDector(@Param("devcode") String devcode);
+
+    DeviceData hydrantData(@Param("devcode") String devcode);
+
+
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 31483e6..d4837d3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -174,6 +174,7 @@
         LIMIT 1
     </select>
 
+
     <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
                UPTIME                              AS logtime
@@ -269,6 +270,24 @@
                 DESC LIMIT 1
     </select>
 
+    <select id="gasDector" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT strength  AS data,
+               UPTIME     AS logtime
+        FROM  data_gas_dector
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+        DESC LIMIT 1
+    </select>
+
+    <select id="hydrantData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DESCN AS data,
+              logtime     AS logtime
+        FROM data_hydrant
+        WHERE DEVCODE = #{devcode}
+        ORDER BY logtime
+        DESC LIMIT 1
+    </select>
+
     <select id="selectLiquidDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -678,7 +697,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType AS  "deviceType",
+        deviceType AS "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -687,10 +706,10 @@
         STATUS,
         DEPTID,
         wellcode as "wellcode",
-        wellId  AS  "wellId",
-        deviceId AS  "deviceId",
+        wellId AS "wellId",
+        deviceId AS "deviceId",
         valid,
-        deviceTypeName  AS "deviceTypeName"
+        deviceTypeName AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -1298,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME  DESC
+        ORDER BY dh.UPTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index a92f739..79812d2 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -34,12 +34,11 @@
     private String rsrp;
     private String pci;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
-    @ExcelProperty("设备类型名称")
-    private String deviceTypeName;
+    private String logtime;
     @ExcelProperty("设备类型")
+    private String deviceTypeName;
     private String deviceType;
     @ExcelProperty("点位编号")
     private String wellCode;
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index ed2ab62..f2c4b96 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -34,9 +34,9 @@
     @ExcelProperty("浓度值")
     private Double concentration;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
+    private String logtime;
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 7cef8c4..c4acf27 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
     }
 
     @Override
@@ -213,6 +213,25 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
+            case "可燃气体":
+                deviceData = this.baseMapper.gasDector(devcode);
+                if (ObjectUtil.isNotEmpty(deviceData)) {
+                    deviceDataDto.setTypeName("液化气浓度");
+                    deviceDataDto.setValue(deviceData.getData() + "%LEL");
+                    deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                    deviceDataDtoList.add(deviceDataDto);
+                }
+
+                break;
+            case "消防栓防盗水监测仪":
+                deviceData = this.baseMapper.hydrantData(devcode);
+                if (ObjectUtil.isNotEmpty(deviceData)) {
+                    deviceDataDto.setTypeName("消防栓状态");
+                    deviceDataDto.setValue(deviceData.getData());
+                    deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                    deviceDataDtoList.add(deviceDataDto);
+                }
+                break;
 
             default://未知设备
                 log.info("未知设备！");
@@ -410,8 +429,8 @@
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("燃气泄漏");
                         watchDataDto.setType("12");
-                        watchDataDto.setValue(deviceData.getData()+ "%LEL");
-                        watchDataDto.setData(deviceData.getData()+ "%LEL");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
                         watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
                         watchDataDtos.add(watchDataDto);
                     }
@@ -421,12 +440,40 @@
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
                         watchDataDto.setType("14");
-                        watchDataDto.setValue(deviceData.getData()+ "%LEL");
-                        watchDataDto.setData(deviceData.getData()+ "%LEL");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
                         watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
                         watchDataDtos.add(watchDataDto);
                     }
                     break;
+                case "可燃气体":
+                    deviceData = this.baseMapper.gasDector(deviceInWellInfo.getDevcode());
+                    if (ObjectUtil.isNotEmpty(deviceData)) {
+                        watchDataDto.setWatchType("液化气浓度");
+                        watchDataDto.setType("101");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
+                        watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                        watchDataDtos.add(watchDataDto);
+                    }
+
+                    break;
+                case "消防栓防盗水监测仪":
+                    deviceData = this.baseMapper.hydrantData(deviceInWellInfo.getDevcode());
+                    if (ObjectUtil.isNotEmpty(deviceData)) {
+                        watchDataDto.setWatchType("消防栓状态");
+                        watchDataDto.setType("11");
+                        watchDataDto.setValue(deviceData.getData());
+                        watchDataDto.setData(deviceData.getData());
+                        watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+
+                    } else {
+                        watchDataDto.setValue("无数据");
+                        watchDataDto.setData("无数据");
+                    }
+                    watchDataDtos.add(watchDataDto);
+                    break;
+
                 default://未知设备
                     log.info("未知设备！");
                     break;
@@ -438,60 +485,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -580,7 +627,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -597,12 +644,12 @@
         return responseData;
     }
 
-    public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
+    public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid) {
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
             h2sDataDtoList.forEach(
-                    h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
+                    h2sDataDto -> h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
             page.setRecords(h2sDataDtoList);
             responseData.setData(page);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index e32089e..a97054c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -116,7 +116,7 @@
                 busConcentrator.setStatus(DeviceConst.NO);
             });
             if (CollectionUtil.isNotEmpty(list)) {
-                return ResponseData.success(list.get(0));
+                return ResponseData.error(list.get(0));
             }
             try {
 //                results.stream().

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 1f24dac..b672a54 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -211,7 +211,7 @@
 
         // 告警内容
         String alarmContentNameStr = map.get("alarmContentName").toString();
-        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr)?"":EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
+        map.put("alarmContent", StrUtil.isEmpty(alarmContentNameStr) ? "" : EhcacheConstant.retBean().getAlarmContentByName(alarmContentNameStr));
 
         // 告警值加单位
         if (ObjectUtil.isNotEmpty(map.get("alarmValue"))) {
@@ -405,7 +405,7 @@
         jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString());
         jobExcelDto.setCreateTime(alarmExp.get("createTime").toString());
         jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString());
-        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson")&&alarmExp.get("handleJobPerson")!=null?alarmExp.get("handleJobPerson").toString():"-");
+        jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-");
         jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString());
         return jobExcelDto;
     }
@@ -516,14 +516,21 @@
 
     /**
      * 工单详情
+     * 这里id由于推送是设备编号，所以用设备编号代替id
      */
     @RequestMapping(value = "/info")
     @ResponseBody
     public Object jobInfo(@RequestParam(value = "id", required = true) Long id) {
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> retList = alarmJobService.jobInfo(id, dataScope, currentUser.getId());
-        retList.forEach(this::alarmJobWrapper);
+        List<Map<String, Object>> retList = null;
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            retList = alarmJobService.jobInfo(null, id, dataScope, currentUser.getId());
+        } else {
+            retList = alarmJobService.jobInfo(String.valueOf(id), null, dataScope, currentUser.getId());
+            retList.forEach(this::alarmJobWrapper);
+        }
         return ResponseData.success(retList);
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index e27b0c1..439d184 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -127,7 +127,7 @@
                 alarmValue += "mg";
                 map.replace("alarmValue", alarmValue);
             }
-            if ("燃气报警".equals(alarmContentName)) {
+            if ("液化气报警".equals(alarmContentName)) {
                 alarmValue += "%LEL";
                 map.replace("alarmValue", alarmValue);
             }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index fac1b98..3457261 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -37,7 +37,7 @@
 
     List<Map<String, Object>> jobListSearchApp(Page<Map<String, Object>> page, JobListParam jobListParam, Long deptId, Long userId, Long leaderId);
 
-    List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId);
+    List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId);
 
     boolean getJob(Long id, long personId);
 
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 9678843..89fe56f 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
@@ -119,8 +119,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+    public List<Map<String, Object>> jobInfo(String devcode,Long id, DataScope dataScope, Long personId) {
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(devcode,id,dataScope, personId);
         jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
         return jobList;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 1bf49c2..8bf8d38 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -48,7 +48,7 @@
 
     Map<String, Object> countMyJob(@Param("userId") long userId, @Param("deptId") long deptId, @Param("spanDays") int spanDays);
 
-    List<Map<String, Object>> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
+    List<Map<String, Object>> jobInfo(@Param("devcode") String devcode,@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId);
 
     //    boolean getJob(@Param("id") int id,@Param("personId") long personId);
     boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index bf7059d..d9fc574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1031,20 +1031,41 @@
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
         bwi.RESPONSIBLE_DEPT AS deptid
-        FROM alarm_job aj
-        LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
-        LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-        WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        ORDER BY ar.ID DESC LIMIT 1
+        FROM
+        (SELECT  *
+        FROM  alarm_job
+        WHERE 1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
+        ) aj
+        JOIN(SELECT  *
+        from	alarm_records
+        WHERE  1=1
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+            order by  alarm_time   desc
+            limit 1
+        </if>
+        )ar ON aj.ID = ar.JOB_ID
+        JOIN (SELECT devcode
+        from bus_device
+        where	valid='1'
+        <if test="devcode !=''  and devcode != null ">
+            AND devcode=#{devcode}
+        </if>) bd  on bd.devcode=aj.devcode
+        JOIN bus_well_info bwi  on  bwi.well_code=aj.well_code
+        <if test="id !=''  and id != null ">
+            order by  alarm_time   desc
+            limit 1
+        </if>
     </select>
 
-    <!-- 工单处理 -->
-    <!--<update id="getJob" flushCache="true">-->
-    <!--update alarm_job set job_status = 1,-->
-    <!--job_belong_to = #{personId},&lt;!&ndASh;add 0605&ndASh;&gt;-->
-    <!--get_job_person = #{personId},get_job_time = now()-->
-    <!--where id = #{id}-->
-    <!--</update>-->
     <update id="getJob" flushCache="true">
         update alarm_job set job_status = 1,
         JOB_BELONG_TO = #{personId},<!--add 0605-->
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4e439ae..c3db5c1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -40,8 +40,7 @@
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         ResponseData responseData = thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keywords);
-        responseData.setData(super.packForBT(page));
-        return responseData;
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 393589c..0c8309b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -63,6 +63,11 @@
 
     DeviceData H2sData(@Param("devcode") String devcode);
 
+    DeviceData gasDector(@Param("devcode") String devcode);
+
+    DeviceData hydrantData(@Param("devcode") String devcode);
+
+
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 31483e6..d4837d3 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -174,6 +174,7 @@
         LIMIT 1
     </select>
 
+
     <select id="temphumData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT CONCAT(TEMPERATURE, ', ', HUMIDITY) AS data,
                UPTIME                              AS logtime
@@ -269,6 +270,24 @@
                 DESC LIMIT 1
     </select>
 
+    <select id="gasDector" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT strength  AS data,
+               UPTIME     AS logtime
+        FROM  data_gas_dector
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+        DESC LIMIT 1
+    </select>
+
+    <select id="hydrantData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT DESCN AS data,
+              logtime     AS logtime
+        FROM data_hydrant
+        WHERE DEVCODE = #{devcode}
+        ORDER BY logtime
+        DESC LIMIT 1
+    </select>
+
     <select id="selectLiquidDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -678,7 +697,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType AS  "deviceType",
+        deviceType AS "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -687,10 +706,10 @@
         STATUS,
         DEPTID,
         wellcode as "wellcode",
-        wellId  AS  "wellId",
-        deviceId AS  "deviceId",
+        wellId AS "wellId",
+        deviceId AS "deviceId",
         valid,
-        deviceTypeName  AS "deviceTypeName"
+        deviceTypeName AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -1298,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME  DESC
+        ORDER BY dh.UPTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index a92f739..79812d2 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -34,12 +34,11 @@
     private String rsrp;
     private String pci;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
-    @ExcelProperty("设备类型名称")
-    private String deviceTypeName;
+    private String logtime;
     @ExcelProperty("设备类型")
+    private String deviceTypeName;
     private String deviceType;
     @ExcelProperty("点位编号")
     private String wellCode;
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index ed2ab62..f2c4b96 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -34,9 +34,9 @@
     @ExcelProperty("浓度值")
     private Double concentration;
     @ExcelProperty("采集时间")
-    private Date uptime;
+    private String uptime;
     @ExcelProperty("记录时间")
-    private Date logtime;
+    private String logtime;
     private String deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 7cef8c4..c4acf27 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
     }
 
     @Override
@@ -213,6 +213,25 @@
                     deviceDataDtoList.add(deviceDataDto);
                 }
                 break;
+            case "可燃气体":
+                deviceData = this.baseMapper.gasDector(devcode);
+                if (ObjectUtil.isNotEmpty(deviceData)) {
+                    deviceDataDto.setTypeName("液化气浓度");
+                    deviceDataDto.setValue(deviceData.getData() + "%LEL");
+                    deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                    deviceDataDtoList.add(deviceDataDto);
+                }
+
+                break;
+            case "消防栓防盗水监测仪":
+                deviceData = this.baseMapper.hydrantData(devcode);
+                if (ObjectUtil.isNotEmpty(deviceData)) {
+                    deviceDataDto.setTypeName("消防栓状态");
+                    deviceDataDto.setValue(deviceData.getData());
+                    deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                    deviceDataDtoList.add(deviceDataDto);
+                }
+                break;
 
             default://未知设备
                 log.info("未知设备！");
@@ -410,8 +429,8 @@
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("燃气泄漏");
                         watchDataDto.setType("12");
-                        watchDataDto.setValue(deviceData.getData()+ "%LEL");
-                        watchDataDto.setData(deviceData.getData()+ "%LEL");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
                         watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
                         watchDataDtos.add(watchDataDto);
                     }
@@ -421,12 +440,40 @@
                     if (ObjectUtil.isNotEmpty(deviceData)) {
                         watchDataDto.setWatchType("H2S浓度");
                         watchDataDto.setType("14");
-                        watchDataDto.setValue(deviceData.getData()+ "%LEL");
-                        watchDataDto.setData(deviceData.getData()+ "%LEL");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
                         watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
                         watchDataDtos.add(watchDataDto);
                     }
                     break;
+                case "可燃气体":
+                    deviceData = this.baseMapper.gasDector(deviceInWellInfo.getDevcode());
+                    if (ObjectUtil.isNotEmpty(deviceData)) {
+                        watchDataDto.setWatchType("液化气浓度");
+                        watchDataDto.setType("101");
+                        watchDataDto.setValue(deviceData.getData() + "%LEL");
+                        watchDataDto.setData(deviceData.getData() + "%LEL");
+                        watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+                        watchDataDtos.add(watchDataDto);
+                    }
+
+                    break;
+                case "消防栓防盗水监测仪":
+                    deviceData = this.baseMapper.hydrantData(deviceInWellInfo.getDevcode());
+                    if (ObjectUtil.isNotEmpty(deviceData)) {
+                        watchDataDto.setWatchType("消防栓状态");
+                        watchDataDto.setType("11");
+                        watchDataDto.setValue(deviceData.getData());
+                        watchDataDto.setData(deviceData.getData());
+                        watchDataDto.setLogtime(sdf.format(deviceData.getLogtime()));
+
+                    } else {
+                        watchDataDto.setValue("无数据");
+                        watchDataDto.setData("无数据");
+                    }
+                    watchDataDtos.add(watchDataDto);
+                    break;
+
                 default://未知设备
                     log.info("未知设备！");
                     break;
@@ -438,60 +485,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -580,7 +627,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -597,12 +644,12 @@
         return responseData;
     }
 
-    public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
+    public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid) {
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
             h2sDataDtoList.forEach(
-                    h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
+                    h2sDataDto -> h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
             page.setRecords(h2sDataDtoList);
             responseData.setData(page);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index e32089e..a97054c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -116,7 +116,7 @@
                 busConcentrator.setStatus(DeviceConst.NO);
             });
             if (CollectionUtil.isNotEmpty(list)) {
-                return ResponseData.success(list.get(0));
+                return ResponseData.error(list.get(0));
             }
             try {
 //                results.stream().
diff --git a/casic-device/src/main/java/com/casic/missiles/util/RegUtil.java b/casic-device/src/main/java/com/casic/missiles/util/RegUtil.java
index 1a6cdbb..57f626d 100644
--- a/casic-device/src/main/java/com/casic/missiles/util/RegUtil.java
+++ b/casic-device/src/main/java/com/casic/missiles/util/RegUtil.java
@@ -11,7 +11,7 @@
 /**
  * Created by test203 on 2019/5/23.
  */
-public class RegUtil {
+public class RegUtil{
 
 
     public static boolean isDecimal2(String str) {// 判断小数点后2位的数字的正则表达式