diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/RecordCar.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/RecordCar.java deleted file mode 100644 index 3f4988e..0000000 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/RecordCar.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.dragon.vehicle.history.common.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @author Wenkang Tang - * @date 2023/11/25 13:04 - * @description - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class RecordCar { - /** - * 历史轨迹记录表ID - */ - private Integer carRecordId; - /** - * 开始时间 - */ - private Date startTime; - /** - * 结束时间 - */ - private Date endTime; - /** - * 历史轨迹经纬度数据 - */ - private Long drivingRecord; -} diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleOperation.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleOperation.java index 5073a69..5d2623a 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleOperation.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/VehicleOperation.java @@ -227,18 +227,4 @@ public class VehicleOperation { * 电池报文 */ private String batteryMsg; - /** - * 开始日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startTime; - /** - * 结束日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - /** - * 是否删除 1-是 0-否 - */ - private Integer isDelete; } diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/ReqVehicleOperation.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/ReqVehicleOperation.java deleted file mode 100644 index 25c2274..0000000 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/ReqVehicleOperation.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.dragon.vehicle.history.common.domain.req; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @author Wenkang Tang - * @date 2023/11/20 18:38 - * @description 查询车辆历史轨迹参数 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ReqVehicleOperation { - /** - * 车辆VIN - */ - private String vin; - - /** - * 当前页数 - */ - private Integer pageNum; - - /** - * 每页条数 - */ - private Integer pageSize; - - /** - * 开始日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startTime; - - /** - * 结束日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; -} diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/HistoricalTrackController.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/HistoricalTrackController.java index 27c0eef..d8f4c8d 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/HistoricalTrackController.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/HistoricalTrackController.java @@ -1,11 +1,7 @@ package com.dragon.vehicle.history.server.controller; -import com.dragon.common.core.domain.Result; -import com.dragon.vehicle.history.common.domain.RecordCar; import com.dragon.vehicle.history.server.service.HistoricalTrackService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,12 +17,5 @@ public class HistoricalTrackController { @Autowired private HistoricalTrackService historicalTrackService; - /** - * 历史轨迹列表 - * @return - */ - @PostMapping("/listRecordCar") - public Result> listRecordCar(){ - return Result.success(historicalTrackService.listRecordCar()); - } + } diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/mapper/RecordCarMapper.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/mapper/RecordCarMapper.java deleted file mode 100644 index 8cd84cd..0000000 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/mapper/RecordCarMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.dragon.vehicle.history.server.mapper; - -import com.dragon.vehicle.history.common.domain.RecordCar; -import com.github.yulichang.base.MPJBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author Wenkang Tang - * @date 2023/11/25 13:17 - * @description - */ -@Mapper -public interface RecordCarMapper extends MPJBaseMapper { -} diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/HistoricalTrackService.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/HistoricalTrackService.java index 8b8b5d1..5680ca9 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/HistoricalTrackService.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/HistoricalTrackService.java @@ -1,13 +1,8 @@ package com.dragon.vehicle.history.server.service; -import com.dragon.vehicle.history.common.domain.RecordCar; - -import java.util.List; - /** * @author Wenkang Tang * @date 2023/11/19 19:55 */ public interface HistoricalTrackService { - List listRecordCar(); } diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java index 764bc8b..03ff908 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java @@ -41,7 +41,6 @@ public class CarServiceImpl implements CarService { */ @Override public Result> listCar(ReqCar reqCar) { - log.info(reqCar); Page resCarPage = new Page<>(reqCar.getPageNum(), reqCar.getPageSize()); List resCars = carMapper.selectJoinPage(resCarPage, ResCar.class, new MPJLambdaWrapper() .selectAll(Car.class) diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/HistoricalTrackServiceImpl.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/HistoricalTrackServiceImpl.java index 7636b45..cda4bc7 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/HistoricalTrackServiceImpl.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/HistoricalTrackServiceImpl.java @@ -1,15 +1,10 @@ package com.dragon.vehicle.history.server.service.impl; -import com.dragon.vehicle.history.common.domain.RecordCar; import com.dragon.vehicle.history.server.mapper.HistoricalTrackMapper; -import com.dragon.vehicle.history.server.mapper.RecordCarMapper; import com.dragon.vehicle.history.server.service.HistoricalTrackService; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - /** * @author Wenkang Tang * @date 2023/11/19 19:55 @@ -18,15 +13,5 @@ import java.util.List; public class HistoricalTrackServiceImpl implements HistoricalTrackService { @Autowired private HistoricalTrackMapper historicalTrackMapper; - @Autowired - private RecordCarMapper recordCarMapper; - /** - * 历史轨迹列表 - * @return - */ - @Override - public List listRecordCar() { - return recordCarMapper.selectList(new MPJLambdaWrapper().selectAll(RecordCar.class)); - } } diff --git a/vehicle-history-server/src/main/resources/mapper/CarMapper.xml b/vehicle-history-server/src/main/resources/mapper/CarMapper.xml deleted file mode 100644 index ee3cbda..0000000 --- a/vehicle-history-server/src/main/resources/mapper/CarMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/vehicle-history-server/src/main/resources/mapper/CarTypeMapper.xml b/vehicle-history-server/src/main/resources/mapper/CarTypeMapper.xml deleted file mode 100644 index 54b534f..0000000 --- a/vehicle-history-server/src/main/resources/mapper/CarTypeMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/vehicle-history-server/src/main/resources/mapper/FenceMapper.xml b/vehicle-history-server/src/main/resources/mapper/FenceMapper.xml deleted file mode 100644 index 589ba33..0000000 --- a/vehicle-history-server/src/main/resources/mapper/FenceMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/vehicle-history-server/src/main/resources/mapper/HistoricalTrackMapper.xml b/vehicle-history-server/src/main/resources/mapper/HistoricalTrackMapper.xml deleted file mode 100644 index 44a0c25..0000000 --- a/vehicle-history-server/src/main/resources/mapper/HistoricalTrackMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - -