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 1f2ead8..de6dceb 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 @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.RobotInfoDTO; import com.casic.missiles.modular.system.dto.SatelliteSignalDTO; import com.casic.missiles.modular.system.dto.ShelterPositionDTO; +import com.casic.missiles.modular.system.model.RobotInfo; import com.casic.missiles.modular.system.service.IRobotService; import com.casic.missiles.modular.system.service.ISatelliteService; import com.casic.missiles.modular.system.service.IShelterPositionService; @@ -64,7 +65,7 @@ @GetMapping(value = "/routeHistory") @ResponseBody public Object history() { - List> lastRouteMap = robotService.lastRoute(); + List> lastRouteMap = robotService.lastRoute(); return ResponseData.success(lastRouteMap); } 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 1f2ead8..de6dceb 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 @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.RobotInfoDTO; import com.casic.missiles.modular.system.dto.SatelliteSignalDTO; import com.casic.missiles.modular.system.dto.ShelterPositionDTO; +import com.casic.missiles.modular.system.model.RobotInfo; import com.casic.missiles.modular.system.service.IRobotService; import com.casic.missiles.modular.system.service.ISatelliteService; import com.casic.missiles.modular.system.service.IShelterPositionService; @@ -64,7 +65,7 @@ @GetMapping(value = "/routeHistory") @ResponseBody public Object history() { - List> lastRouteMap = robotService.lastRoute(); + List> lastRouteMap = robotService.lastRoute(); return ResponseData.success(lastRouteMap); } diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/RobotMapper.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/RobotMapper.java index c2b8f81..52bb713 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/RobotMapper.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/RobotMapper.java @@ -13,6 +13,13 @@ */ public interface RobotMapper extends BaseMapper { /** + * 获取数据库里机器人ID,去重 + * + * @return {@link List} + */ + List selectRobotIds(); + + /** * 获取最新的卫星信号 * * @param robotId 机器人ID 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 1f2ead8..de6dceb 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 @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.RobotInfoDTO; import com.casic.missiles.modular.system.dto.SatelliteSignalDTO; import com.casic.missiles.modular.system.dto.ShelterPositionDTO; +import com.casic.missiles.modular.system.model.RobotInfo; import com.casic.missiles.modular.system.service.IRobotService; import com.casic.missiles.modular.system.service.ISatelliteService; import com.casic.missiles.modular.system.service.IShelterPositionService; @@ -64,7 +65,7 @@ @GetMapping(value = "/routeHistory") @ResponseBody public Object history() { - List> lastRouteMap = robotService.lastRoute(); + List> lastRouteMap = robotService.lastRoute(); return ResponseData.success(lastRouteMap); } diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/RobotMapper.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/RobotMapper.java index c2b8f81..52bb713 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/RobotMapper.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dao/RobotMapper.java @@ -13,6 +13,13 @@ */ public interface RobotMapper extends BaseMapper { /** + * 获取数据库里机器人ID,去重 + * + * @return {@link List} + */ + List selectRobotIds(); + + /** * 获取最新的卫星信号 * * @param robotId 机器人ID 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 0e2414b..a785d94 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 @@ -25,6 +25,11 @@ TARGET_HERTZ AS targetHertz + + + SELECT DISTINCT ri.ROBOT_ID AS robotId + FROM robot_info AS ri + + + SELECT DISTINCT ri.ROBOT_ID AS robotId + FROM robot_info AS ri + + + SELECT DISTINCT ri.ROBOT_ID AS robotId + FROM robot_info AS ri + + + SELECT DISTINCT ri.ROBOT_ID AS robotId + FROM robot_info AS ri + + + SELECT DISTINCT ri.ROBOT_ID AS robotId + FROM robot_info AS ri + +