diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java index c4dbcc8..da963cb 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java @@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; +import java.util.Map; + /** * 水下机器人数据控制器 * @@ -26,6 +29,16 @@ } /** + * 水下机器人列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list() { + List> robotListMap = robotService.robotList(); + return ResponseData.success(robotListMap); + } + + /** * 水下机器人详情 */ @GetMapping(value = "/detail/{robotId}") diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java index c4dbcc8..da963cb 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java @@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; +import java.util.Map; + /** * 水下机器人数据控制器 * @@ -26,6 +29,16 @@ } /** + * 水下机器人列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list() { + List> robotListMap = robotService.robotList(); + return ResponseData.success(robotListMap); + } + + /** * 水下机器人详情 */ @GetMapping(value = "/detail/{robotId}") diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IRobotService.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IRobotService.java index 0dcba3e..5cb895a 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IRobotService.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IRobotService.java @@ -4,6 +4,9 @@ import com.casic.missiles.modular.system.dto.RobotInfoDTO; import com.casic.missiles.modular.system.model.RobotInfo; +import java.util.List; +import java.util.Map; + /** * @author a203 */ @@ -14,7 +17,14 @@ void saveRobotInfo(); /** - * 查询台风详情 + * 查询机器人列表 + * + * @return List> + */ + List> robotList(); + + /** + * 查询机器人详情 * * @param robotId 机器人ID * @return RobotInfoDTO diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java index c4dbcc8..da963cb 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/controller/RobotController.java @@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; +import java.util.Map; + /** * 水下机器人数据控制器 * @@ -26,6 +29,16 @@ } /** + * 水下机器人列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list() { + List> robotListMap = robotService.robotList(); + return ResponseData.success(robotListMap); + } + + /** * 水下机器人详情 */ @GetMapping(value = "/detail/{robotId}") diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IRobotService.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IRobotService.java index 0dcba3e..5cb895a 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IRobotService.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/IRobotService.java @@ -4,6 +4,9 @@ import com.casic.missiles.modular.system.dto.RobotInfoDTO; import com.casic.missiles.modular.system.model.RobotInfo; +import java.util.List; +import java.util.Map; + /** * @author a203 */ @@ -14,7 +17,14 @@ void saveRobotInfo(); /** - * 查询台风详情 + * 查询机器人列表 + * + * @return List> + */ + List> robotList(); + + /** + * 查询机器人详情 * * @param robotId 机器人ID * @return RobotInfoDTO diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java index 3ff84be..51ee60d 100644 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java +++ b/casic-ship/src/main/java/com/casic/missiles/modular/system/service/impl/RobotServiceImpl.java @@ -10,6 +10,11 @@ import com.casic.missiles.modular.system.utils.DataParser; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 台风数据信息 服务实现类 * @@ -29,7 +34,7 @@ @Override public void saveRobotInfo() { //TODO 测试数据 - RobotInfo robotInfo = DataParser.translate(RobotConstant.DATA); + RobotInfo robotInfo = DataParser.parseRobotInfo(RobotConstant.DATA); QueryWrapper query = new QueryWrapper<>(); query.eq("ROBOT_ID", robotInfo.getRobotId()); if (this.count(query) == 0) { @@ -40,6 +45,29 @@ } /** + * 查询机器人列表 + * + * @return List> + */ + @Override + public List> robotList() { + List> maps = new ArrayList<>(); + for (RobotInfo robot : list()) { + Map robotMap = new HashMap<>(7); + robotMap.put("robotId", String.valueOf(robot.getRobotId())); + robotMap.put("lng", String.valueOf(robot.getLng())); + robotMap.put("lat", String.valueOf(robot.getLat())); + robotMap.put("navigateState", robot.getNavigateState()); + robotMap.put("instrumentE", String.valueOf(robot.getInstrumentE())); + robotMap.put("powerE", String.valueOf(robot.getPowerE())); + robotMap.put("targetDistance", robot.getTargetDistance()); + + maps.add(robotMap); + } + return maps; + } + + /** * 查询水下机器人详情 * * @param robotId 机器人ID