diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/Vehicle.java b/february-vehicle-common/src/main/java/com/february/common/domain/Vehicle.java index ce3e6fa..1e096a2 100644 --- a/february-vehicle-common/src/main/java/com/february/common/domain/Vehicle.java +++ b/february-vehicle-common/src/main/java/com/february/common/domain/Vehicle.java @@ -5,6 +5,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +/** + * 车辆信息 + */ @Data @Builder @NoArgsConstructor diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/VehicleType.java b/february-vehicle-common/src/main/java/com/february/common/domain/VehicleType.java index 2809ba4..385f740 100644 --- a/february-vehicle-common/src/main/java/com/february/common/domain/VehicleType.java +++ b/february-vehicle-common/src/main/java/com/february/common/domain/VehicleType.java @@ -5,6 +5,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +/** + * 车辆类型 + */ @Data @Builder @NoArgsConstructor diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java index 510fa85..288f28e 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java @@ -10,6 +10,7 @@ import com.vehicle.trajectory.service.TrajectoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; @@ -40,7 +41,7 @@ public class TrajectoryController { */ @GetMapping("/vehicleList") @WebLog(description = "查看在线车辆") - public Result> carList() { + public Result> vehicleList() { return trajectoryService.vehicleList(); } @@ -52,4 +53,13 @@ public class TrajectoryController { public Result> vehicleTypeList(){ return trajectoryService.vehicleTypeList(); } + + /** + * 回显车辆信息 + */ + @GetMapping("/echoVehicle") + @WebLog(description = "回显车辆信息") + public Result echoVehicle(@RequestParam("vehicleId") Integer vehicleId){ + return trajectoryService.echoVehicle(vehicleId); + } } diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/mapper/TrajectoryMapper.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/mapper/TrajectoryMapper.java index 41d0ea5..0ea5586 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/mapper/TrajectoryMapper.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/mapper/TrajectoryMapper.java @@ -4,6 +4,7 @@ import com.february.common.domain.RealData; import com.february.common.domain.Vehicle; import com.february.common.domain.VehicleType; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,4 +15,6 @@ public interface TrajectoryMapper { List vehicleList(); List vehicleTypeList(); + + Vehicle echoVehicle(@Param("vehicleId") Integer vehicleId); } diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java index e301936..af13fe5 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java @@ -13,4 +13,6 @@ public interface TrajectoryService { Result> vehicleList(); Result> vehicleTypeList(); + + Result echoVehicle(Integer vehicleId); } diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java index 7ce64e8..aec94a5 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java @@ -57,5 +57,11 @@ public class TrajectoryServiceImpl implements TrajectoryService { return Result.success(vehicleTypes); } + @Override + public Result echoVehicle(Integer vehicleId) { + Vehicle vehicle = mapper.echoVehicle(vehicleId); + return Result.success(vehicle); + } + } diff --git a/february-vehicle-server/src/main/resources/mapper/TrajectoryMapper.xml b/february-vehicle-server/src/main/resources/mapper/TrajectoryMapper.xml index 51974fe..dd5fc73 100644 --- a/february-vehicle-server/src/main/resources/mapper/TrajectoryMapper.xml +++ b/february-vehicle-server/src/main/resources/mapper/TrajectoryMapper.xml @@ -3,15 +3,31 @@ +