diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
index f094cbd..0cd3232 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
@@ -23,5 +23,9 @@
         this.deptId = objectMap.get("deptId").toString();
         this.setId(objectMap.get("id").toString());
         this.lat = objectMap.get("lat").toString();
+        /**
+         * 默认没有报警
+         * */
+        this.alarmDevices = 0;
     }
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
index f094cbd..0cd3232 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
@@ -23,5 +23,9 @@
         this.deptId = objectMap.get("deptId").toString();
         this.setId(objectMap.get("id").toString());
         this.lat = objectMap.get("lat").toString();
+        /**
+         * 默认没有报警
+         * */
+        this.alarmDevices = 0;
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
index cdfabb5..fa63abe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
@@ -77,21 +77,18 @@
         List<Map<String, Object>> warnKkj = this.baseMapper.selectWarehouseWarnKkjByTime(date);
         List<WarehouseListDTO> listDtos = new ArrayList<>();
         for (Map<String, Object> objectMap : allKkj) {
-            if (objectMap != null) {
-                WarehouseListDTO warehouseListDto = new WarehouseListDTO(objectMap);
-                Object allDevices = objectMap.get("allDevices");
-                warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString()));
+            WarehouseListDTO warehouseListDto = new WarehouseListDTO(objectMap);
 
-                for (Map<String, Object> warnKkjMap : warnKkj) {
-                    if (warnKkjMap != null) {
-                        if (warehouseListDto.getDeptId().equals(warnKkjMap.get("deptId").toString())) {
-                            Object alarmDevices = warnKkjMap.get("alarmDevices");
-                            warehouseListDto.setAlarmDevices(alarmDevices == null ? 0 : Integer.parseInt(alarmDevices.toString()));
-                        }
-                    }
+            Object allDevices = objectMap.get("allDevices");
+            warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString()));
+
+            for (Map<String, Object> warnKkjMap : warnKkj) {
+                if (warehouseListDto.getDeptId().equals(warnKkjMap.get("deptId").toString())) {
+                    Object alarmDevices = warnKkjMap.get("alarmDevices");
+                    warehouseListDto.setAlarmDevices(alarmDevices == null ? 0 : Integer.parseInt(alarmDevices.toString()));
                 }
-                listDtos.add(warehouseListDto);
             }
+            listDtos.add(warehouseListDto);
         }
         return listDtos;
     }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
index f094cbd..0cd3232 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java
@@ -23,5 +23,9 @@
         this.deptId = objectMap.get("deptId").toString();
         this.setId(objectMap.get("id").toString());
         this.lat = objectMap.get("lat").toString();
+        /**
+         * 默认没有报警
+         * */
+        this.alarmDevices = 0;
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
index cdfabb5..fa63abe 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java
@@ -77,21 +77,18 @@
         List<Map<String, Object>> warnKkj = this.baseMapper.selectWarehouseWarnKkjByTime(date);
         List<WarehouseListDTO> listDtos = new ArrayList<>();
         for (Map<String, Object> objectMap : allKkj) {
-            if (objectMap != null) {
-                WarehouseListDTO warehouseListDto = new WarehouseListDTO(objectMap);
-                Object allDevices = objectMap.get("allDevices");
-                warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString()));
+            WarehouseListDTO warehouseListDto = new WarehouseListDTO(objectMap);
 
-                for (Map<String, Object> warnKkjMap : warnKkj) {
-                    if (warnKkjMap != null) {
-                        if (warehouseListDto.getDeptId().equals(warnKkjMap.get("deptId").toString())) {
-                            Object alarmDevices = warnKkjMap.get("alarmDevices");
-                            warehouseListDto.setAlarmDevices(alarmDevices == null ? 0 : Integer.parseInt(alarmDevices.toString()));
-                        }
-                    }
+            Object allDevices = objectMap.get("allDevices");
+            warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString()));
+
+            for (Map<String, Object> warnKkjMap : warnKkj) {
+                if (warehouseListDto.getDeptId().equals(warnKkjMap.get("deptId").toString())) {
+                    Object alarmDevices = warnKkjMap.get("alarmDevices");
+                    warehouseListDto.setAlarmDevices(alarmDevices == null ? 0 : Integer.parseInt(alarmDevices.toString()));
                 }
-                listDtos.add(warehouseListDto);
             }
+            listDtos.add(warehouseListDto);
         }
         return listDtos;
     }
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 92f54e6..8ed2a4d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <artifactId>casic-web</artifactId>
     <version>${pro.version}</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>casic-web</name>
     <description>casic web启动入口</description>
     <profiles>