From a5e9e3133410dc8c4a20fc1623217ec7b0becf10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E4=B8=9C?= <13396135+anton-aoi@user.noreply.gitee.com> Date: Thu, 23 Nov 2023 13:41:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- february-vehicle-auth/pom.xml | 20 ++++++++++++++ february-vehicle-gateway/pom.xml | 20 ++++++++++++++ february-vehicle-server/pom.xml | 26 ++++--------------- .../controller/TrajectoryController.java | 11 ++++++++ .../trajectory/mapper/TrajectoryMapper.java | 2 ++ .../trajectory/service/TrajectoryService.java | 4 ++- .../service/impl/TrajectoryServiceImpl.java | 20 ++++++++++---- .../resources/mapper/TrajectoryMapper.xml | 5 ++++ pom.xml | 2 ++ 9 files changed, 83 insertions(+), 27 deletions(-) create mode 100644 february-vehicle-auth/pom.xml create mode 100644 february-vehicle-gateway/pom.xml diff --git a/february-vehicle-auth/pom.xml b/february-vehicle-auth/pom.xml new file mode 100644 index 0000000..61d9660 --- /dev/null +++ b/february-vehicle-auth/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.february + february-vehicle-trajectory + 3.6.3 + + + february-vehicle-auth + + + 17 + 17 + UTF-8 + + + diff --git a/february-vehicle-gateway/pom.xml b/february-vehicle-gateway/pom.xml new file mode 100644 index 0000000..63a49d7 --- /dev/null +++ b/february-vehicle-gateway/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.february + february-vehicle-trajectory + 3.6.3 + + + february-vehicle-gateway + + + 17 + 17 + UTF-8 + + + diff --git a/february-vehicle-server/pom.xml b/february-vehicle-server/pom.xml index 8c48978..ae4dcd0 100644 --- a/february-vehicle-server/pom.xml +++ b/february-vehicle-server/pom.xml @@ -47,29 +47,13 @@ february-common-datasource 3.6.3 + + com.baomidou + mybatis-plus-extension + 3.5.3.1 + - - - - - - - - - - - - - - - - - - - - - ${project.artifactId} 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 72c94ed..91966d0 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 @@ -66,4 +66,15 @@ public class TrajectoryController { public Result updateVehicle(@RequestParam("vehicleId") Integer vehicleId){ return trajectoryService.updateVehicle(vehicleId); } + + + /** + * 新增车辆 + */ + @PutMapping("/insertVehicle") + @WebLog(description = "新增车辆") + public Result insertVehicle(@RequestBody Vehicle vehicle){ + return trajectoryService.insertVehicle(vehicle); + } + } 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 ea58172..9a737c9 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 @@ -19,4 +19,6 @@ public interface TrajectoryMapper { Vehicle echoVehicle(@Param("vehicleId") Integer vehicleId); Integer updateVehicle(@Param("vehicleId") Integer vehicleId); + + Integer insertVehicle(Vehicle vehicle); } 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 10bfaee..b1d68c2 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 @@ -7,7 +7,7 @@ import com.february.common.domain.VehicleType; import java.util.List; -public interface TrajectoryService { +public interface TrajectoryService { Result> realDateList(); Result> vehicleList(); @@ -17,4 +17,6 @@ public interface TrajectoryService { Result echoVehicle(Integer vehicleId); Result updateVehicle(Integer vehicleId); + + Result insertVehicle(Vehicle vehicle); } 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 7b2b01e..c0ca658 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 @@ -32,7 +32,7 @@ public class TrajectoryServiceImpl implements TrajectoryService { @Override public Result> vehicleTypeList() { List vehicleTypes = mapper.vehicleTypeList(); - return Result.success(vehicleTypes,"查询成功"); + return Result.success(vehicleTypes); } @Override @@ -43,11 +43,21 @@ public class TrajectoryServiceImpl implements TrajectoryService { @Override public Result updateVehicle(Integer vehicleId) { - Integer i = mapper.updateVehicle(vehicleId); - if (i>0) { - return Result.success(i,"修改成功"); + // 假设mapper.updateVehicle() 返回受影响的行数 + int affectedRows = mapper.updateVehicle(vehicleId); + + // 根据操作结果返回相应的 Result + if (affectedRows > 0) { + return Result.success("修改成功"); + } else { + // 返回一个明确表明失败原因的错误消息 + return Result.error("修改失败，找不到指定的车辆或车辆无法更新"); } - return null; + } + + @Override + public Result insertVehicle(Vehicle vehicle) { + return Result.success(mapper.insertVehicle(vehicle)); } diff --git a/february-vehicle-server/src/main/resources/mapper/TrajectoryMapper.xml b/february-vehicle-server/src/main/resources/mapper/TrajectoryMapper.xml index 70e18cc..ac23271 100644 --- a/february-vehicle-server/src/main/resources/mapper/TrajectoryMapper.xml +++ b/february-vehicle-server/src/main/resources/mapper/TrajectoryMapper.xml @@ -1,6 +1,11 @@ + + INSERT INTO `car`.`vehicle` ( `vehicle_id`, `vehicle_vin`, `vehicle_type_id`, `vehicle_status`, `fence_id`, `motor_manufacturer`, `battery_manufacturer`, `motor_coding`, `Battery_coding` ) + VALUES + ( 0,#{vehicleVIN}, #{vehicleTypeId}, #{fenceId}, #{motorManufacturer}, #{batteryManufacturer}, #{motorCoding}, #{batteryCoding} ); + UPDATE vehicle SET vehicle_status = 0 diff --git a/pom.xml b/pom.xml index 7a40c08..b3099c6 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,8 @@ february-vehicle-common february-vehicle-remote february-vehicle-server + february-vehicle-gateway + february-vehicle-auth february-vehicle-trajectory pom