diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DeviceDataExcelDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @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 e521ddc..020351e 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.core.base.model.DataFieldDefine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +18,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DigNoiseDataDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @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 e521ddc..020351e 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.core.base.model.DataFieldDefine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +18,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DigNoiseDataDto {
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 3335181..6fe4560 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 有害气体
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class HarmfulDataDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @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 e521ddc..020351e 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.core.base.model.DataFieldDefine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +18,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DigNoiseDataDto {
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 3335181..6fe4560 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 有害气体
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class HarmfulDataDto {
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 c70230c..fd9eb6b 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
@@ -2,6 +2,11 @@
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +15,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemhumDataDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @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 e521ddc..020351e 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.core.base.model.DataFieldDefine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +18,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DigNoiseDataDto {
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 3335181..6fe4560 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 有害气体
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class HarmfulDataDto {
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 c70230c..fd9eb6b 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
@@ -2,6 +2,11 @@
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +15,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemhumDataDto {
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 e6fb9bc..f00cf7b 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 温度压力数据导出
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @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 e521ddc..020351e 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.core.base.model.DataFieldDefine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +18,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DigNoiseDataDto {
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 3335181..6fe4560 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 有害气体
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class HarmfulDataDto {
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 c70230c..fd9eb6b 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
@@ -2,6 +2,11 @@
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +15,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemhumDataDto {
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 e6fb9bc..f00cf7b 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 温度压力数据导出
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
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 67ce1de..630fd12 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 井指定位置数据
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class WellAppointDataDto {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @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 e521ddc..020351e 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.core.base.model.DataFieldDefine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +18,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DigNoiseDataDto {
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 3335181..6fe4560 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 有害气体
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class HarmfulDataDto {
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 c70230c..fd9eb6b 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
@@ -2,6 +2,11 @@
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +15,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemhumDataDto {
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 e6fb9bc..f00cf7b 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 温度压力数据导出
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
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 67ce1de..630fd12 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 井指定位置数据
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class WellAppointDataDto {
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 05e47c0..adf4b5a 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
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  *  * @date 2022-6-22
  * 设备监控数据
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class WellCoverDataDto {
@@ -33,7 +42,6 @@
     private Long deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门Id")
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @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 e521ddc..020351e 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.core.base.model.DataFieldDefine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +18,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DigNoiseDataDto {
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 3335181..6fe4560 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 有害气体
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class HarmfulDataDto {
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 c70230c..fd9eb6b 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
@@ -2,6 +2,11 @@
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +15,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemhumDataDto {
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 e6fb9bc..f00cf7b 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 温度压力数据导出
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
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 67ce1de..630fd12 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 井指定位置数据
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class WellAppointDataDto {
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 05e47c0..adf4b5a 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
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  *  * @date 2022-6-22
  * 设备监控数据
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class WellCoverDataDto {
@@ -33,7 +42,6 @@
     private Long deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门Id")
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index cd3837a..fcc035e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -25,7 +25,7 @@
 @TableName("bus_well_info")
 @HeadRowHeight(15)
 @ContentRowHeight(20)
-@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 @Data
 public class BusWellInfo extends Model<BusWellInfo> {
@@ -183,7 +183,7 @@
     @ExcelProperty("井维护单位代码")
     @NotEmpty(message = "闸井维护单位代码不能为空")
     @TableField("RESPONSIBLE_DEPT")
-    private String responsibleDept;
+    private Long responsibleDept;
 
     /**
      * 井标签备用1

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
index e720a3c..52378f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class JobExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
index c9cf49a..4514412 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/RecordExcelDto.java
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.alarm.model;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +13,10 @@
  * @author cz
  * @Date 2022-6-28
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class RecordExcelDto {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index d073cef..3a6d54a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -263,7 +263,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY ar.WELL_CODE
+        GROUP BY ar.WELL_CODE,bwi.WELL_NAME,bwi.deptid,POSITION,COORDINATE_X,COORDINATE_Y,LAT_BAIDU,LNG_BAIDU,LNG_GAODE,LNG_GAODE
         ORDER BY "alarmCount" DESC
     </select>
 
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 2515d4f..a9e5fbf 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
@@ -147,7 +147,7 @@
         try {
             List<Map<String, Object>> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent);
             alarmWellList.forEach(
-                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString()))
+                    alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(alarmWell.get("deptid").toString())))
             );
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
index cf25d72..f0cee54 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/GasDectorDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class GasDectorDataDto {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
index 158c4a8..ed2ab62 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/PantiltDataDto.java
@@ -2,6 +2,11 @@
 
 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;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +15,10 @@
  * @author cz
  * @date 2022-7-13
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @ExcelIgnoreUnannotated
 public class PantiltDataDto {
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
index 35ef9bc..74c91d3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
@@ -27,7 +27,7 @@
     private String wellCode;
     @ExcelProperty("点位名称")
     private String wellName;
-    @ExcelProperty("井深")
+    @ExcelProperty("点位深")
     private Integer deep;
     @ExcelProperty("详细地址")
     private String position;
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 804ac83..f62fc00 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,12 +1,21 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
  * 气体和液体的导出内容
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @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 e521ddc..020351e 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.casic.missiles.core.base.model.DataFieldDefine;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +18,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class DigNoiseDataDto {
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 3335181..6fe4560 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 有害气体
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class HarmfulDataDto {
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 c70230c..fd9eb6b 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
@@ -2,6 +2,11 @@
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +15,10 @@
  * @date 2022-6-22
  * 温湿度Excel导出标题
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemhumDataDto {
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 e6fb9bc..f00cf7b 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 温度压力数据导出
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class TemppressDataDto {
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 67ce1de..630fd12 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,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  * @date 2022-6-22
  * 井指定位置数据
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class WellAppointDataDto {
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 05e47c0..adf4b5a 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
@@ -1,6 +1,11 @@
 package com.casic.missiles.modular.system.dto.ExcelModel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +14,10 @@
  *  * @date 2022-6-22
  * 设备监控数据
  */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @Data
 @NoArgsConstructor
 public class WellCoverDataDto {
@@ -33,7 +42,6 @@
     private Long deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门Id")
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index cd3837a..fcc035e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -25,7 +25,7 @@
 @TableName("bus_well_info")
 @HeadRowHeight(15)
 @ContentRowHeight(20)
-@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 @Data
 public class BusWellInfo extends Model<BusWellInfo> {
@@ -183,7 +183,7 @@
     @ExcelProperty("井维护单位代码")
     @NotEmpty(message = "闸井维护单位代码不能为空")
     @TableField("RESPONSIBLE_DEPT")
-    private String responsibleDept;
+    private Long responsibleDept;
 
     /**
      * 井标签备用1
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 633ee7d..be99021 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -114,7 +114,7 @@
 
         try {
             if(null==busWellInfo.getResponsibleDept()){
-                busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString());
+                busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
             }
 
 //            List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
@@ -175,7 +175,7 @@
 
         Utility.convertCoordinate(busWellInfo);
         if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
-            busWellInfo.setResponsibleDept(busWellInfo.getDeptid().toString());
+            busWellInfo.setResponsibleDept(Long.valueOf(busWellInfo.getDeptid().toString()));
         }
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //        if(ToolUtil.isNotEmpty(deptTopRoleUsers)){