From ebe49db7740ad2cd03baa8d37c907de3c24d3590 Mon Sep 17 00:00:00 2001 From: ZhiShuo_Lou <13209945+zhishuo-lou@user.noreply.gitee.com> Date: Wed, 6 Dec 2023 20:52:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/god/base/domain/Car.java | 312 +++++++-------- .../java/com/god/base/domain/FirmCar.java | 56 ++- .../base/domain/request/FirmCarInsertReq.java | 107 ++++++ .../com/god/base/remote/RemoteCarService.java | 7 +- .../god/base/remote/RemoteFenceService.java | 23 -- .../factory/RemoteCarFallbackFactory.java | 7 +- .../factory/RemoteFenceFallbackFactory.java | 31 -- .../com/god/base/server/config/EventInit.java | 2 +- .../base/server/controller/CarController.java | 358 +++++++++--------- .../server/controller/FenceController.java | 1 - .../server/controller/FirmCarController.java | 7 +- .../com/god/base/server/mapper/CarMapper.java | 113 +++--- .../base/server/mapper/RequestLogMapper.java | 0 .../base/server/mapper/TopicCarMapper.java | 1 - .../god/base/server/service/CarService.java | 102 ++--- .../server/service/RequestLogService.java | 18 - .../server/service/impl/CarServiceImpl.java | 356 ++++++++--------- .../service/impl/RequestLogServiceImpl.java | 0 .../service/impl/TopLineServiceImpl.java | 2 +- .../base/server/service/impl/asyncSave.java | 0 .../base/server/utils/CarFenceMonitor.java | 16 +- .../src/main/resources/mapper/CarMapper.xml | 168 ++++---- 22 files changed, 886 insertions(+), 801 deletions(-) create mode 100644 car-base-common/src/main/java/com/god/base/domain/request/FirmCarInsertReq.java delete mode 100644 car-base-remote/src/main/java/com/god/base/remote/RemoteFenceService.java delete mode 100644 car-base-remote/src/main/java/com/god/base/remote/factory/RemoteFenceFallbackFactory.java delete mode 100644 car-base-server/src/main/java/com/god/base/server/mapper/RequestLogMapper.java delete mode 100644 car-base-server/src/main/java/com/god/base/server/service/RequestLogService.java delete mode 100644 car-base-server/src/main/java/com/god/base/server/service/impl/RequestLogServiceImpl.java delete mode 100644 car-base-server/src/main/java/com/god/base/server/service/impl/asyncSave.java 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 982eacb..3ed6ec8 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-common/src/main/java/com/god/base/domain/FirmCar.java b/car-base-common/src/main/java/com/god/base/domain/FirmCar.java index 5730917..b289d8e 100644 --- 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 @@ -1,12 +1,18 @@ package com.god.base.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.god.base.domain.request.FirmCarInsertReq; +import com.god.base.domain.request.FirmCarRequest; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.util.Date; /** * 车辆对象 @@ -18,6 +24,7 @@ import javax.validation.constraints.NotNull; @Builder @AllArgsConstructor @NoArgsConstructor +@TableName(value = "t_car") public class FirmCar { @@ -90,7 +97,7 @@ public class FirmCar { * 1-删除 * 0-未删除 默认 */ - private Integer is_delete; + private Integer isDelete; /** * 车辆状态 * 1-上线 @@ -103,7 +110,54 @@ public class FirmCar { private String topic; + /** + * 创建人 + */ + private String createBy; + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss") + @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") + private Date createTime; + + /** + * 修改人 + */ + private String updateBy; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss") + @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") + private Date updateTime; + + + + public static FirmCar FirmInsertCar(FirmCarInsertReq firmCarInsertReq) { + return FirmCar.builder() + .carVinId(firmCarInsertReq.getCarVinId()) + .userId(firmCarInsertReq.getUserId()) + .carTypeId(firmCarInsertReq.getCarTypeId()) + .batteryBoxId(firmCarInsertReq.getBatteryBoxId()) + .cellId(firmCarInsertReq.getCellId()) + .batteryCellId(firmCarInsertReq.getBatteryCellId()) + .batteryPackInformationId(firmCarInsertReq.getBatteryPackInformationId()) + .carNumber(firmCarInsertReq.getCarNumber()) + .driveMotorId(firmCarInsertReq.getDriveMotorId()) + .carMileage(firmCarInsertReq.getCarMileage()) + .address(firmCarInsertReq.getAddress()) + .batteryManufacturer(firmCarInsertReq.getBatteryManufacturer()) + .motorManufacturer(firmCarInsertReq.getMotorManufacturer()) + .motorNumber(firmCarInsertReq.getMotorNumber()) + .batteryNumber(firmCarInsertReq.getBatteryNumber()) + .topic(firmCarInsertReq.getTopic()) + .createBy(firmCarInsertReq.getCreateBy()) + .createTime(firmCarInsertReq.getCreateTime()) + .build(); + } } diff --git a/car-base-common/src/main/java/com/god/base/domain/request/FirmCarInsertReq.java b/car-base-common/src/main/java/com/god/base/domain/request/FirmCarInsertReq.java new file mode 100644 index 0000000..4d19384 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/domain/request/FirmCarInsertReq.java @@ -0,0 +1,107 @@ +package com.god.base.domain.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; +import java.util.Date; + +/** + * 车辆管理新增参数 + * + * @author LouZhiSHuo + * @Date 2023/12/6 20:36 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class FirmCarInsertReq { + + /** + * 车辆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; + + /** + * 需要发送的主题 + */ + private String topic; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss") + @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") + private Date createTime; +} diff --git a/car-base-remote/src/main/java/com/god/base/remote/RemoteCarService.java b/car-base-remote/src/main/java/com/god/base/remote/RemoteCarService.java index b52df02..00de193 100644 --- a/car-base-remote/src/main/java/com/god/base/remote/RemoteCarService.java +++ b/car-base-remote/src/main/java/com/god/base/remote/RemoteCarService.java @@ -1,8 +1,9 @@ package com.god.base.remote; import com.god.base.domain.Fence; + +import com.god.base.domain.FirmCar; import com.god.base.remote.factory.RemoteCarFallbackFactory; -import com.god.base.domain.Car; import com.god.common.core.domain.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -17,8 +18,8 @@ import org.springframework.web.bind.annotation.*; public interface RemoteCarService { - @GetMapping("/car/list") - public Result list(@RequestParam("carVinId") String carVinId); + @GetMapping("/FirmCar/findFirmCarByUserId") + public Result list(@RequestParam("carVinId") String carVinId); @PostMapping("/baseFence/fenceById") public Result fenceById(@RequestParam("fenceId") Integer fenceId); diff --git a/car-base-remote/src/main/java/com/god/base/remote/RemoteFenceService.java b/car-base-remote/src/main/java/com/god/base/remote/RemoteFenceService.java deleted file mode 100644 index 3a2a5b4..0000000 --- a/car-base-remote/src/main/java/com/god/base/remote/RemoteFenceService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.god.base.remote; - -import com.god.base.domain.Fence; -import com.god.base.remote.factory.RemoteFenceFallbackFactory; -import com.god.common.core.constant.SecurityConstants; -import com.god.common.core.domain.Result; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * 围栏服务 - * - * @author LouZhiSHuo - * @Date 2023/11/27 19:39 - **/ -@FeignClient(contextId = "remoteFenceService", value = "god-car-base", fallbackFactory = RemoteFenceFallbackFactory.class) -public interface RemoteFenceService { - - @PostMapping("/baseFence/fenceById") - public Result fenceById(@RequestParam("fenceId") Integer fenceId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); -} diff --git a/car-base-remote/src/main/java/com/god/base/remote/factory/RemoteCarFallbackFactory.java b/car-base-remote/src/main/java/com/god/base/remote/factory/RemoteCarFallbackFactory.java index 79bac35..0aabb7e 100644 --- a/car-base-remote/src/main/java/com/god/base/remote/factory/RemoteCarFallbackFactory.java +++ b/car-base-remote/src/main/java/com/god/base/remote/factory/RemoteCarFallbackFactory.java @@ -1,8 +1,9 @@ package com.god.base.remote.factory; import com.god.base.domain.Fence; +import com.god.base.domain.FirmCar; import com.god.base.remote.RemoteCarService; -import com.god.base.domain.Car; + import com.god.common.core.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,8 +26,10 @@ public class RemoteCarFallbackFactory implements FallbackFactory list(String carVinId) { + public Result list(String carVinId) { return Result.error("保存操作日志失败:" + cause.getMessage()); } diff --git a/car-base-remote/src/main/java/com/god/base/remote/factory/RemoteFenceFallbackFactory.java b/car-base-remote/src/main/java/com/god/base/remote/factory/RemoteFenceFallbackFactory.java deleted file mode 100644 index db4f486..0000000 --- a/car-base-remote/src/main/java/com/god/base/remote/factory/RemoteFenceFallbackFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.god.base.remote.factory; - -import com.god.base.domain.Fence; -import com.god.base.remote.RemoteFenceService; -import com.god.common.core.domain.Result; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cloud.openfeign.FallbackFactory; - -/** - * 围栏服务 - * - * @author LouZhiSHuo - * @Date 2023/11/27 19:40 - **/ -public class RemoteFenceFallbackFactory implements FallbackFactory { - - private static final Logger log = LoggerFactory.getLogger(RemoteFenceFallbackFactory.class); - @Override - public RemoteFenceService create(Throwable cause) { - - log.error("远程调用围栏服务失败:{}",cause.getMessage()); - return new RemoteFenceService() { - - @Override - public Result fenceById(Integer fenceId, String source) { - return Result.error("保存操作日志失败:" + cause.getMessage()); - } - }; - } -} diff --git a/car-base-server/src/main/java/com/god/base/server/config/EventInit.java b/car-base-server/src/main/java/com/god/base/server/config/EventInit.java index b53530f..3cd9c09 100644 --- a/car-base-server/src/main/java/com/god/base/server/config/EventInit.java +++ b/car-base-server/src/main/java/com/god/base/server/config/EventInit.java @@ -1,7 +1,7 @@ package com.god.base.server.config; import com.god.base.common.constant.EventConstant; -import com.god.base.domain.Car; + import com.god.base.domain.request.QueryCarRequest; import com.god.base.server.service.impl.TopLineServiceImpl; import com.god.common.redis.service.RedisService; 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 6689047..60305dd 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 @@ -1,179 +1,179 @@ -package com.god.base.server.controller; - -import com.alibaba.fastjson.JSONObject; -import com.god.base.domain.Car; -import com.god.base.domain.CarType; -import com.god.base.domain.Fence; -import com.god.base.domain.VehicleMessage; -import com.god.base.domain.request.CarRequest; -import com.god.base.server.mapper.CarMapper; -import com.god.base.server.service.CarService; -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.log.annotation.Log; -import com.god.common.log.enums.BusinessType; -import com.god.common.security.annotation.RequiresPermissions; -import lombok.extern.log4j.Log4j2; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 车辆管理 - */ -@RestController -@RequestMapping("/car") -@Log4j2 -public class CarController extends BaseController { - - @Autowired - private HttpServletRequest request; // 用于获取方法执行信息 - - @Autowired - private CarService carService; - - @Autowired - private CarMapper carMapper; - - - /** - * 根据vin查询车辆信息管理列表 - */ - @GetMapping("/list") - public Result list(@RequestParam("carVinId") String carVinId){ - - Car list = carService.selectCarInfoList(carVinId); - - return Result.success(list); - } - - /** - * 车辆信息查看 - */ - @GetMapping("/carList/{userId}") - public Result carList(@PathVariable String userId){ - - log.info("功能介绍车辆信息列表查看,请求方式:{},请求路径:{},请求参数:{}", - request.getMethod(), - request.getRequestURL(), - JSONObject.toJSONString(userId)); - - startPage();//设置请求分页数据 继承方法 - Result> carList = carService.carList(userId); - - log.info("功能介绍车辆信息列表查看,响应方式:{},响应路径:{},响应参数:{}", - request.getMethod(), - request.getRequestURL(), - JSONObject.toJSONString(carList)); - - return carList; - } - - - /** - * 添加车辆管理信息 - */ - @Log(title = "添加车辆管理信息" , businessType = BusinessType.INSERT) // 添加 - @PostMapping("/addCar") - public Result addCarP(@RequestBody @Validated CarRequest carRequest){ - - carService.save(Car.carBuildAdd(carRequest)); - - return Result.success(); - } - - /** - * 修改车辆信息 - */ - @Log(title = "修改车辆信息" , businessType = BusinessType.UPDATE) //修改 - @PostMapping("/updCar") - public Result updCar(@PathVariable @Validated Car car){ - log.info("功能介绍修改车辆,请求方式:{},请求路径:{},请求参数:{}", - request.getMethod(), - request.getRequestURL(), - JSONObject.toJSONString(car)); - - carService.updateById(car); - - log.info("功能介绍修改车辆,响应方式:{},响应路径:{},响应参数:{}", - request.getMethod(), - request.getRequestURL(), - JSONObject.toJSONString(car)); - - return Result.success(); - } - - /** - * 逻辑删除车辆信息管理 - */ - @Log(title = "逻辑删除车辆信息管理" , businessType = BusinessType.DELETE) // 删除 - @GetMapping("/delCar/{vinId}") - public Result delCar(@PathVariable String vinId){ - log.info("功能介绍逻辑删除车辆信息,请求方式:{},请求路径:{},请求参数:{}", - request.getMethod(), - request.getRequestURL(), - JSONObject.toJSONString(vinId)); - - boolean b = carService.removeById(vinId); - - log.info("功能介绍逻辑删除车辆信息,响应方式:{},响应路径:{},响应参数:{}", - request.getMethod(), - request.getRequestURL(), - JSONObject.toJSONString(b)); - - return Result.success(); - } - - /** - * 导出车辆信息管理列表 - */ - @Log(title = "导出车辆信息管理列表" , businessType = BusinessType.EXPORT) // 导出 跳转业务操作类型表中 - @PostMapping("/export") - public void export(HttpServletResponse response , Car car , CarRequest carRequest) - { - List list = carMapper.getList(String.valueOf(car.getUserId())); - ExcelUtil util = new ExcelUtil<>(Car.class); - //对list数据源将其里面的数据导入到excel表单 - util.exportExcel(response,list,"车辆信息管理"); - } - - - /** - * 获取所有在线车辆 - */ - @GetMapping("/onlineVehicle") - public Result> onlineVehicle(){ - return carService.onlineVehicle(); - } - - /** - * 统计车辆 - */ - @GetMapping("/countData") - public Result countData(){ - return carService.countData(); - } - - /** - * 查看电子围栏id 获取下拉框 - */ - @GetMapping("/fenceId") - public Result> fenceId(){ - List fenceId = carService.fenceId(); - return Result.success(fenceId); - } - /** - * 查看车辆类型id 获取下拉框 - */ - @GetMapping("/carType") - public Result> carTypeId(){ - List carTypeId = carService.carTypeId(); - return Result.success(carTypeId); - } - -} +//package com.god.base.server.controller; +// +//import com.alibaba.fastjson.JSONObject; +//import com.god.base.domain.Car; +//import com.god.base.domain.CarType; +//import com.god.base.domain.Fence; +//import com.god.base.domain.VehicleMessage; +//import com.god.base.domain.request.CarRequest; +//import com.god.base.server.mapper.CarMapper; +//import com.god.base.server.service.CarService; +//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.log.annotation.Log; +//import com.god.common.log.enums.BusinessType; +//import com.god.common.security.annotation.RequiresPermissions; +//import lombok.extern.log4j.Log4j2; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.*; +// +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpServletResponse; +//import java.util.List; +// +///** +// * 车辆管理 +// */ +//@RestController +//@RequestMapping("/car") +//@Log4j2 +//public class CarController extends BaseController { +// +// @Autowired +// private HttpServletRequest request; // 用于获取方法执行信息 +// +// @Autowired +// private CarService carService; +// +// @Autowired +// private CarMapper carMapper; +// +// +// /** +// * 根据vin查询车辆信息管理列表 +// */ +// @GetMapping("/list") +// public Result list(@RequestParam("carVinId") String carVinId){ +// +// Car list = carService.selectCarInfoList(carVinId); +// +// return Result.success(list); +// } +// +// /** +// * 车辆信息查看 +// */ +// @GetMapping("/carList/{userId}") +// public Result carList(@PathVariable String userId){ +// +// log.info("功能介绍车辆信息列表查看,请求方式:{},请求路径:{},请求参数:{}", +// request.getMethod(), +// request.getRequestURL(), +// JSONObject.toJSONString(userId)); +// +// startPage();//设置请求分页数据 继承方法 +// Result> carList = carService.carList(userId); +// +// log.info("功能介绍车辆信息列表查看,响应方式:{},响应路径:{},响应参数:{}", +// request.getMethod(), +// request.getRequestURL(), +// JSONObject.toJSONString(carList)); +// +// return carList; +// } +// +// +// /** +// * 添加车辆管理信息 +// */ +// @Log(title = "添加车辆管理信息" , businessType = BusinessType.INSERT) // 添加 +// @PostMapping("/addCar") +// public Result addCarP(@RequestBody @Validated CarRequest carRequest){ +// +// carService.save(Car.carBuildAdd(carRequest)); +// +// return Result.success(); +// } +// +// /** +// * 修改车辆信息 +// */ +// @Log(title = "修改车辆信息" , businessType = BusinessType.UPDATE) //修改 +// @PostMapping("/updCar") +// public Result updCar(@PathVariable @Validated Car car){ +// log.info("功能介绍修改车辆,请求方式:{},请求路径:{},请求参数:{}", +// request.getMethod(), +// request.getRequestURL(), +// JSONObject.toJSONString(car)); +// +// carService.updateById(car); +// +// log.info("功能介绍修改车辆,响应方式:{},响应路径:{},响应参数:{}", +// request.getMethod(), +// request.getRequestURL(), +// JSONObject.toJSONString(car)); +// +// return Result.success(); +// } +// +// /** +// * 逻辑删除车辆信息管理 +// */ +// @Log(title = "逻辑删除车辆信息管理" , businessType = BusinessType.DELETE) // 删除 +// @GetMapping("/delCar/{vinId}") +// public Result delCar(@PathVariable String vinId){ +// log.info("功能介绍逻辑删除车辆信息,请求方式:{},请求路径:{},请求参数:{}", +// request.getMethod(), +// request.getRequestURL(), +// JSONObject.toJSONString(vinId)); +// +// boolean b = carService.removeById(vinId); +// +// log.info("功能介绍逻辑删除车辆信息,响应方式:{},响应路径:{},响应参数:{}", +// request.getMethod(), +// request.getRequestURL(), +// JSONObject.toJSONString(b)); +// +// return Result.success(); +// } +// +// /** +// * 导出车辆信息管理列表 +// */ +// @Log(title = "导出车辆信息管理列表" , businessType = BusinessType.EXPORT) // 导出 跳转业务操作类型表中 +// @PostMapping("/export") +// public void export(HttpServletResponse response , Car car , CarRequest carRequest) +// { +// List list = carMapper.getList(String.valueOf(car.getUserId())); +// ExcelUtil util = new ExcelUtil<>(Car.class); +// //对list数据源将其里面的数据导入到excel表单 +// util.exportExcel(response,list,"车辆信息管理"); +// } +// +// +// /** +// * 获取所有在线车辆 +// */ +// @GetMapping("/onlineVehicle") +// public Result> onlineVehicle(){ +// return carService.onlineVehicle(); +// } +// +// /** +// * 统计车辆 +// */ +// @GetMapping("/countData") +// public Result countData(){ +// return carService.countData(); +// } +// +// /** +// * 查看电子围栏id 获取下拉框 +// */ +// @GetMapping("/fenceId") +// public Result> fenceId(){ +// List fenceId = carService.fenceId(); +// return Result.success(fenceId); +// } +// /** +// * 查看车辆类型id 获取下拉框 +// */ +// @GetMapping("/carType") +// public Result> carTypeId(){ +// List carTypeId = carService.carTypeId(); +// return Result.success(carTypeId); +// } +// +//} diff --git a/car-base-server/src/main/java/com/god/base/server/controller/FenceController.java b/car-base-server/src/main/java/com/god/base/server/controller/FenceController.java index 7d3faa7..ff81497 100644 --- a/car-base-server/src/main/java/com/god/base/server/controller/FenceController.java +++ b/car-base-server/src/main/java/com/god/base/server/controller/FenceController.java @@ -9,7 +9,6 @@ package com.god.base.server.controller; **/ import com.god.base.common.constant.EventConstant; -import com.god.base.domain.Car; import com.god.base.domain.Fence; import com.god.base.domain.request.FenceAddRequest; import com.god.base.domain.request.FenceQueryRequest; 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 index 91863a8..d1b736f 100644 --- 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 @@ -1,6 +1,7 @@ package com.god.base.server.controller; import com.god.base.domain.FirmCar; +import com.god.base.domain.request.FirmCarInsertReq; import com.god.base.domain.request.FirmCarRequest; import com.god.base.server.service.FirmCarService; import com.god.common.core.domain.Result; @@ -30,14 +31,14 @@ public class FirmCarController { /** * 添加企业车辆 - * @param firmCar + * @param firmCarInsertReq * @return */ @PostMapping("/inertFirmCar") @Log(title = "添加车辆") - public Result inertFirmCar(@RequestBody FirmCar firmCar) { + public Result inertFirmCar(@RequestBody FirmCarInsertReq firmCarInsertReq) { //添加车辆 - firmCarService.save(firmCar); + firmCarService.save(FirmCar.FirmInsertCar(firmCarInsertReq)); return Result.success("","添加成功!"); } 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 e011b4b..9c69c2d 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,62 +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); - -// @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); - - /** - * 车辆管理信息查询 - * @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/RequestLogMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/RequestLogMapper.java deleted file mode 100644 index e69de29..0000000 diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/TopicCarMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/TopicCarMapper.java index 8a306ff..4fd8f3d 100644 --- a/car-base-server/src/main/java/com/god/base/server/mapper/TopicCarMapper.java +++ b/car-base-server/src/main/java/com/god/base/server/mapper/TopicCarMapper.java @@ -1,7 +1,6 @@ package com.god.base.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.god.base.domain.Car; import com.god.base.domain.TopicCar; import com.god.base.domain.request.CarRequest; import org.apache.ibatis.annotations.Mapper; 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 9c19d4f..ad0b52b 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 @@ -1,51 +1,51 @@ -package com.god.base.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.god.base.domain.Car; -import com.god.base.domain.CarType; -import com.god.base.domain.Fence; -import com.god.base.domain.VehicleMessage; -import com.god.common.core.domain.Result; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 车辆管理层 - */ -public interface CarService extends IService { - - - Result> carList(@Param("userId") String userId); - - - Car selectCarInfoList(@Param("vinId") String vinId); - - Result> onlineVehicle(); - - /** - * 响应信息主题 - * @return - */ - Result countData(); - - - - /** - * 通过电子围栏id 获取这一条信息 - * @param - * @return - */ - List fenceId(); - - /** - * 通过车辆类型id 获取车辆类型 - * @param - * @return - * @return - */ - List carTypeId(); -} - - - +//package com.god.base.server.service; +// +//import com.baomidou.mybatisplus.extension.service.IService; +// +//import com.god.base.domain.CarType; +//import com.god.base.domain.Fence; +//import com.god.base.domain.VehicleMessage; +//import com.god.common.core.domain.Result; +//import org.apache.ibatis.annotations.Param; +// +//import java.util.List; +// +///** +// * 车辆管理层 +// */ +//public interface CarService extends IService { +// +// +// Result> carList(@Param("userId") String userId); +// +// +// Car selectCarInfoList(@Param("vinId") String vinId); +// +// Result> onlineVehicle(); +// +// /** +// * 响应信息主题 +// * @return +// */ +// Result countData(); +// +// +// +// /** +// * 通过电子围栏id 获取这一条信息 +// * @param +// * @return +// */ +// List fenceId(); +// +// /** +// * 通过车辆类型id 获取车辆类型 +// * @param +// * @return +// * @return +// */ +// List carTypeId(); +//} +// +// +// diff --git a/car-base-server/src/main/java/com/god/base/server/service/RequestLogService.java b/car-base-server/src/main/java/com/god/base/server/service/RequestLogService.java deleted file mode 100644 index 43c081b..0000000 --- a/car-base-server/src/main/java/com/god/base/server/service/RequestLogService.java +++ /dev/null @@ -1,18 +0,0 @@ -//package com.god.base.server.service; -// -//import com.baomidou.mybatisplus.extension.service.IService; -//import com.god.base.domain.RequestLog; -// -///** -// * AOP -// * -// * @author ChenXinHai -// * @version 2023/11/22 - 18:39 -// */ -//public interface RequestLogService extends IService { -// /** -// * 异步保存 -// * @param entity -// */ -// void asyncSave(RequestLog entity); -//} 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 8bf0f60..b49385a 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,184 +1,184 @@ -package com.god.base.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.god.base.domain.Car; -import com.god.base.domain.CarType; -import com.god.base.domain.Fence; -import com.god.base.domain.VehicleMessage; -import com.god.base.common.constant.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.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.io.Serializable; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 车辆管理业务层 - */ -@Log4j2 -@Service -public class CarServiceImpl extends ServiceImpl implements CarService { - - @Autowired - private CarMapper carMapper; - - @Autowired - private RedisTemplate redisTemplate; - - - /** - * 车辆信息 - * - * @param userId - * @return - */ - @Override - public Result> carList(String userId) { -// Long userId1 = SecurityUtils.getUserId(); -// if (null == userId1){ -// throw new SecurityException("请先登录"); -// } - List carList = carMapper.getList(userId); - return Result.success(carList); - } - - +//package com.god.base.server.service.impl; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import com.god.base.domain.Car; +//import com.god.base.domain.CarType; +//import com.god.base.domain.Fence; +//import com.god.base.domain.VehicleMessage; +//import com.god.base.common.constant.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.springframework.beans.factory.annotation.Autowired; +//import org.springframework.data.redis.core.RedisTemplate; +//import org.springframework.stereotype.Service; +// +//import java.io.Serializable; +//import java.util.List; +//import java.util.stream.Collectors; +// +///** +// * 车辆管理业务层 +// */ +//@Log4j2 +//@Service +//public class CarServiceImpl extends ServiceImpl implements CarService { +// +// @Autowired +// private CarMapper carMapper; +// +// @Autowired +// private RedisTemplate redisTemplate; +// +// // /** -// * 查询车辆信息管理列表 +// * 车辆信息 // * -// * @param carRequest 车辆信息管理 +// * @param userId // * @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 Result> carList(String userId) { +//// Long userId1 = SecurityUtils.getUserId(); +//// if (null == userId1){ +//// throw new SecurityException("请先登录"); +//// } +// List carList = carMapper.getList(userId); +// return Result.success(carList); // } - - - /** - * 查询车辆信息管理列表信息 - * @param vinId - * @return - */ - @Override - public Car selectCarInfoList(String vinId) { - return carMapper.HuiCarSelect(vinId); - } - - - - /** - * 根据VIN 编辑管理修改车辆信息数据 - * @param entity - * @return - */ - @Override - public boolean updateById(Car entity) { - boolean updatedById = super.updateById(entity); - if (!updatedById){ - throw new RuntimeException("修改失败"); - } - return true; - } - - /** - * 添加车辆管理数据 - * @param entity - * @return - */ - @Override - public boolean save(Car entity) { - boolean addCar = super.save(entity); - if (!addCar){ - throw new RuntimeException("添加车辆管理失败失败"); - } - return true; - } - - /** - * 删除车辆信息数据 - * - * @param id - * @return - */ - @Override - public boolean removeById(Serializable id) { - boolean remove = super.removeById(id); - if (remove ==false) { - log.warn("删除管理车辆数据:[/-{}-/]失败!", id); - throw new RuntimeException("删除管理车辆数据失败"); - } else { - return true; - } - } - - /** - * 获取所有在线车辆 - * @return - */ - @Override - public Result> onlineVehicle() { - List ids = carMapper.getOnlineCarIds(); - List messages = ids.stream().map(id -> { - VehicleMessage message = (VehicleMessage) redisTemplate.opsForValue().get(RedisConstant.CURRENT_INFO + ":" + id); - return message; - }).collect(Collectors.toList());Collectors.toList(); - return Result.success(messages); - } - - @Override - public Result countData() { - Integer day = (Integer) redisTemplate.opsForValue().get(RedisConstant.VEHICLE_INFO_TOKEN+RedisConstant.CURRENT_DAY_FAULT); - Integer month = (Integer) redisTemplate.opsForValue().get(RedisConstant.VEHICLE_INFO_TOKEN+RedisConstant.CURRENT_MONTH_FAULT); - Integer onlineCount = carMapper.getOnlineCarCount(); - Integer unOnlineCount = carMapper.getUnOnlineCount(); - return Result.success(day + ":" + month + ":" + onlineCount + ":" + unOnlineCount ); - } - - @Override - public List fenceId() { - return carMapper.fenceId(); - } - - @Override - public List carTypeId() { - return carMapper.carTypeId(); - } - - -} +// +// +//// /** +//// * 查询车辆信息管理列表 +//// * +//// * @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 vinId +// * @return +// */ +// @Override +// public Car selectCarInfoList(String vinId) { +// return carMapper.HuiCarSelect(vinId); +// } +// +// +// +// /** +// * 根据VIN 编辑管理修改车辆信息数据 +// * @param entity +// * @return +// */ +// @Override +// public boolean updateById(Car entity) { +// boolean updatedById = super.updateById(entity); +// if (!updatedById){ +// throw new RuntimeException("修改失败"); +// } +// return true; +// } +// +// /** +// * 添加车辆管理数据 +// * @param entity +// * @return +// */ +// @Override +// public boolean save(Car entity) { +// boolean addCar = super.save(entity); +// if (!addCar){ +// throw new RuntimeException("添加车辆管理失败失败"); +// } +// return true; +// } +// +// /** +// * 删除车辆信息数据 +// * +// * @param id +// * @return +// */ +// @Override +// public boolean removeById(Serializable id) { +// boolean remove = super.removeById(id); +// if (remove ==false) { +// log.warn("删除管理车辆数据:[/-{}-/]失败!", id); +// throw new RuntimeException("删除管理车辆数据失败"); +// } else { +// return true; +// } +// } +// +// /** +// * 获取所有在线车辆 +// * @return +// */ +// @Override +// public Result> onlineVehicle() { +// List ids = carMapper.getOnlineCarIds(); +// List messages = ids.stream().map(id -> { +// VehicleMessage message = (VehicleMessage) redisTemplate.opsForValue().get(RedisConstant.CURRENT_INFO + ":" + id); +// return message; +// }).collect(Collectors.toList());Collectors.toList(); +// return Result.success(messages); +// } +// +// @Override +// public Result countData() { +// Integer day = (Integer) redisTemplate.opsForValue().get(RedisConstant.VEHICLE_INFO_TOKEN+RedisConstant.CURRENT_DAY_FAULT); +// Integer month = (Integer) redisTemplate.opsForValue().get(RedisConstant.VEHICLE_INFO_TOKEN+RedisConstant.CURRENT_MONTH_FAULT); +// Integer onlineCount = carMapper.getOnlineCarCount(); +// Integer unOnlineCount = carMapper.getUnOnlineCount(); +// return Result.success(day + ":" + month + ":" + onlineCount + ":" + unOnlineCount ); +// } +// +// @Override +// public List fenceId() { +// return carMapper.fenceId(); +// } +// +// @Override +// public List carTypeId() { +// return carMapper.carTypeId(); +// } +// +// +//} diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/RequestLogServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/RequestLogServiceImpl.java deleted file mode 100644 index e69de29..0000000 diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/TopLineServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/TopLineServiceImpl.java index c967c8e..619b03f 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/TopLineServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/TopLineServiceImpl.java @@ -3,7 +3,7 @@ package com.god.base.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.god.base.domain.Car; + import com.god.base.domain.HisPath; import com.god.base.domain.TopicCar; import com.god.base.domain.request.GetTopicReq; diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/asyncSave.java b/car-base-server/src/main/java/com/god/base/server/service/impl/asyncSave.java deleted file mode 100644 index e69de29..0000000 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 298bfd1..96099e3 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 @@ -1,10 +1,14 @@ package com.god.base.server.utils; -import com.god.base.domain.Car; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.god.base.domain.Fence; +import com.god.base.domain.FirmCar; import com.god.base.domain.request.FenceQueryRequest; -import com.god.base.server.service.CarService; +import com.god.base.domain.request.FirmCarRequest; + import com.god.base.server.service.FenceService; +import com.god.base.server.service.FirmCarService; import com.god.common.core.domain.Result; import com.god.common.core.web.page.TableDataInfo; import com.god.common.redis.service.RedisService; @@ -27,7 +31,7 @@ import java.util.*; public class CarFenceMonitor { @Autowired - private CarService carService; + private FirmCarService firmCarService; @Autowired private FenceService fenceService; @@ -41,15 +45,15 @@ public class CarFenceMonitor { log.info("开始获取车辆围栏信息"); //获取车辆信息 - Result> listResult = carService.carList(null); - List dataCar = listResult.getData(); + List dataCar = firmCarService.findFirmCarByUserId(new FirmCarRequest()); + if (dataCar.size() <= 0) { throw new RuntimeException("查无管理车辆"); } //新建map集合存储车辆围栏 Map> map = new HashMap<>(); - for (Car car : dataCar) { + for (FirmCar car : dataCar) { //单线程获取车辆围栏信息 FenceQueryRequest fenceQueryRequest = new FenceQueryRequest(); diff --git a/car-base-server/src/main/resources/mapper/CarMapper.xml b/car-base-server/src/main/resources/mapper/CarMapper.xml index 08dfde4..5fd9d43 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 - - - - - - - - - - - - - - - - - + +