From c271260efc73d30a0d3e91b21173529bf252d82a Mon Sep 17 00:00:00 2001 From: fuck_zhn <2218834824@qq.com> Date: Tue, 5 Dec 2023 22:32:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dragon/car/domain/Car.java | 23 ++++++ .../com/dragon/car/domain/req/RequestCar.java | 13 +++- .../car/service/controller/CarController.java | 67 ++-------------- .../car/service/service/CarManageService.java | 35 +-------- .../service/impl/CarManageServiceImpl.java | 77 ++++--------------- 5 files changed, 56 insertions(+), 159 deletions(-) create mode 100644 dragon-car-common/src/main/java/com/dragon/car/domain/Car.java diff --git a/dragon-car-common/src/main/java/com/dragon/car/domain/Car.java b/dragon-car-common/src/main/java/com/dragon/car/domain/Car.java new file mode 100644 index 0000000..f2919b7 --- /dev/null +++ b/dragon-car-common/src/main/java/com/dragon/car/domain/Car.java @@ -0,0 +1,23 @@ +package com.dragon.car.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class Car { + + private int id; + private String vin; + private String carName; + private String carBrand; + private int carTypeId; + private int fenceId; + private String carStatus; + private boolean isDelete; + +} diff --git a/dragon-car-common/src/main/java/com/dragon/car/domain/req/RequestCar.java b/dragon-car-common/src/main/java/com/dragon/car/domain/req/RequestCar.java index e98eb82..13e5010 100644 --- a/dragon-car-common/src/main/java/com/dragon/car/domain/req/RequestCar.java +++ b/dragon-car-common/src/main/java/com/dragon/car/domain/req/RequestCar.java @@ -1,5 +1,6 @@ package com.dragon.car.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,9 +14,15 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@TableName ("car") public class RequestCar { - private String firmId; - private String firmName; - private String carId; + private String id; + private String vin; private String carName; + private String carBrand; + private String carTypeId; + private String fenceId; + private String carStatus; + private String isDelete; + } diff --git a/dragon-car-service/src/main/java/com/dragon/car/service/controller/CarController.java b/dragon-car-service/src/main/java/com/dragon/car/service/controller/CarController.java index 7177bbe..f58e5b2 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/service/controller/CarController.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/controller/CarController.java @@ -1,17 +1,11 @@ package com.dragon.car.service.controller; -import com.dragon.car.domain.req.RequestCar; -import com.dragon.car.domain.resp.ResquestFaultCode; import com.dragon.car.service.service.CarManageService; import com.dragon.common.core.domain.Result; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * @author : Administrator * @description : 汽车管理控制层 @@ -22,63 +16,18 @@ public class CarController { @Autowired CarManageService carManageService; - - /** - * 车辆初始化 - * - * @return List 初始化企业车辆列表 - */ - @PostMapping ("/carInit") - public Result> carInit () { - - return carManageService.carInit (); + //传入车辆vin查看是否有 + @RequestMapping ("/carInit") + public Result carInit (String vin) { + return carManageService.carInit (vin); } + //新增车辆 - /** - * 车辆添加 - * - * @param request - * - * @return - */ - @PostMapping ("/carInsert") - public Result carInsert (@RequestBody RequestCar request) { - - return carManageService.carInsert (request); - } + //修改车辆信息(文件读取) - /** - * 辆修改参数 - * - * @param request - * - * @return - */ - @PostMapping ("/carUpdate") - public Result carUpdate (@RequestBody RequestCar request) { - return carManageService.carUpdate (request); - } + //删除车辆 - /** - * 车辆删除 - * - * @param request - * - * @return - */ - @PostMapping ("/carDelect") - public Result carDelect (@RequestBody RequestCar request) { - return carManageService.carDelect (request); - } - - /** - * 车辆故障码 - */ - @PostMapping ("/faultCode") - public Result> faultCodeList () { - - return carManageService.faultCodeList (); - } + //查询车辆列表 } diff --git a/dragon-car-service/src/main/java/com/dragon/car/service/service/CarManageService.java b/dragon-car-service/src/main/java/com/dragon/car/service/service/CarManageService.java index 3a4674d..4f5c369 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/service/service/CarManageService.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/service/CarManageService.java @@ -1,11 +1,7 @@ package com.dragon.car.service.service; -import com.dragon.car.domain.req.RequestCar; -import com.dragon.car.domain.resp.ResquestFaultCode; import com.dragon.common.core.domain.Result; -import java.util.List; - /** * @author : Administrator * @description : @@ -16,36 +12,7 @@ public interface CarManageService { * * @return List 企业管理的车-列表 */ - Result> carInit (); + Result carInit (String vin); - /** - * 车俩添加方法 - * - * @param request - * - * @return 是否成功 i=1 成功 i=0 失败 - */ - Result carInsert (RequestCar request); - - /** - * 车辆修改方法 - * - * @param request - * - * @return 是否成功 i=1 成功 i=0 失败 - */ - Result carUpdate (RequestCar request); - - - /** - * 车辆删除 - * - * @param request - * - * @return 是否成功 i=1 成功 i=0 失败 - */ - Result carDelect (RequestCar request); - - Result> faultCodeList (); } diff --git a/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/CarManageServiceImpl.java b/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/CarManageServiceImpl.java index 6ac97ed..598523b 100644 --- a/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/CarManageServiceImpl.java +++ b/dragon-car-service/src/main/java/com/dragon/car/service/service/impl/CarManageServiceImpl.java @@ -1,9 +1,7 @@ package com.dragon.car.service.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dragon.car.domain.req.RequestCar; -import com.dragon.car.domain.resp.ResquestFaultCode; import com.dragon.car.service.mapper.CarManageMapper; import com.dragon.car.service.service.CarManageService; import com.dragon.common.core.domain.Result; @@ -11,7 +9,6 @@ import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; /** * @author : Administrator @@ -31,65 +28,19 @@ public class CarManageServiceImpl implements CarManageService { * @return List 企业管理的车-列表 */ @Override - public Result> carInit () { - LambdaQueryWrapper aclqw = new LambdaQueryWrapper<> (); - - List carInits = carMapper.selectList (aclqw); - - log.info ("信息是:{}", carInits.stream ().toArray ()); - return Result.success (carInits); - } - - /** - * 车俩添加方法 - * - * @param request - * - * @return 是否成功 i=1 成功 i=0 失败 - */ - @Override - public Result carInsert (RequestCar request) { - - - int i = carMapper.insert (request); - - return Result.success (i > 0 ? "成功" : "失败"); - } - - /** - * 车辆修改方法 - * - * @param request - * - * @return 是否成功 i=1 成功 i=0 失败 - */ - @Override - public Result carUpdate (RequestCar request) { - LambdaUpdateWrapper luw = new LambdaUpdateWrapper (); - int i = carMapper.update (request, luw); - return Result.success (i > 0 ? "成功" : "失败"); - } - - /** - * 车辆删除 - * - * @param request - * - * @return 是否成功 i=1 成功 i=0 失败 - */ - @Override - public Result carDelect (RequestCar request) { - int i = carMapper.deleteById (request.getCarId ()); - - return Result.success (i > 0 ? "成功" : "失败"); - } - - /** - * @return - */ - @Override - public Result> faultCodeList () { - return null; + public Result carInit (String vin) { + // 用车辆的vin查询是否有该车辆，车辆的vin字段和String vin是一致的 + int i = 0; + RequestCar car = carMapper.selectOne (new QueryWrapper ().eq ("vin", vin)); + if (car != null) { + // 当查询到有该车辆时，修改字段car_status的值为'1' + car.setCarStatus ("1"); + i = carMapper.updateById (car); + } + else { + return Result.error ("没有这车"); + } + return Result.success (i > 0 ? "车辆上线" : "上线失败"); }