diff --git a/car-base-common/src/main/java/com/god/base/domain/FirmCar.java b/car-base-common/src/main/java/com/god/base/domain/FirmCar.java new file mode 100644 index 0000000..5730917 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/domain/FirmCar.java @@ -0,0 +1,109 @@ +package com.god.base.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 车辆对象 + * + * @author LouZhiSHuo + * @Date 2023/12/6 19:01 + **/ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class FirmCar { + + + /** + * 车辆VIN + */ + @NotEmpty(message = "车辆VIN不能为空") + private String carVinId; + + /** + * 企业编号 + */ + private Integer userId; + + /** + *车辆类型 + */ + private Integer carTypeId; + + /** + * 电池箱信息id + */ + private Integer batteryBoxId; + /** + * 电池组id + */ + private Integer cellId; + /** + * 单体电池id + */ + private Integer batteryCellId; + /** + * 电池组模块id + */ + private Integer batteryPackInformationId; + /** + * 车牌号 + */ + private String carNumber; + /** + * 驱动机主键 + */ + private Integer driveMotorId; + /** + * 车辆总里程 + */ + private Double carMileage; + /** + * 区域 + */ + private String address; + /** + * 电池厂商 + */ + private String batteryManufacturer; + /** + * 电机厂商 + */ + private String motorManufacturer; + /** + * 电机编号 + */ + private String motorNumber; + /** + * 电池编号 + */ + private String batteryNumber; + /** + * 逻辑删除 + * 1-删除 + * 0-未删除 默认 + */ + private Integer is_delete; + /** + * 车辆状态 + * 1-上线 + * 0-未链接 默认 + */ + private Integer status; + /** + * 需要发送的主题 + */ + private String topic; + + + + + +} diff --git a/car-base-common/src/main/java/com/god/base/domain/request/FirmCarRequest.java b/car-base-common/src/main/java/com/god/base/domain/request/FirmCarRequest.java new file mode 100644 index 0000000..a9dee81 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/domain/request/FirmCarRequest.java @@ -0,0 +1,24 @@ +package com.god.base.domain.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 车辆管理条件查询 + * + * @author LouZhiSHuo + * @Date 2023/12/6 19:54 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class FirmCarRequest { + + /** + * 企业编号 + */ + private String userId; +} diff --git a/car-base-server/src/main/java/com/god/base/server/controller/FirmCarController.java b/car-base-server/src/main/java/com/god/base/server/controller/FirmCarController.java new file mode 100644 index 0000000..91863a8 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/controller/FirmCarController.java @@ -0,0 +1,89 @@ +package com.god.base.server.controller; + +import com.god.base.domain.FirmCar; +import com.god.base.domain.request.FirmCarRequest; +import com.god.base.server.service.FirmCarService; +import com.god.common.core.domain.Result; +import com.god.common.log.annotation.Log; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Collections; +import java.util.List; + +/** + * 车辆管理 + * + * @author LouZhiSHuo + * @Date 2023/12/6 19:29 + **/ +@RequestMapping("/FirmCar") +@RestController +@Log4j2 +public class FirmCarController { + + + @Autowired + private FirmCarService firmCarService; + + + /** + * 添加企业车辆 + * @param firmCar + * @return + */ + @PostMapping("/inertFirmCar") + @Log(title = "添加车辆") + public Result inertFirmCar(@RequestBody FirmCar firmCar) { + //添加车辆 + firmCarService.save(firmCar); + + return Result.success("","添加成功!"); + } + + + /** + * 编辑车辆信息 + * @param firmCar + * @return + */ + @PostMapping("/updateFirmCar") + @Log(title = "修改车辆信息") + public Result updateFirmCar(@RequestBody FirmCar firmCar) { + //修改围栏信息 + firmCarService.updateById(firmCar); + + return Result.success("","编辑成功!"); + } + + + /** + * 删除车辆 + * @param carVinId + * @return + */ + @GetMapping("/deleteFirmCarById") + @Log(title = "根据车辆VIN删除车辆") + public Result deleteFirmCarById(@RequestParam("carVinId") String carVinId) { + //根据车辆VIN删除车辆 + firmCarService.removeById(carVinId); + + return Result.success("","删除成功!"); + } + + + /** + * 根据企业编号查询车辆 + * @param firmCarRequest + * @return + */ + @PostMapping("/findFirmCarByUserId") + @Log(title = "根据企业编号查询车辆") + public Result> findFirmCarByUserId(@RequestBody FirmCarRequest firmCarRequest) { + //根据企业编号查询车辆 + List firmCarList = firmCarService.findFirmCarByUserId(firmCarRequest); + + return Result.success(firmCarList,"查询成功!"); + } +} diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/FirmCarMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/FirmCarMapper.java new file mode 100644 index 0000000..ed61ec0 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/mapper/FirmCarMapper.java @@ -0,0 +1,17 @@ +package com.god.base.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.god.base.domain.FirmCar; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 车辆管理 + * + * @author LouZhiSHuo + * @Date 2023/12/6 19:29 + **/ +public interface FirmCarMapper extends BaseMapper { + +} diff --git a/car-base-server/src/main/java/com/god/base/server/service/FirmCarService.java b/car-base-server/src/main/java/com/god/base/server/service/FirmCarService.java new file mode 100644 index 0000000..7912b7c --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/service/FirmCarService.java @@ -0,0 +1,26 @@ +package com.god.base.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.god.base.domain.FirmCar; +import com.god.base.domain.request.FirmCarRequest; + +import java.util.List; + +/** + * 车辆管理 + * + * @author LouZhiSHuo + * @Date 2023/12/6 19:29 + **/ +public interface FirmCarService extends IService { + + /** + * 根据企业编号查询车辆 + * @param firmCarRequest + * @return + */ + List findFirmCarByUserId(FirmCarRequest firmCarRequest); + + + +} diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/FirmCarServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/FirmCarServiceImpl.java new file mode 100644 index 0000000..5e7efec --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/FirmCarServiceImpl.java @@ -0,0 +1,77 @@ +package com.god.base.server.service.impl; + +import com.alibaba.druid.util.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.god.base.domain.FirmCar; +import com.god.base.domain.request.FirmCarRequest; +import com.god.base.server.mapper.FirmCarMapper; +import com.god.base.server.service.FirmCarService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.util.List; + +/** + * 车辆管理 + * + * @author LouZhiSHuo + * @Date 2023/12/6 19:29 + **/ +@Service +@Log4j2 +public class FirmCarServiceImpl extends ServiceImpl implements FirmCarService { + + + @Autowired + private FirmCarMapper firmCarMapper; + + @Override + public boolean save(FirmCar entity) { + boolean save = super.save(entity); + if (!save) { + throw new RuntimeException("围栏添加失败!"); + } + return true; + } + + @Override + public boolean removeById(Serializable id) { + boolean remove = super.removeById(id); + if (!remove) { + throw new RuntimeException("围栏删除失败!"); + } + return true; + } + + @Override + public boolean updateById(FirmCar entity) { + boolean update = super.updateById(entity); + if (!update) { + throw new RuntimeException("围栏编辑失败!"); + } + return true; + } + + /** + * 根据企业编号查询车辆 + * @param firmCarRequest + * @return + */ + @Override + public List findFirmCarByUserId(FirmCarRequest firmCarRequest) { + //创建查询条件对象 + LambdaQueryWrapper firmCarLambdaQueryWrapper = new LambdaQueryWrapper<>(); + //判空 + if (StringUtils.isEmpty(firmCarRequest.getUserId())) { + firmCarLambdaQueryWrapper.eq(FirmCar::getUserId,firmCarRequest.getUserId()); + } + //查询车辆列表 + List FirmCarList = this.list(firmCarLambdaQueryWrapper); + return FirmCarList; + } + + +}