diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
index 3444c3e..4a022e5 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
@@ -57,7 +57,10 @@
     @ResponseBody
     public Object detail(@PathVariable("robotId") String robotId) {
         RobotInfoDTO detailDTO = robotService.robotDetail(robotId);
-        return ResponseData.success(detailDTO);
+        if (detailDTO != null) {
+            return ResponseData.success(detailDTO);
+        }
+        return ResponseData.error(404, "无法查询到此机器人详情");
     }
 
     /**

diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
index 3444c3e..4a022e5 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
@@ -57,7 +57,10 @@
     @ResponseBody
     public Object detail(@PathVariable("robotId") String robotId) {
         RobotInfoDTO detailDTO = robotService.robotDetail(robotId);
-        return ResponseData.success(detailDTO);
+        if (detailDTO != null) {
+            return ResponseData.success(detailDTO);
+        }
+        return ResponseData.error(404, "无法查询到此机器人详情");
     }
 
     /**
diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
index 06fc82f..e6fd7ea 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
@@ -37,7 +37,6 @@
         <include refid="Base_Column_List"/>
         FROM robot_info AS ri
         WHERE ri.ROBOT_ID = #{robotId}
-        AND ri.NAVIGATE_STATE = '任务中'
         ORDER BY ri.RECEIVE_TIME DESC
         LIMIT 1
     </select>

diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
index 3444c3e..4a022e5 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
@@ -57,7 +57,10 @@
     @ResponseBody
     public Object detail(@PathVariable("robotId") String robotId) {
         RobotInfoDTO detailDTO = robotService.robotDetail(robotId);
-        return ResponseData.success(detailDTO);
+        if (detailDTO != null) {
+            return ResponseData.success(detailDTO);
+        }
+        return ResponseData.error(404, "无法查询到此机器人详情");
     }
 
     /**
diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
index 06fc82f..e6fd7ea 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
@@ -37,7 +37,6 @@
         <include refid="Base_Column_List"/>
         FROM robot_info AS ri
         WHERE ri.ROBOT_ID = #{robotId}
-        AND ri.NAVIGATE_STATE = '任务中'
         ORDER BY ri.RECEIVE_TIME DESC
         LIMIT 1
     </select>
diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java
index 047bc46..d4e441a 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java
@@ -53,18 +53,19 @@
         List<Map<String, Object>> maps = new ArrayList<>();
         for (Integer robotId : selectRobotIds()) {
             RobotInfoDTO robotDetail = robotDetail(String.valueOf(robotId));
-
             Map<String, Object> robotMap = new HashMap<>(7);
-            robotMap.put("robotId", robotId);
-            robotMap.put("modelType", robotDetail.getModelType());
-            robotMap.put("lng", robotDetail.getLng());
-            robotMap.put("lat", robotDetail.getLat());
-            robotMap.put("navigateState", robotDetail.getNavigateState());
-            robotMap.put("instrumentE", robotDetail.getInstrumentE());
-            robotMap.put("powerE", robotDetail.getPowerE());
-            robotMap.put("targetDistance", robotDetail.getTargetDistance());
+            if (robotDetail != null) {
+                robotMap.put("robotId", robotId);
+                robotMap.put("modelType", robotDetail.getModelType());
+                robotMap.put("lng", robotDetail.getLng());
+                robotMap.put("lat", robotDetail.getLat());
+                robotMap.put("navigateState", robotDetail.getNavigateState());
+                robotMap.put("instrumentE", robotDetail.getInstrumentE());
+                robotMap.put("powerE", robotDetail.getPowerE());
+                robotMap.put("targetDistance", robotDetail.getTargetDistance());
 
-            maps.add(robotMap);
+                maps.add(robotMap);
+            }
         }
         return maps;
     }
@@ -91,7 +92,6 @@
         //先查所有库里机器人的ID
         for (Integer robotId : selectRobotIds()) {
             List<RobotInfo> robotInfos = this.baseMapper.selectRobotInfos(robotId, startDate, endDate);
-            //过滤距离近的点，默认添加第一个点
             if (robotInfos.size() != 0) {
                 result.add(getRobotDTOs(robotInfos));
             }

diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
index 3444c3e..4a022e5 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/controller/ShelterController.java
@@ -57,7 +57,10 @@
     @ResponseBody
     public Object detail(@PathVariable("robotId") String robotId) {
         RobotInfoDTO detailDTO = robotService.robotDetail(robotId);
-        return ResponseData.success(detailDTO);
+        if (detailDTO != null) {
+            return ResponseData.success(detailDTO);
+        }
+        return ResponseData.error(404, "无法查询到此机器人详情");
     }
 
     /**
diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
index 06fc82f..e6fd7ea 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/mapping/RobotMapper.xml
@@ -37,7 +37,6 @@
         <include refid="Base_Column_List"/>
         FROM robot_info AS ri
         WHERE ri.ROBOT_ID = #{robotId}
-        AND ri.NAVIGATE_STATE = '任务中'
         ORDER BY ri.RECEIVE_TIME DESC
         LIMIT 1
     </select>
diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java
index 047bc46..d4e441a 100644
--- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java
+++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java
@@ -53,18 +53,19 @@
         List<Map<String, Object>> maps = new ArrayList<>();
         for (Integer robotId : selectRobotIds()) {
             RobotInfoDTO robotDetail = robotDetail(String.valueOf(robotId));
-
             Map<String, Object> robotMap = new HashMap<>(7);
-            robotMap.put("robotId", robotId);
-            robotMap.put("modelType", robotDetail.getModelType());
-            robotMap.put("lng", robotDetail.getLng());
-            robotMap.put("lat", robotDetail.getLat());
-            robotMap.put("navigateState", robotDetail.getNavigateState());
-            robotMap.put("instrumentE", robotDetail.getInstrumentE());
-            robotMap.put("powerE", robotDetail.getPowerE());
-            robotMap.put("targetDistance", robotDetail.getTargetDistance());
+            if (robotDetail != null) {
+                robotMap.put("robotId", robotId);
+                robotMap.put("modelType", robotDetail.getModelType());
+                robotMap.put("lng", robotDetail.getLng());
+                robotMap.put("lat", robotDetail.getLat());
+                robotMap.put("navigateState", robotDetail.getNavigateState());
+                robotMap.put("instrumentE", robotDetail.getInstrumentE());
+                robotMap.put("powerE", robotDetail.getPowerE());
+                robotMap.put("targetDistance", robotDetail.getTargetDistance());
 
-            maps.add(robotMap);
+                maps.add(robotMap);
+            }
         }
         return maps;
     }
@@ -91,7 +92,6 @@
         //先查所有库里机器人的ID
         for (Integer robotId : selectRobotIds()) {
             List<RobotInfo> robotInfos = this.baseMapper.selectRobotInfos(robotId, startDate, endDate);
-            //过滤距离近的点，默认添加第一个点
             if (robotInfos.size() != 0) {
                 result.add(getRobotDTOs(robotInfos));
             }
diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/dto/ShipDTO.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/dto/ShipDTO.java
index a3c1a48..05d289a 100644
--- a/casic-ship/src/main/java/com/casic/missiles/modular/system/dto/ShipDTO.java
+++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/dto/ShipDTO.java
@@ -113,7 +113,7 @@
             case "8":
                 return "航行中";
             default:
-                return "";
+                return "AIS状态未知";
         }
     }
 }