From 075dbffcfcc20725f1bbff9450d6c720a4f20d69 Mon Sep 17 00:00:00 2001 From: shaowenhao <3121640096@qq.com> Date: Mon, 27 Nov 2023 14:28:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/domainConstants/HBaseConstant.java | 39 ++++++++ .../domainConstants/RabbitConstant.java | 38 ++++++++ .../common/domainConstants/TimeConstant.java | 13 +++ .../domainConstants/VehicleConstant.java | 88 +++++++++++++++++++ .../base/server/controller/CarController.java | 20 +++-- .../com/god/base/server/mapper/CarMapper.java | 32 ++++--- .../god/base/server/service/CarService.java | 3 +- .../server/service/impl/CarServiceImpl.java | 83 +++++++++-------- .../src/main/resources/mapper/CarMapper.xml | 5 ++ 9 files changed, 262 insertions(+), 59 deletions(-) create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domainConstants/HBaseConstant.java create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domainConstants/RabbitConstant.java create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domainConstants/TimeConstant.java create mode 100644 car-base-common/src/main/java/com/god/base/server/common/domainConstants/VehicleConstant.java diff --git a/car-base-common/src/main/java/com/god/base/server/common/domainConstants/HBaseConstant.java b/car-base-common/src/main/java/com/god/base/server/common/domainConstants/HBaseConstant.java new file mode 100644 index 0000000..c49f1cc --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domainConstants/HBaseConstant.java @@ -0,0 +1,39 @@ +package com.god.base.server.common.domainConstants; + + + +/** + * Hbase常量 + */ +public class HBaseConstant { + + /** + * + */ + public static final String HBASE_TABLE_NAME = "vehicle_info"; + /** + * 表名前缀 + */ + public static final String HBASE_TABLE_PREFIX = "vehicle_info_"; +} + + + + + + + + + + + + + + + + + + + + + diff --git a/car-base-common/src/main/java/com/god/base/server/common/domainConstants/RabbitConstant.java b/car-base-common/src/main/java/com/god/base/server/common/domainConstants/RabbitConstant.java new file mode 100644 index 0000000..8e263aa --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domainConstants/RabbitConstant.java @@ -0,0 +1,38 @@ +package com.god.base.server.common.domainConstants; + +/** + * RabbitMQ常量 + * @ClassName RabbitConstant + */ +public class RabbitConstant { + /** + * 故障处理队列 + */ + public static final String FAULT_HANDLER_QUEUE = "fault_handler_queue"; + /** + * 围栏处理队列 + */ + public static final String FENCE_HANDLER_QUEUE = "fence_handler_queue"; + +} + + + + + + + + + + + + + + + + + + + + + diff --git a/car-base-common/src/main/java/com/god/base/server/common/domainConstants/TimeConstant.java b/car-base-common/src/main/java/com/god/base/server/common/domainConstants/TimeConstant.java new file mode 100644 index 0000000..da6a2c7 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domainConstants/TimeConstant.java @@ -0,0 +1,13 @@ +package com.god.base.server.common.domainConstants; + + +/** + * TimeConstant + * 一天的时间戳 + */ +public class TimeConstant { + /** + * 一天的时间戳 + */ + public static final Integer DAY_MILLISECOND = 86400000; +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domainConstants/VehicleConstant.java b/car-base-common/src/main/java/com/god/base/server/common/domainConstants/VehicleConstant.java new file mode 100644 index 0000000..7d7dd9f --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domainConstants/VehicleConstant.java @@ -0,0 +1,88 @@ +package com.god.base.server.common.domainConstants; + +/** + * @ClassName VehicleConstant + * @Author WenHao.Sao + */ +public class VehicleConstant { + + /** + * 分包符 + */ + public static final String DATA_PACK_SEPARATOR = "#$&*"; + /** + * 报文起始位 + */ + public static final String MSG_START = "7E"; + /** + * 报文结束符 + */ + public static final String MSG_END= "7E"; + /** + * 连接信息vin + */ + public static final String START_VIN_SUF = "START_VIN"; + /** + * 连接信息VIN + */ + public static final String START_VIN_SUCCESS_SUF = "SUCCESS_CIN:"; + /** + * 车辆信息报文前缀 + */ + public static final String VEHICLE_MSG_SUF = "VEHICLE_MSG:"; + /** + * 车辆关闭报文前缀 + */ + public static final String VEHICLE_STOP_SUF = "VEHICLE_STOP:"; + /** + * 连接启动信息 + */ + public static final String NETTY_CONNECT = "CONNECT"; + /** + * + */ + public static final String NETTY_WILL_CLOSE = "CLOSE"; + +// public static final String +// +// public static final String +// +// public static final String +// +// public static final String +// +// public static final String +// +// public static final String +// +// public static final String + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/car-base-server/src/main/java/com/god/base/server/controller/CarController.java b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java index 5c26bc3..a3c8d24 100644 --- a/car-base-server/src/main/java/com/god/base/server/controller/CarController.java +++ b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java @@ -4,12 +4,12 @@ import com.alibaba.fastjson.JSONObject; import com.god.base.server.common.domain.Car; import com.god.base.server.common.domain.VehicleMessage; import com.god.base.server.common.domain.request.CarRequest; +import com.god.base.server.mapper.CarMapper; import com.god.base.server.service.CarService; import com.god.base.server.util.AopConfig; import com.god.common.core.domain.Result; import com.god.common.core.utils.poi.ExcelUtil; import com.god.common.core.web.controller.BaseController; -import com.god.common.core.web.page.TableDataInfo; import com.god.common.log.annotation.Log; import com.god.common.log.enums.BusinessType; import com.god.common.security.annotation.RequiresPermissions; @@ -39,18 +39,20 @@ public class CarController extends BaseController { @Autowired private AopConfig aopConfig; + @Autowired + private CarMapper carMapper; + /** - * 查询车辆信息管理列表 + * 根据vin查询车辆信息管理列表 */ @RequiresPermissions - @GetMapping("/list") - public Result> list(@RequestBody CarRequest carRequest){ + @GetMapping("/list/{vinId}") + public Result list(@PathVariable String vinId){ - startPage();//设置请求分页数据 - List list = carService.selectCarInfoList(carRequest); + Car list = carService.selectCarInfoList(vinId); - return getDataTable(list); + return Result.success(list); } /** @@ -93,7 +95,7 @@ public class CarController extends BaseController { */ @Log(title = "车辆信息管理" , businessType = BusinessType.UPDATE) //修改 @PostMapping("/updCar") - public Result updCar(@PathVariable @Validated Car car){ + public Result updCar(@PathVariable @Validated Car car){ log.info("功能介绍修改车辆,请求方式:{},请求路径:{},请求参数:{}", request.getMethod(), request.getRequestURL(), @@ -138,7 +140,7 @@ public class CarController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response , Car car , CarRequest carRequest) { - List list = carService.selectCarInfoList(carRequest); + List list = carMapper.getList((int) car.getUserId()); ExcelUtil util = new ExcelUtil<>(Car.class); //对list数据源将其里面的数据导入到excel表单 util.exportExcel(response,list,"车辆信息管理"); 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 b2c9675..dfbc43f 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 @@ -32,17 +32,25 @@ public interface CarMapper extends BaseMapper { "\tJOIN t_car_type ON t_car.car_type_id = t_car_type.id where t_car.user_id = #{userId1}") List getList(@Param("userId1") int userId); - @Select("select * from t_car where 1=1 " + - " and car_vin_id = #{carVinId}" + - " and car_type_id = #{carTypeId}" + - " and fence_id = #{fenceId}" + - " and status = #{status}" + - " and motor_manufacturer = #{motorManufacturer}" + - " and battery_manufacturer = #{batteryManufacturer}" + - " and motor_number = #{motorNumber}" + - " and battery_number = #{batteryNumber}" - ) - List selectCarInfoList(Car car); +// @Select("select * from t_car where 1=1 " + +// " and car_vin_id = #{carVinId}" + +// " and car_type_id = #{carTypeId}" + +// " and fence_id = #{fenceId}" + +// " and status = #{status}" + +// " and motor_manufacturer = #{motorManufacturer}" + +// " and battery_manufacturer = #{batteryManufacturer}" + +// " and motor_number = #{motorNumber}" + +// " and battery_number = #{batteryNumber}" +// ) +// List selectCarInfoList(Car car); + + /** + * 根据vin进行查询管理信息 + * @param vinId + * @return + */ + + Car HuiCarSelect(@Param("vinId") String vinId); /** * 车辆管理信息查询 @@ -56,4 +64,6 @@ public interface CarMapper extends BaseMapper { Integer getOnlineCarCount(); Integer getUnOnlineCount(); + + } diff --git a/car-base-server/src/main/java/com/god/base/server/service/CarService.java b/car-base-server/src/main/java/com/god/base/server/service/CarService.java index 31fca05..e488fa5 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/CarService.java +++ b/car-base-server/src/main/java/com/god/base/server/service/CarService.java @@ -3,7 +3,6 @@ package com.god.base.server.service; import com.baomidou.mybatisplus.extension.service.IService; import com.god.base.server.common.domain.Car; import com.god.base.server.common.domain.VehicleMessage; -import com.god.base.server.common.domain.request.CarRequest; import com.god.common.core.domain.Result; import org.apache.ibatis.annotations.Param; @@ -18,7 +17,7 @@ public interface CarService extends IService { Result> carList(@Param("userId") String userId); - List selectCarInfoList(CarRequest carRequest); + Car selectCarInfoList(@Param("vinId") String vinId); Result> onlineVehicle(); diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java index 9004cd6..f5b10be 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java @@ -1,16 +1,13 @@ package com.god.base.server.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.god.base.server.common.domain.Car; import com.god.base.server.common.domain.VehicleMessage; -import com.god.base.server.common.domain.request.CarRequest; import com.god.base.server.common.domainConstants.RedisConstant; import com.god.base.server.mapper.CarMapper; import com.god.base.server.service.CarService; import com.god.common.core.domain.Result; import lombok.extern.log4j.Log4j2; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -51,47 +48,59 @@ public class CarServiceImpl extends ServiceImpl implements CarSe } +// /** +// * 查询车辆信息管理列表 +// * +// * @param carRequest 车辆信息管理 +// * @return +// */ +// @Override +// public List selectCarInfoList(CarRequest carRequest) { +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// //判断vin是否为空 +// if (StringUtils.isNotEmpty(carRequest.getCarVinId())){ +// //模糊查询 vin +// lambdaQueryWrapper.like(Car::getCarVinId, carRequest.getCarVinId()); +// } +// //模糊查询 车辆类型 +// lambdaQueryWrapper.like(Car::getCarTypeId, carRequest.getCarTypeId()); +// //模糊查询 电子围栏 +// lambdaQueryWrapper.like(Car::getFenceId, carRequest.getFenceId()); +// //模糊查询 车辆状态 +// lambdaQueryWrapper.like(Car::getStatus, carRequest.getStatus()); +// if (StringUtils.isNotEmpty(carRequest.getBatteryManufacturer())){ +// //模糊查询 电池厂商 +// lambdaQueryWrapper.like(Car::getBatteryManufacturer, carRequest.getBatteryManufacturer()); +// } +// if (StringUtils.isNotEmpty(carRequest.getMotorManufacturer())){ +// //模糊查询 电机厂商 +// lambdaQueryWrapper.like(Car::getMotorManufacturer, carRequest.getMotorManufacturer()); +// } +// if (StringUtils.isNotEmpty(carRequest.getMotorNumber())){ +// //模糊查询 电机编号 +// lambdaQueryWrapper.like(Car::getMotorNumber, carRequest.getMotorNumber()); +// } +// if (StringUtils.isNotEmpty(carRequest.getBatteryNumber())){ +// //模糊查询 电池编号 +// lambdaQueryWrapper.like(Car::getBatteryNumber, carRequest.getBatteryNumber()); +// } +// +// return carMapper.selectVehicleInfoList(carRequest); +// } + + /** - * 查询车辆信息管理列表 - * - * @param carRequest 车辆信息管理 + * 查询车辆信息管理列表信息 + * @param vinId * @return */ @Override - public List selectCarInfoList(CarRequest carRequest) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - //判断vin是否为空 - if (StringUtils.isNotEmpty(carRequest.getCarVinId())){ - //模糊查询 vin - lambdaQueryWrapper.like(Car::getCarVinId, carRequest.getCarVinId()); - } - //模糊查询 车辆类型 - lambdaQueryWrapper.like(Car::getCarTypeId, carRequest.getCarTypeId()); - //模糊查询 电子围栏 - lambdaQueryWrapper.like(Car::getFenceId, carRequest.getFenceId()); - //模糊查询 车辆状态 - lambdaQueryWrapper.like(Car::getStatus, carRequest.getStatus()); - if (StringUtils.isNotEmpty(carRequest.getBatteryManufacturer())){ - //模糊查询 电池厂商 - lambdaQueryWrapper.like(Car::getBatteryManufacturer, carRequest.getBatteryManufacturer()); - } - if (StringUtils.isNotEmpty(carRequest.getMotorManufacturer())){ - //模糊查询 电机厂商 - lambdaQueryWrapper.like(Car::getMotorManufacturer, carRequest.getMotorManufacturer()); - } - if (StringUtils.isNotEmpty(carRequest.getMotorNumber())){ - //模糊查询 电机编号 - lambdaQueryWrapper.like(Car::getMotorNumber, carRequest.getMotorNumber()); - } - if (StringUtils.isNotEmpty(carRequest.getBatteryNumber())){ - //模糊查询 电池编号 - lambdaQueryWrapper.like(Car::getBatteryNumber, carRequest.getBatteryNumber()); - } - - return carMapper.selectVehicleInfoList(carRequest); + public Car selectCarInfoList(String vinId) { + return carMapper.HuiCarSelect(vinId); } + /** * 根据VIN 编辑管理修改车辆信息数据 * @param entity diff --git a/car-base-server/src/main/resources/mapper/CarMapper.xml b/car-base-server/src/main/resources/mapper/CarMapper.xml index 42de0c8..03890c6 100644 --- a/car-base-server/src/main/resources/mapper/CarMapper.xml +++ b/car-base-server/src/main/resources/mapper/CarMapper.xml @@ -55,4 +55,9 @@ select count(*) from t_car + +