虎,车辆模块优化,车辆和类型的关联
parent
1910013cbb
commit
42c80590ff
|
@ -1,14 +1,15 @@
|
|||
package com.couplet.mq.controller;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.couplet.common.core.utils.uuid.IdUtils;
|
||||
import com.couplet.mq.config.RabbitMQConfig;
|
||||
import com.couplet.mq.domain.Test;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.amqp.rabbit.connection.CorrelationData;
|
||||
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
|
@ -23,12 +24,12 @@ public class MqController {
|
|||
@Autowired
|
||||
private RabbitTemplate rabbitTemplate;
|
||||
|
||||
@PostMapping("/receive")
|
||||
public void receive(@RequestBody Test data) {
|
||||
@GetMapping("/receive/{data}")
|
||||
public void receive(@PathVariable("data") String data) {
|
||||
//创建配置类对象,用于获取配置值
|
||||
RabbitMQConfig config = new RabbitMQConfig();
|
||||
|
||||
rabbitTemplate.convertAndSend(config.exchangeName, config.routingKey, JSON.toJSONString(data) , message -> {
|
||||
rabbitTemplate.convertAndSend(config.exchangeName, config.routingKey, data , message -> {
|
||||
message.getMessageProperties().setMessageId(IdUtils.randomUUID());
|
||||
return message;
|
||||
}, new CorrelationData(IdUtils.randomUUID()));
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package com.couplet.mq.service;
|
||||
|
||||
import com.couplet.mq.config.RabbitMQConfig;
|
||||
import com.rabbitmq.client.Channel;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.amqp.core.Message;
|
||||
|
@ -9,7 +8,6 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
|
|
@ -4,7 +4,8 @@ import com.couplet.common.core.domain.Result;
|
|||
import com.couplet.common.core.web.controller.BaseController;
|
||||
import com.couplet.common.log.annotation.Log;
|
||||
import com.couplet.common.log.enums.BusinessType;
|
||||
import com.couplet.vehicle.domain.LyhVehicle;
|
||||
import com.couplet.common.security.annotation.RequiresPermissions;
|
||||
import com.couplet.vehicle.domain.Vehicle;
|
||||
import com.couplet.vehicle.domain.req.VehicleEditParams;
|
||||
import com.couplet.vehicle.domain.req.VehicleInsertParams;
|
||||
import com.couplet.vehicle.domain.req.VehicleListParams;
|
||||
|
@ -34,11 +35,12 @@ public class VehicleController extends BaseController {
|
|||
* @Param: [listParams]
|
||||
* @Return: com.couplet.common.core.domain.Result
|
||||
**/
|
||||
@RequiresPermissions("couplet:vehicle:list")
|
||||
@PostMapping("/list")
|
||||
@Log(title = "车辆列表")
|
||||
public Result list(@RequestBody VehicleListParams listParams) {
|
||||
|
||||
List<LyhVehicle> List = vehicleService.list(listParams);
|
||||
List<Vehicle> List = vehicleService.list(listParams);
|
||||
|
||||
return Result.success(List);
|
||||
}
|
||||
|
@ -50,6 +52,7 @@ public class VehicleController extends BaseController {
|
|||
* @Param: [vehicleId]
|
||||
* @Return: com.couplet.common.core.domain.Result
|
||||
**/
|
||||
@RequiresPermissions("couplet:vehicle:deleteById")
|
||||
@GetMapping("/deleteById/{vehicleId}")
|
||||
@Log(title = "删除车辆", businessType = BusinessType.DELETE)
|
||||
public Result deleteById(@PathVariable Long vehicleId) {
|
||||
|
@ -66,6 +69,7 @@ public class VehicleController extends BaseController {
|
|||
* @Param: [editParams]
|
||||
* @Return: com.couplet.common.core.domain.Result
|
||||
**/
|
||||
@RequiresPermissions("couplet:vehicle:editById")
|
||||
@PostMapping("/editById")
|
||||
@Log(title = "编辑车辆", businessType = BusinessType.UPDATE)
|
||||
public Result editById(@RequestBody VehicleEditParams editParams) {
|
||||
|
@ -82,6 +86,7 @@ public class VehicleController extends BaseController {
|
|||
* @Param: [insertParams]
|
||||
* @Return: com.couplet.common.core.domain.Result
|
||||
**/
|
||||
@RequiresPermissions("couplet:vehicle:insert")
|
||||
@PostMapping("/insert")
|
||||
@Log(title = "新增车辆", businessType = BusinessType.INSERT)
|
||||
public Result insert(@RequestBody @Validated VehicleInsertParams insertParams) {
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
package com.couplet.vehicle.controller;
|
||||
|
||||
import com.couplet.common.core.domain.Result;
|
||||
import com.couplet.common.core.web.controller.BaseController;
|
||||
import com.couplet.common.security.annotation.RequiresPermissions;
|
||||
import com.couplet.vehicle.domain.VehicleType;
|
||||
import com.couplet.vehicle.service.VehicleTypeService;
|
||||
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.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/31
|
||||
* @Description: 车辆类型控制器
|
||||
*/
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/vehicleType")
|
||||
public class VehicleTypeController extends BaseController {
|
||||
@Autowired
|
||||
private VehicleTypeService service;
|
||||
|
||||
//获取所有的车辆类型
|
||||
@RequiresPermissions("couplet:vehicle:list")
|
||||
@GetMapping("/list")
|
||||
public Result<List<VehicleType>> list() {
|
||||
List<VehicleType> vehicleTypeList = service.list();
|
||||
return success(vehicleTypeList);
|
||||
}
|
||||
}
|
|
@ -20,8 +20,8 @@ import lombok.experimental.SuperBuilder;
|
|||
@SuperBuilder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName("lyh_vehicle")
|
||||
public class LyhVehicle {
|
||||
@TableName("couplet_vehicle")
|
||||
public class Vehicle {
|
||||
|
||||
/*
|
||||
*车辆id
|
||||
|
@ -33,7 +33,13 @@ public class LyhVehicle {
|
|||
*车辆类型
|
||||
* */
|
||||
@TableField(value = "vehicle_type")
|
||||
private Integer vehicleType;
|
||||
private Long vehicleType;
|
||||
|
||||
/*
|
||||
* 车辆类型名称
|
||||
* */
|
||||
@TableField(exist = false)
|
||||
private String vehicleTypeName;
|
||||
|
||||
|
||||
/*
|
|
@ -0,0 +1,44 @@
|
|||
package com.couplet.vehicle.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/30
|
||||
* @Description: 车辆和标志中间表
|
||||
*/
|
||||
|
||||
@Data
|
||||
@SuperBuilder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName("couplet_vehicle_and_logo")
|
||||
public class VehicleAndLogo {
|
||||
|
||||
/*
|
||||
* 车辆、标志中间表id
|
||||
* */
|
||||
@TableId(type = IdType.AUTO, value = "vehicle_logo_middle_id")
|
||||
private Long vehicleLogoMiddleId;
|
||||
|
||||
/*
|
||||
* 车辆id
|
||||
* */
|
||||
@TableField("vehicle_id")
|
||||
private Long vehicleId;
|
||||
|
||||
/*
|
||||
* 标志id
|
||||
* */
|
||||
@TableField("logo_id")
|
||||
private Long logoId;
|
||||
|
||||
}
|
|
@ -0,0 +1,36 @@
|
|||
package com.couplet.vehicle.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/31
|
||||
* @Description: 车辆类型
|
||||
*/
|
||||
@Data
|
||||
@SuperBuilder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName("couplet_vehicle_type")
|
||||
public class VehicleType {
|
||||
|
||||
/*
|
||||
* 车辆类型id
|
||||
* */
|
||||
@TableId(type = IdType.AUTO, value = "vehicle_type_id")
|
||||
private Long vehicleTypeId;
|
||||
|
||||
/*
|
||||
* 车辆类型名称
|
||||
* */
|
||||
@TableField(value = "vehicle_type_name")
|
||||
private String vehicleTypeName;
|
||||
}
|
|
@ -7,6 +7,8 @@ import lombok.experimental.SuperBuilder;
|
|||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
|
@ -25,7 +27,7 @@ public class VehicleInsertParams {
|
|||
*车辆类型
|
||||
* */
|
||||
@NotNull(message = "车辆类型不能为空")
|
||||
private Integer vehicleType;
|
||||
private Long vehicleType;
|
||||
|
||||
|
||||
/*
|
||||
|
@ -52,4 +54,10 @@ public class VehicleInsertParams {
|
|||
@NotBlank(message = "电池编号不能为空")
|
||||
private String batteryNumber;
|
||||
|
||||
/*
|
||||
* 一辆车可以绑定多个标识
|
||||
* */
|
||||
@Size(min = 1, message = "车辆至少绑定一个标识")
|
||||
private List<Long> logoIds;
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
package com.couplet.vehicle.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.couplet.vehicle.domain.VehicleAndLogo;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/26
|
||||
* @Description: 车辆与标志Mapper
|
||||
*/
|
||||
@Mapper
|
||||
@Component
|
||||
public interface VehicleAndLogoMapper extends BaseMapper<VehicleAndLogo> {
|
||||
int vehicleBindLogo(@Param("vehicleId") Long vehicleId, @Param("logoIds") List<Long> logoIds);
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package com.couplet.vehicle.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.couplet.vehicle.domain.LyhVehicle;
|
||||
import com.couplet.vehicle.domain.Vehicle;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
@ -13,5 +13,5 @@ import org.springframework.stereotype.Component;
|
|||
*/
|
||||
@Mapper
|
||||
@Component
|
||||
public interface VehicleMapper extends BaseMapper<LyhVehicle> {
|
||||
public interface VehicleMapper extends BaseMapper<Vehicle> {
|
||||
}
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
package com.couplet.vehicle.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.couplet.vehicle.domain.Vehicle;
|
||||
import com.couplet.vehicle.domain.VehicleType;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/26
|
||||
* @Description: 车辆类型Mapper
|
||||
*/
|
||||
@Mapper
|
||||
@Component
|
||||
public interface VehicleTypeMapper extends BaseMapper<VehicleType> {
|
||||
}
|
|
@ -0,0 +1,17 @@
|
|||
package com.couplet.vehicle.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.couplet.vehicle.domain.VehicleAndLogo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/30
|
||||
* @Description:
|
||||
*/
|
||||
|
||||
public interface VehicleAndLogoService extends IService<VehicleAndLogo> {
|
||||
int vehicleBindLogo(Long vehicleId, List<Long> logoIds);
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package com.couplet.vehicle.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.couplet.vehicle.domain.LyhVehicle;
|
||||
import com.couplet.vehicle.domain.Vehicle;
|
||||
import com.couplet.vehicle.domain.req.VehicleEditParams;
|
||||
import com.couplet.vehicle.domain.req.VehicleInsertParams;
|
||||
import com.couplet.vehicle.domain.req.VehicleListParams;
|
||||
|
@ -15,8 +15,8 @@ import java.util.List;
|
|||
* @Description: 车辆服务
|
||||
*/
|
||||
|
||||
public interface VehicleService extends IService<LyhVehicle> {
|
||||
List<LyhVehicle> list(VehicleListParams listParams);
|
||||
public interface VehicleService extends IService<Vehicle> {
|
||||
List<Vehicle> list(VehicleListParams listParams);
|
||||
|
||||
String deleteById(Long vehicleId);
|
||||
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
package com.couplet.vehicle.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.couplet.vehicle.domain.VehicleType;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/31
|
||||
* @Description: 车辆类型服务层
|
||||
*/
|
||||
|
||||
public interface VehicleTypeService extends IService<VehicleType> {
|
||||
List<VehicleType> list();
|
||||
}
|
|
@ -0,0 +1,40 @@
|
|||
package com.couplet.vehicle.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.couplet.vehicle.domain.VehicleAndLogo;
|
||||
import com.couplet.vehicle.mapper.VehicleAndLogoMapper;
|
||||
import com.couplet.vehicle.service.VehicleAndLogoService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/30
|
||||
* @Description: 车辆和标识关联
|
||||
*/
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class VehicleAndLogoServiceImpl extends ServiceImpl<VehicleAndLogoMapper, VehicleAndLogo> implements VehicleAndLogoService {
|
||||
|
||||
//注入mapper
|
||||
@Autowired
|
||||
private VehicleAndLogoMapper mapper;
|
||||
|
||||
/*
|
||||
* @Author: LiuYunHu
|
||||
* @Date: 2024/3/30 11:51
|
||||
* @Description: 车辆绑定标志
|
||||
* @Param: [vehicleId, logoIds]
|
||||
* @Return: int
|
||||
**/
|
||||
@Override
|
||||
public int vehicleBindLogo(Long vehicleId, List<Long> logoIds) {
|
||||
|
||||
return mapper.vehicleBindLogo(vehicleId, logoIds);
|
||||
}
|
||||
}
|
|
@ -4,13 +4,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.couplet.common.core.utils.StringUtils;
|
||||
import com.couplet.vehicle.domain.LyhVehicle;
|
||||
import com.couplet.vehicle.domain.Vehicle;
|
||||
import com.couplet.vehicle.domain.VehicleType;
|
||||
import com.couplet.vehicle.domain.req.VehicleEditParams;
|
||||
import com.couplet.vehicle.domain.req.VehicleInsertParams;
|
||||
import com.couplet.vehicle.domain.req.VehicleListParams;
|
||||
import com.couplet.vehicle.exception.VehicleException;
|
||||
import com.couplet.vehicle.mapper.VehicleMapper;
|
||||
import com.couplet.vehicle.service.VehicleAndLogoService;
|
||||
import com.couplet.vehicle.service.VehicleService;
|
||||
import com.couplet.vehicle.service.VehicleTypeService;
|
||||
import com.couplet.vehicle.utils.SnowflakeIdGenerator;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
@ -27,10 +30,19 @@ import java.util.List;
|
|||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, LyhVehicle> implements VehicleService {
|
||||
public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> implements VehicleService {
|
||||
//车辆mapper
|
||||
@Autowired
|
||||
private VehicleMapper vehicleMapper;
|
||||
|
||||
//车辆类型服务
|
||||
@Autowired
|
||||
private VehicleTypeService vehicleTypeService;
|
||||
|
||||
//车辆与标志关联 的mapper
|
||||
@Autowired
|
||||
private VehicleAndLogoService vehicleAndLogoService;
|
||||
|
||||
/*
|
||||
* @Author: LiuYunHu
|
||||
* @Date: 2024/3/26 22:11
|
||||
|
@ -39,25 +51,40 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, LyhVehicle> i
|
|||
* @Return: java.util.List<com.couplet.vehicle.domain.LyhVehicle>
|
||||
**/
|
||||
@Override
|
||||
public List<LyhVehicle> list(VehicleListParams listParams) {
|
||||
public List<Vehicle> list(VehicleListParams listParams) {
|
||||
// 创建查询条件包装器
|
||||
LambdaQueryWrapper<LyhVehicle> queryWrapper = new LambdaQueryWrapper<>();
|
||||
LambdaQueryWrapper<Vehicle> queryWrapper = new LambdaQueryWrapper<>();
|
||||
|
||||
// 如果车辆类型不为空,添加车辆类型作为查询条件
|
||||
if (!StringUtils.isNull(listParams.getVehicleType())) {
|
||||
queryWrapper.eq(LyhVehicle::getVehicleType, listParams.getVehicleType());
|
||||
queryWrapper.eq(Vehicle::getVehicleType, listParams.getVehicleType());
|
||||
}
|
||||
|
||||
// 如果车辆状态不为空,添加车辆状态作为查询条件
|
||||
if (!StringUtils.isNull(listParams.getVehicleState())) {
|
||||
queryWrapper.eq(LyhVehicle::getVehicleState, listParams.getVehicleState());
|
||||
queryWrapper.eq(Vehicle::getVehicleState, listParams.getVehicleState());
|
||||
}
|
||||
|
||||
//只查询车辆未被删除的
|
||||
queryWrapper.eq(LyhVehicle::getIsdelete, 0);
|
||||
queryWrapper.eq(Vehicle::getIsdelete, 0);
|
||||
|
||||
// 执行查询并返回结果
|
||||
return this.list(queryWrapper);
|
||||
// 执行查询
|
||||
List<Vehicle> list = this.list(queryWrapper);
|
||||
|
||||
//调用服务,得到车辆类型
|
||||
List<VehicleType> vehicleTypes = vehicleTypeService.list();
|
||||
|
||||
//将类型id一样的记录 名称进行赋值
|
||||
list.forEach(vehicle -> {
|
||||
vehicleTypes.forEach(vehicleType -> {
|
||||
if (vehicle.getVehicleType() == vehicleType.getVehicleTypeId()) {
|
||||
vehicle.setVehicleTypeName(vehicleType.getVehicleTypeName());
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -71,7 +98,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, LyhVehicle> i
|
|||
public String deleteById(Long vehicleId) {
|
||||
String result = "";
|
||||
|
||||
UpdateWrapper<LyhVehicle> updateWrapper = new UpdateWrapper<>();
|
||||
UpdateWrapper<Vehicle> updateWrapper = new UpdateWrapper<>();
|
||||
|
||||
updateWrapper.set("isdelete", 1)
|
||||
.eq("vehicle_id", vehicleId);
|
||||
|
@ -99,7 +126,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, LyhVehicle> i
|
|||
public String editById(VehicleEditParams editParams) {
|
||||
String result = "";
|
||||
|
||||
UpdateWrapper<LyhVehicle> updateWrapper = new UpdateWrapper<>();
|
||||
UpdateWrapper<Vehicle> updateWrapper = new UpdateWrapper<>();
|
||||
|
||||
//编辑车辆类型
|
||||
|
||||
|
@ -149,14 +176,33 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, LyhVehicle> i
|
|||
long randomId = idGenerator.nextId();
|
||||
String vin = "VIN" + randomId;
|
||||
|
||||
|
||||
//创建入参对象
|
||||
Vehicle vehicle = new Vehicle();
|
||||
|
||||
vehicle.setVehicleType(insertParams.getVehicleType());
|
||||
vehicle.setMotorManufacturer(insertParams.getMotorManufacturer());
|
||||
vehicle.setBatteryManufacturer(insertParams.getBatteryManufacturer());
|
||||
vehicle.setMotorNumber(insertParams.getMotorNumber());
|
||||
vehicle.setBatteryNumber(insertParams.getBatteryNumber());
|
||||
vehicle.setVin(vin);
|
||||
vehicle.setVehicleState(0);
|
||||
vehicle.setIsdelete(0);
|
||||
|
||||
|
||||
//执行插入操作
|
||||
int insert = vehicleMapper.insert(new LyhVehicle(null, insertParams.getVehicleType(), insertParams.getMotorManufacturer(), insertParams.getBatteryManufacturer(), insertParams.getMotorNumber(), insertParams.getBatteryNumber(), vin, 0, 0));
|
||||
int insert = vehicleMapper.insert(vehicle);
|
||||
|
||||
if (insert == 0) {
|
||||
result = "新增失败";
|
||||
throw new VehicleException(result);
|
||||
}
|
||||
|
||||
//获取新增的车辆id值
|
||||
//执行添加电子围栏
|
||||
int i = vehicleAndLogoService.vehicleBindLogo(vehicle.getVehicleId(), insertParams.getLogoIds());
|
||||
|
||||
|
||||
result = "新增成功!";
|
||||
|
||||
return result;
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
package com.couplet.vehicle.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.couplet.vehicle.domain.VehicleType;
|
||||
import com.couplet.vehicle.mapper.VehicleTypeMapper;
|
||||
import com.couplet.vehicle.service.VehicleTypeService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
* @Author: LiuYunHu
|
||||
* @CreateTime: 2024/3/31
|
||||
* @Description: 车辆类型服务实现类
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class VehicleTypeServiceImpl extends ServiceImpl<VehicleTypeMapper, VehicleType> implements VehicleTypeService {
|
||||
|
||||
|
||||
/*
|
||||
* @Author: LiuYunHu
|
||||
* @Date: 2024/3/31 10:17
|
||||
* @Description: 获取所有的车辆类型
|
||||
* @Param: []
|
||||
* @Return: java.util.List<com.couplet.vehicle.domain.VehicleType>
|
||||
**/
|
||||
@Override
|
||||
public List<VehicleType> list() {
|
||||
LambdaQueryWrapper<VehicleType> queryWrapper = new LambdaQueryWrapper<>();
|
||||
|
||||
return this.list(queryWrapper);
|
||||
}
|
||||
}
|
|
@ -1,2 +1,6 @@
|
|||
Spring Boot Version: ${spring-boot.version}
|
||||
Spring Application Name: ${spring.application.name}
|
||||
_ _ ____ _ _ ____ ___ __ ____
|
||||
( \/ )( ___)( )_( )(_ _) / __)( ) ( ___)
|
||||
\ / )__) ) _ ( _)(_ ( (__ )(__ )__)
|
||||
\/ (____)(_) (_)(____) \___)(____)(____)
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.couplet.vehicle.mapper.VehicleAndLogoMapper">
|
||||
|
||||
|
||||
<insert id="vehicleBindLogo">
|
||||
INSERT INTO `couplet_vehicle_and_logo` ( `vehicle_id`, `logo_id`)
|
||||
VALUES
|
||||
<foreach collection="logoIds" item="logoId" separator=",">
|
||||
(#{vehicleId},#{logoId})
|
||||
</foreach>
|
||||
</insert>
|
||||
</mapper>
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.couplet.vehicle.mapper.VehicleTypeMapper">
|
||||
|
||||
|
||||
</mapper>
|
Loading…
Reference in New Issue