diff --git a/car-base-common/src/main/java/com/god/base/domain/Car.java b/car-base-common/src/main/java/com/god/base/domain/Car.java index 3ed6ec8..982eacb 100644 --- a/car-base-common/src/main/java/com/god/base/domain/Car.java +++ b/car-base-common/src/main/java/com/god/base/domain/Car.java @@ -1,156 +1,156 @@ -//package com.god.base.domain; -// -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.baomidou.mybatisplus.annotation.TableName; -//import com.fasterxml.jackson.annotation.JsonFormat; -//import com.god.base.domain.request.CarRequest; -//import com.god.common.core.annotation.Excel; -//import lombok.AllArgsConstructor; -//import lombok.Builder; -//import lombok.Data; -//import lombok.NoArgsConstructor; -// -//import java.util.Date; -// -///** -// * 车辆信息管理对象 -// */ -//@Data -//@AllArgsConstructor -//@NoArgsConstructor -//@Builder -//@TableName(value = "t_car") -//public class Car { -// -// private static final long serialVersionUID = 1L; -// -// /** -// * 车辆Vin 主键 -// */ -// @Excel(name = "车辆carVibId") -// @TableId -// private String carVinId; -// /** -// * 单位id -// */ -// private long userId; -// /** -// * 车辆类型id -// */ -// @Excel(name = "车辆类型ID") -// private long carTypeId; -// /** -// * 电池箱信息id -// */ -// private long batteryBoxId; -// /** -// * 电池组id -// */ -// private long cellId; -// /** -// * 单体电池id -// */ -// private long batteryCellId; -// /** -// * 电池组模块id -// */ -// private long batteryPackInformationId; -// /** -// * 电子围栏ID -// */ -// @Excel(name = "电子围栏ID") -// private long fenceId; -// /** -// * 车牌号 -// */ -// private String carNumber; -// /** -// * 驱动机主键 -// */ -// private long driveMotorId; -// /** -// * 车辆总里程 -// */ -// private String carMileage; -// /** -// * 创建者 -// */ -// private String createBy; -// /** -// * 创建时间 -// */ -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") -// @Excel(name = "开始时间" , width = 30, dateFormat = "yyyy-MM-dd") -// private Date createTime; -// /** -// * 更新者 -// */ -// private String updateBy; -// /** -// * 更新时间 -// */ -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") -// @Excel(name = "结束时间" , width = 30, dateFormat = "yyyy-MM-dd") -// private Date updateTime; -// /** -// * 区域 -// */ -// private String address; -// /** -// * 电池厂商 -// */ -// @Excel(name = "电池厂商") -// private String batteryManufacturer; -// /** -// * 电机厂商 -// */ -// @Excel(name = "电机厂商") -// private String motorManufacturer; -// /** -// * 电机编号 -// */ -// @Excel(name = "电机编号") -// private String motorNumber; -// /** -// * 电池编号 -// */ -// @Excel(name = "电池编号") -// private String batteryNumber; -// /** -// * 逻辑删除 -// */ -// private int isDelete; -// /** -// * 车辆状态 -// */ -// @Excel(name = "车辆状态") -// private int status; -// -// /** -// * 电子围栏名称 -// */ -// private String fenceName; -// /** -// * 车辆类型名称 -// */ -// private String carTypeName; -// -// /** -// * 车辆绑定的主题 -// */ -// private String topic; -// -// public static Car carBuildAdd(CarRequest carRequest){ -// return Car.builder() -// .carVinId(carRequest.getCarVinId()) -// .carTypeId(carRequest.getCarTypeId()) -// .fenceId(carRequest.getFenceId()) -// .status(carRequest.getStatus()) -// .batteryManufacturer(carRequest.getBatteryManufacturer()) -// .motorManufacturer(carRequest.getMotorManufacturer()) -// .motorNumber(carRequest.getMotorNumber()) -// .batteryNumber(carRequest.getBatteryNumber()) -// .build(); -// } -// -//} +package com.god.base.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.god.base.domain.request.CarRequest; +import com.god.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 车辆信息管理对象 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@TableName(value = "t_car") +public class Car { + + private static final long serialVersionUID = 1L; + + /** + * 车辆Vin 主键 + */ + @Excel(name = "车辆carVibId") + @TableId + private String carVinId; + /** + * 单位id + */ + private long userId; + /** + * 车辆类型id + */ + @Excel(name = "车辆类型ID") + private long carTypeId; + /** + * 电池箱信息id + */ + private long batteryBoxId; + /** + * 电池组id + */ + private long cellId; + /** + * 单体电池id + */ + private long batteryCellId; + /** + * 电池组模块id + */ + private long batteryPackInformationId; + /** + * 电子围栏ID + */ + @Excel(name = "电子围栏ID") + private long fenceId; + /** + * 车牌号 + */ + private String carNumber; + /** + * 驱动机主键 + */ + private long driveMotorId; + /** + * 车辆总里程 + */ + private String carMileage; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始时间" , width = 30, dateFormat = "yyyy-MM-dd") + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "结束时间" , width = 30, dateFormat = "yyyy-MM-dd") + private Date updateTime; + /** + * 区域 + */ + private String address; + /** + * 电池厂商 + */ + @Excel(name = "电池厂商") + private String batteryManufacturer; + /** + * 电机厂商 + */ + @Excel(name = "电机厂商") + private String motorManufacturer; + /** + * 电机编号 + */ + @Excel(name = "电机编号") + private String motorNumber; + /** + * 电池编号 + */ + @Excel(name = "电池编号") + private String batteryNumber; + /** + * 逻辑删除 + */ + private int isDelete; + /** + * 车辆状态 + */ + @Excel(name = "车辆状态") + private int status; + + /** + * 电子围栏名称 + */ + private String fenceName; + /** + * 车辆类型名称 + */ + private String carTypeName; + + /** + * 车辆绑定的主题 + */ + private String topic; + + public static Car carBuildAdd(CarRequest carRequest){ + return Car.builder() + .carVinId(carRequest.getCarVinId()) + .carTypeId(carRequest.getCarTypeId()) + .fenceId(carRequest.getFenceId()) + .status(carRequest.getStatus()) + .batteryManufacturer(carRequest.getBatteryManufacturer()) + .motorManufacturer(carRequest.getMotorManufacturer()) + .motorNumber(carRequest.getMotorNumber()) + .batteryNumber(carRequest.getBatteryNumber()) + .build(); + } + +} diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java index 9c69c2d..cdf11e7 100644 --- a/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java +++ b/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java @@ -1,51 +1,51 @@ -//package com.god.base.server.mapper; -// -//import com.baomidou.dynamic.datasource.annotation.DS; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -//import com.god.base.domain.Car; -//import com.god.base.domain.CarType; -//import com.god.base.domain.Fence; -//import com.god.base.domain.request.CarRequest; -//import org.apache.ibatis.annotations.Mapper; -//import org.apache.ibatis.annotations.Param; -//import org.apache.ibatis.annotations.Select; -// -//import java.util.List; -// -// -///** -// * 车辆mapper -// */ -//@Mapper -//public interface CarMapper extends BaseMapper { -// -// -// List getList(@Param("userId") String userId); -// -// -// /** -// * 根据vin进行查询管理信息 -// * @param vinId -// * @return -// */ -// -// Car HuiCarSelect(@Param("vinId") String vinId); -// -// /** -// * 车辆管理信息查询 -// * @param carRequest -// * @return -// */ -// List selectVehicleInfoList(CarRequest carRequest); -// -// List getOnlineCarIds(); -// -// Integer getOnlineCarCount(); -// -// Integer getUnOnlineCount(); -// -// -// List fenceId(); -// -// List carTypeId(); -//} +package com.god.base.server.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.god.base.domain.Car; +import com.god.base.domain.CarType; +import com.god.base.domain.Fence; +import com.god.base.domain.request.CarRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + + +/** + * 车辆mapper + */ +@Mapper +public interface CarMapper extends BaseMapper { + + + List getList(@Param("userId") String userId); + + + /** + * 根据vin进行查询管理信息 + * @param vinId + * @return + */ + + Car HuiCarSelect(@Param("vinId") String vinId); + + /** + * 车辆管理信息查询 + * @param carRequest + * @return + */ + List selectVehicleInfoList(CarRequest carRequest); + + List getOnlineCarIds(); + + Integer getOnlineCarCount(); + + Integer getUnOnlineCount(); + + + List fenceId(); + + List carTypeId(); +} 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 index ed61ec0..68d1ff3 100644 --- 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 @@ -2,6 +2,7 @@ package com.god.base.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.god.base.domain.FirmCar; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,6 +13,7 @@ import java.util.List; * @author LouZhiSHuo * @Date 2023/12/6 19:29 **/ +@Mapper public interface FirmCarMapper extends BaseMapper { } diff --git a/car-base-server/src/main/java/com/god/base/server/utils/CarFenceMonitor.java b/car-base-server/src/main/java/com/god/base/server/utils/CarFenceMonitor.java index 96099e3..8744dd2 100644 --- a/car-base-server/src/main/java/com/god/base/server/utils/CarFenceMonitor.java +++ b/car-base-server/src/main/java/com/god/base/server/utils/CarFenceMonitor.java @@ -45,12 +45,16 @@ public class CarFenceMonitor { log.info("开始获取车辆围栏信息"); //获取车辆信息 - List dataCar = firmCarService.findFirmCarByUserId(new FirmCarRequest()); + String userId = String.valueOf(SecurityUtils.getUserId()); + FirmCarRequest firmCarRequest = new FirmCarRequest(); + firmCarRequest.setUserId(userId); + List dataCar = firmCarService.findFirmCarByUserId(firmCarRequest); if (dataCar.size() <= 0) { - throw new RuntimeException("查无管理车辆"); + throw new RuntimeException("该用户未绑定车辆"); } + //新建map集合存储车辆围栏 Map> map = new HashMap<>(); for (FirmCar car : dataCar) { diff --git a/car-base-server/src/main/resources/mapper/CarMapper.xml b/car-base-server/src/main/resources/mapper/CarMapper.xml index 5fd9d43..0967e7e 100644 --- a/car-base-server/src/main/resources/mapper/CarMapper.xml +++ b/car-base-server/src/main/resources/mapper/CarMapper.xml @@ -1,90 +1,90 @@ - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + - + + + + select car_vin_id, car_type_id, fence_id, battery_manufacturer, motor_manufacturer, motor_numberr, battery_number,status from t_car + + + + + + + + + + + + + + + + +