diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index dfebbef..5527f15 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -23,6 +24,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DigNoiseDataDto {
     @ExcelProperty("设备编号")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index dfebbef..5527f15 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -23,6 +24,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DigNoiseDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 8771495..575792c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class H2SDataDto {
     @ExcelProperty("设备编号")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index dfebbef..5527f15 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -23,6 +24,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DigNoiseDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 8771495..575792c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class H2SDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 854447b..6a2b3a0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HarmfulDataDto {
     @ExcelProperty("设备编号")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index dfebbef..5527f15 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -23,6 +24,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DigNoiseDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 8771495..575792c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class H2SDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 854447b..6a2b3a0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HarmfulDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
index 7d5dfd3..37473f8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HydrantDataDto {
     @ExcelProperty("设备编号")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index dfebbef..5527f15 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -23,6 +24,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DigNoiseDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 8771495..575792c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class H2SDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 854447b..6a2b3a0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HarmfulDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
index 7d5dfd3..37473f8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HydrantDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 001eacc..66fcc8e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class TemhumDataDto {
     @ExcelProperty("设备编号")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index dfebbef..5527f15 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -23,6 +24,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DigNoiseDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 8771495..575792c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class H2SDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 854447b..6a2b3a0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HarmfulDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
index 7d5dfd3..37473f8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HydrantDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 001eacc..66fcc8e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class TemhumDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index 3d604f5..ec1ab22 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class TemppressDataDto {
     @ExcelProperty("设备编号")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index dfebbef..5527f15 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -23,6 +24,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DigNoiseDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 8771495..575792c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class H2SDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 854447b..6a2b3a0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HarmfulDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
index 7d5dfd3..37473f8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HydrantDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 001eacc..66fcc8e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class TemhumDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index 3d604f5..ec1ab22 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class TemppressDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index e659d85..28e17c6 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class WellAppointDataDto {
     @ExcelProperty("设备编号")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 1d0c647..019db17 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -33,6 +33,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+    @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
+    public String getSimpleDeptNameById(long deptid)
+    {
+        return sysDictMapper.getSimpleDeptNameById(deptid);
+    }
+
 
     @Cacheable(value = "CONSTANT", key = "'alarmContentName-'+#id")
     public String getAlarmContentName(int id) {
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 a624767..4de19b1 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
@@ -392,7 +392,7 @@
 
     private JobExcelDto mapToObjcet(Map<String, Object> alarmExp) {
         JobExcelDto jobExcelDto = new JobExcelDto();
-        jobExcelDto.setJobCode(alarmExp.get("id").toString());
+        jobExcelDto.setJobCode(alarmExp.get("jobCode").toString());
         jobExcelDto.setWellCode(alarmExp.get("wellCode").toString());
         jobExcelDto.setDevcode(alarmExp.get("devcode").toString());
         jobExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString());
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 401e593..1cd2e1b 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
@@ -89,7 +89,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (null == staffstr) {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index ae8fb6d..abd0e1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -30,6 +30,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    String getSimpleDeptNameById(@Param("deptid") long deptid);
+
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
 
     String getAlarmContentName(@Param("id") int id);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 49af280..649bd4f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -109,6 +109,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER  BY  ar.ALARM_TIME DESC
     </select>
 
     <select id="alarmListNoPage" resultType="com.casic.missiles.modular.system.model.AlarmRecords">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 5bbe873..444a7eb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,11 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getSimpleDeptNameById" resultType="String">
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+    </select>
+
+
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index bb20cc4..ada781a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -57,9 +58,10 @@
     public List<Map<String, Object>> deviceStaticsByType(DataScope dataScope) {
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         List<Map<String, Object>> mapList = statisticMapper.deviceStaticsByType();
         List<Map<String, Object>> dataScopeFilter= mapList.stream().filter(
-                map->detypeTypes.contains(map.get("id").toString())
+                map->deviceTypeMap.containsKey(map.get("id").toString())
         ).collect(Collectors.toList());
         return dataScopeFilter;
     }
@@ -150,10 +152,11 @@
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope,page, beginTime, endTime, alarmContent);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             page.setRecords(dataScopeFilter);
             responseData.setCode(200);
@@ -171,10 +174,11 @@
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
         ResponseData responseData = new ResponseData();
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmCountByType(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -188,21 +192,15 @@
     }
 
 
-
-
-
-
-
-
-
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         String  detypeTypes= statisticMapper.getDeviceType(deptId);
+        Map<String,String>  deviceTypeMap=deviceTypeToMap(detypeTypes);
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.getAlarmByStatus(beginTime, endTime, alarmType);
             List<Map<String, Object>> dataScopeFilter= alarmWellList.stream().filter(
-                    map->detypeTypes.contains(map.get("deviceType").toString())
+                    map->deviceTypeMap.containsKey(map.get("deviceType").toString())
             ).collect(Collectors.toList());
             responseData.setCode(200);
             responseData.setMessage("查询成功");
@@ -215,4 +213,11 @@
         return responseData;
     }
 
+    private Map<String,String>   deviceTypeToMap(String  deviceTypes){
+       List<String>   deviceTypeList =JSON.parseObject(deviceTypes, List.class);
+       return deviceTypeList.stream().collect(
+               Collectors.toMap(e->e,e->e)
+       );
+    }
+
 }
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 3529f70..eb4ab56 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
@@ -80,7 +80,7 @@
 
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @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 d4b308e..7f028c5 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
@@ -1144,7 +1144,7 @@
         SD.simple_name AS deptname,
         SA.alarmDevices,
         SA.alarmTimes,
-        SD.ID AS "DEPTID"
+        SD.ID AS "deptid"
         FROM sys_dept SD
         LEFT JOIN
         (
@@ -1188,10 +1188,10 @@
             <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
-                        and SD.ID = #{deptId}
+                        and SD.ID = #{deptid}
                     </when>
                     <otherwise>
-                        AND SD.PID = #{deptId}
+                        AND SD.PID = #{deptid}
                     </otherwise>
                 </choose>
             </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 2d33cea..32defe0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,11 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceList = this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceList;
     }
 
     /**
@@ -189,7 +193,11 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deviceDtoList.forEach(
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+        );
+        return deviceDtoList;
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f2de9cc..92b6b19 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -17,6 +18,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DeviceDataExcelDto {
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
index dfebbef..5527f15 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -23,6 +24,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class DigNoiseDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
index 8771495..575792c 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class H2SDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 854447b..6a2b3a0 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HarmfulDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
index 7d5dfd3..37473f8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class HydrantDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
index 001eacc..66fcc8e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -20,6 +21,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class TemhumDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
index 3d604f5..ec1ab22 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class TemppressDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
index e659d85..28e17c6 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -19,6 +20,7 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
+@ExcelIgnoreUnannotated
 @NoArgsConstructor
 public class WellAppointDataDto {
     @ExcelProperty("设备编号")
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
index 61fb97d..8e2a11a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -25,33 +25,20 @@
 public class WellCoverDataDto {
 
     /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
      */
     @ExcelProperty("设备编号")
     private String devcode;
     @ExcelProperty("点位编号")
     private String wellCode;
-    @ExcelProperty("设备类型")
+//    @ExcelProperty("设备类型")
     private Long deviceType;
     @ExcelProperty("状态描述")
     private String descn;
-//    @ExcelProperty("设备类型名称")
+    @ExcelProperty("设备类型名称")
     private String deviceTypeName;
     private Long deptid;
     @ExcelProperty("权属单位")
     private String deptName;
-
 //    @ExcelProperty("日志时间")
     @ExcelProperty("上传时间")
     private String logtime;