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 837ff89..26a2ba7 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
@@ -5,9 +5,12 @@
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.ISysDictService;
 import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -46,6 +49,9 @@
     private IAlarmRecordsService alarmRecordsService;
     @Autowired
     private ICommonPermissionService iCommonPermissionService;
+    @Autowired
+    private IDeviceService deviceService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private  int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -80,6 +86,9 @@
             alarmTypeStr = "1";
         }
         List<Map<String,Object>> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope);
+        retList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()));
+        });
 
 
         new AlarmRecordWarpper(retList).warp();
@@ -115,6 +124,10 @@
         }
         List<Map<String,Object>> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,areaId, dataScope);
         new AlarmRecordWarpper(alarmExpList).warp();
+        alarmExpList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position"));
+            alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString()));
+        });
 
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(alarmExpList)) {

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 837ff89..26a2ba7 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
@@ -5,9 +5,12 @@
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.ISysDictService;
 import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -46,6 +49,9 @@
     private IAlarmRecordsService alarmRecordsService;
     @Autowired
     private ICommonPermissionService iCommonPermissionService;
+    @Autowired
+    private IDeviceService deviceService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private  int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -80,6 +86,9 @@
             alarmTypeStr = "1";
         }
         List<Map<String,Object>> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope);
+        retList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()));
+        });
 
 
         new AlarmRecordWarpper(retList).warp();
@@ -115,6 +124,10 @@
         }
         List<Map<String,Object>> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,areaId, dataScope);
         new AlarmRecordWarpper(alarmExpList).warp();
+        alarmExpList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position"));
+            alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString()));
+        });
 
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(alarmExpList)) {
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 3b8e6de..f2b5457 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
@@ -37,7 +37,9 @@
         ar.DEVCODE as devcode,
         aj.JOB_STATUS as jobStatus,
         ar.JOB_ID as jobId,
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS deptid,
+        bwi.area as area,
+        bwi.position
     </sql>
 
     <select id="alarmList" resultType="map">

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 837ff89..26a2ba7 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
@@ -5,9 +5,12 @@
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.ISysDictService;
 import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -46,6 +49,9 @@
     private IAlarmRecordsService alarmRecordsService;
     @Autowired
     private ICommonPermissionService iCommonPermissionService;
+    @Autowired
+    private IDeviceService deviceService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private  int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -80,6 +86,9 @@
             alarmTypeStr = "1";
         }
         List<Map<String,Object>> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope);
+        retList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()));
+        });
 
 
         new AlarmRecordWarpper(retList).warp();
@@ -115,6 +124,10 @@
         }
         List<Map<String,Object>> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,areaId, dataScope);
         new AlarmRecordWarpper(alarmExpList).warp();
+        alarmExpList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position"));
+            alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString()));
+        });
 
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(alarmExpList)) {
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 3b8e6de..f2b5457 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
@@ -37,7 +37,9 @@
         ar.DEVCODE as devcode,
         aj.JOB_STATUS as jobStatus,
         ar.JOB_ID as jobId,
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS deptid,
+        bwi.area as area,
+        bwi.position
     </sql>
 
     <select id="alarmList" resultType="map">
diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
index 2786cf8..644a2e5 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
Binary files differ

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 837ff89..26a2ba7 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
@@ -5,9 +5,12 @@
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.ISysDictService;
 import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -46,6 +49,9 @@
     private IAlarmRecordsService alarmRecordsService;
     @Autowired
     private ICommonPermissionService iCommonPermissionService;
+    @Autowired
+    private IDeviceService deviceService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private  int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -80,6 +86,9 @@
             alarmTypeStr = "1";
         }
         List<Map<String,Object>> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope);
+        retList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()));
+        });
 
 
         new AlarmRecordWarpper(retList).warp();
@@ -115,6 +124,10 @@
         }
         List<Map<String,Object>> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,areaId, dataScope);
         new AlarmRecordWarpper(alarmExpList).warp();
+        alarmExpList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position"));
+            alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString()));
+        });
 
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(alarmExpList)) {
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 3b8e6de..f2b5457 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
@@ -37,7 +37,9 @@
         ar.DEVCODE as devcode,
         aj.JOB_STATUS as jobStatus,
         ar.JOB_ID as jobId,
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS deptid,
+        bwi.area as area,
+        bwi.position
     </sql>
 
     <select id="alarmList" resultType="map">
diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
index 2786cf8..644a2e5 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
index de0f0d2..4163818 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
Binary files differ

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 837ff89..26a2ba7 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
@@ -5,9 +5,12 @@
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
+import com.casic.missiles.modular.alarm.service.ISysDictService;
 import com.casic.missiles.modular.system.model.AlarmRecords;
+import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.warpper.AlarmRecordWarpper;
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
@@ -46,6 +49,9 @@
     private IAlarmRecordsService alarmRecordsService;
     @Autowired
     private ICommonPermissionService iCommonPermissionService;
+    @Autowired
+    private IDeviceService deviceService;
+
     @Value("${smartcity.office.maxRowsExcel}")
     private  int maxRowsExcel;
     @Value("${smartcity.config.config-path}")
@@ -80,6 +86,9 @@
             alarmTypeStr = "1";
         }
         List<Map<String,Object>> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope);
+        retList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()));
+        });
 
 
         new AlarmRecordWarpper(retList).warp();
@@ -115,6 +124,10 @@
         }
         List<Map<String,Object>> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,areaId, dataScope);
         new AlarmRecordWarpper(alarmExpList).warp();
+        alarmExpList.forEach(alarmObj -> {
+            alarmObj.put("areaFullName", deviceService.getAreaFullNameById(alarmObj.get("area").toString()) + "/" + alarmObj.get("position"));
+            alarmObj.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmObj.get("alarmType").toString()));
+        });
 
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(alarmExpList)) {
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 3b8e6de..f2b5457 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
@@ -37,7 +37,9 @@
         ar.DEVCODE as devcode,
         aj.JOB_STATUS as jobStatus,
         ar.JOB_ID as jobId,
-        bwi.DEPTID AS deptid
+        bwi.DEPTID AS deptid,
+        bwi.area as area,
+        bwi.position
     </sql>
 
     <select id="alarmList" resultType="map">
diff --git a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
index 2786cf8..644a2e5 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecEmpty.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
index de0f0d2..4163818 100644
--- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
+++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/config/temp/waterMeterListEmpty.xlsx b/casic-web/src/main/resources/config/temp/waterMeterListEmpty.xlsx
index 57a50ed..9a562c8 100644
--- a/casic-web/src/main/resources/config/temp/waterMeterListEmpty.xlsx
+++ b/casic-web/src/main/resources/config/temp/waterMeterListEmpty.xlsx
Binary files differ