diff --git a/car-base-server/src/main/java/com/god/base/server/constant/BreakConstant.java b/car-base-common/src/main/java/com/god/base/common/constant/BreakConstant.java similarity index 98% rename from car-base-server/src/main/java/com/god/base/server/constant/BreakConstant.java rename to car-base-common/src/main/java/com/god/base/common/constant/BreakConstant.java index 53f3618..b252a69 100644 --- a/car-base-server/src/main/java/com/god/base/server/constant/BreakConstant.java +++ b/car-base-common/src/main/java/com/god/base/common/constant/BreakConstant.java @@ -1,4 +1,4 @@ -package com.god.base.server.constant; +package com.god.base.common.constant; /** * 故障信息 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/common/constant/HBaseConstant.java similarity index 84% rename from car-base-common/src/main/java/com/god/base/server/common/domainConstants/HBaseConstant.java rename to car-base-common/src/main/java/com/god/base/common/constant/HBaseConstant.java index c49f1cc..193af4c 100644 --- 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/common/constant/HBaseConstant.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domainConstants; +package com.god.base.common.constant; 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/common/constant/RabbitConstant.java similarity index 86% rename from car-base-common/src/main/java/com/god/base/server/common/domainConstants/RabbitConstant.java rename to car-base-common/src/main/java/com/god/base/common/constant/RabbitConstant.java index 8e263aa..e435380 100644 --- 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/common/constant/RabbitConstant.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domainConstants; +package com.god.base.common.constant; /** * RabbitMQ常量 diff --git a/car-base-common/src/main/java/com/god/base/server/common/domainConstants/RedisConstant.java b/car-base-common/src/main/java/com/god/base/common/constant/RedisConstant.java similarity index 90% rename from car-base-common/src/main/java/com/god/base/server/common/domainConstants/RedisConstant.java rename to car-base-common/src/main/java/com/god/base/common/constant/RedisConstant.java index 2544a3e..9f7f9ae 100644 --- a/car-base-common/src/main/java/com/god/base/server/common/domainConstants/RedisConstant.java +++ b/car-base-common/src/main/java/com/god/base/common/constant/RedisConstant.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domainConstants; +package com.god.base.common.constant; /** * 数据解析端 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/common/constant/TimeConstant.java similarity index 77% rename from car-base-common/src/main/java/com/god/base/server/common/domainConstants/TimeConstant.java rename to car-base-common/src/main/java/com/god/base/common/constant/TimeConstant.java index da6a2c7..21bb994 100644 --- 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/common/constant/TimeConstant.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domainConstants; +package com.god.base.common.constant; /** diff --git a/car-base-server/src/main/java/com/god/base/server/config/ErrorConfig.java b/car-base-common/src/main/java/com/god/base/config/ErrorConfig.java similarity index 92% rename from car-base-server/src/main/java/com/god/base/server/config/ErrorConfig.java rename to car-base-common/src/main/java/com/god/base/config/ErrorConfig.java index 492fd7c..c55f194 100644 --- a/car-base-server/src/main/java/com/god/base/server/config/ErrorConfig.java +++ b/car-base-common/src/main/java/com/god/base/config/ErrorConfig.java @@ -1,4 +1,4 @@ -package com.god.base.server.config; +package com.god.base.config; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java b/car-base-common/src/main/java/com/god/base/domain/BatteryBox.java similarity index 96% rename from car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java rename to car-base-common/src/main/java/com/god/base/domain/BatteryBox.java index ddb8ec1..9121a28 100644 --- a/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java +++ b/car-base-common/src/main/java/com/god/base/domain/BatteryBox.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java b/car-base-common/src/main/java/com/god/base/domain/BatteryBoxModel.java similarity index 96% rename from car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java rename to car-base-common/src/main/java/com/god/base/domain/BatteryBoxModel.java index f224dac..b3870bb 100644 --- a/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java +++ b/car-base-common/src/main/java/com/god/base/domain/BatteryBoxModel.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/Breakdown.java b/car-base-common/src/main/java/com/god/base/domain/Breakdown.java similarity index 95% rename from car-base-common/src/main/java/com/god/base/common/domain/Breakdown.java rename to car-base-common/src/main/java/com/god/base/domain/Breakdown.java index 044ee6d..d2d14e0 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/Breakdown.java +++ b/car-base-common/src/main/java/com/god/base/domain/Breakdown.java @@ -1,8 +1,8 @@ -package com.god.base.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.god.base.common.domain.request.BreakdownRequest; +import com.god.base.domain.request.BreakdownRequest; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/Car.java b/car-base-common/src/main/java/com/god/base/domain/Car.java similarity index 96% rename from car-base-common/src/main/java/com/god/base/server/common/domain/Car.java rename to car-base-common/src/main/java/com/god/base/domain/Car.java index ee2dbcd..fe97a7c 100644 --- a/car-base-common/src/main/java/com/god/base/server/common/domain/Car.java +++ b/car-base-common/src/main/java/com/god/base/domain/Car.java @@ -1,8 +1,8 @@ -package com.god.base.server.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.god.base.server.common.domain.request.CarRequest; +import com.god.base.domain.request.CarRequest; import com.god.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java b/car-base-common/src/main/java/com/god/base/domain/CarType.java similarity index 90% rename from car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java rename to car-base-common/src/main/java/com/god/base/domain/CarType.java index cb39128..1aece88 100644 --- a/car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java +++ b/car-base-common/src/main/java/com/god/base/domain/CarType.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/DrivingRecord.java b/car-base-common/src/main/java/com/god/base/domain/DrivingRecord.java similarity index 97% rename from car-base-common/src/main/java/com/god/base/server/common/domain/DrivingRecord.java rename to car-base-common/src/main/java/com/god/base/domain/DrivingRecord.java index 495a536..4748315 100644 --- a/car-base-common/src/main/java/com/god/base/server/common/domain/DrivingRecord.java +++ b/car-base-common/src/main/java/com/god/base/domain/DrivingRecord.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/Fault.java b/car-base-common/src/main/java/com/god/base/domain/Fault.java similarity index 93% rename from car-base-common/src/main/java/com/god/base/common/domain/Fault.java rename to car-base-common/src/main/java/com/god/base/domain/Fault.java index 064d30a..f5ea019 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/Fault.java +++ b/car-base-common/src/main/java/com/god/base/domain/Fault.java @@ -1,7 +1,7 @@ -package com.god.base.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.TableName; -import com.god.base.common.domain.request.FaultRequest; +import com.god.base.domain.request.FaultRequest; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/Faultcodealarm.java b/car-base-common/src/main/java/com/god/base/domain/Faultcodealarm.java similarity index 96% rename from car-base-common/src/main/java/com/god/base/common/domain/Faultcodealarm.java rename to car-base-common/src/main/java/com/god/base/domain/Faultcodealarm.java index 2cf68c9..d91a62a 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/Faultcodealarm.java +++ b/car-base-common/src/main/java/com/god/base/domain/Faultcodealarm.java @@ -1,4 +1,4 @@ -package com.god.base.common.domain; +package com.god.base.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/Fence.java b/car-base-common/src/main/java/com/god/base/domain/Fence.java similarity index 94% rename from car-base-common/src/main/java/com/god/base/common/domain/Fence.java rename to car-base-common/src/main/java/com/god/base/domain/Fence.java index fa619b1..3b8350a 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/Fence.java +++ b/car-base-common/src/main/java/com/god/base/domain/Fence.java @@ -1,10 +1,10 @@ -package com.god.base.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.god.base.common.domain.request.FenceAddRequest; +import com.god.base.domain.request.FenceAddRequest; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,7 +12,6 @@ import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.Date; /** diff --git a/car-base-common/src/main/java/com/god/base/common/domain/PageQuery.java b/car-base-common/src/main/java/com/god/base/domain/PageQuery.java similarity index 96% rename from car-base-common/src/main/java/com/god/base/common/domain/PageQuery.java rename to car-base-common/src/main/java/com/god/base/domain/PageQuery.java index 901b4d6..60a1f9a 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/PageQuery.java +++ b/car-base-common/src/main/java/com/god/base/domain/PageQuery.java @@ -1,4 +1,4 @@ -package com.god.base.common.domain; +package com.god.base.domain; import com.alibaba.druid.util.StringUtils; import com.baomidou.mybatisplus.core.metadata.OrderItem; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/RequestLog.java b/car-base-common/src/main/java/com/god/base/domain/RequestLog.java similarity index 97% rename from car-base-common/src/main/java/com/god/base/common/domain/RequestLog.java rename to car-base-common/src/main/java/com/god/base/domain/RequestLog.java index ffde055..88ee337 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/RequestLog.java +++ b/car-base-common/src/main/java/com/god/base/domain/RequestLog.java @@ -1,4 +1,4 @@ -package com.god.base.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/VehicleMessage.java b/car-base-common/src/main/java/com/god/base/domain/VehicleMessage.java similarity index 98% rename from car-base-common/src/main/java/com/god/base/server/common/domain/VehicleMessage.java rename to car-base-common/src/main/java/com/god/base/domain/VehicleMessage.java index 29c6254..760a4bf 100644 --- a/car-base-common/src/main/java/com/god/base/server/common/domain/VehicleMessage.java +++ b/car-base-common/src/main/java/com/god/base/domain/VehicleMessage.java @@ -1,4 +1,4 @@ -package com.god.base.server.common.domain; +package com.god.base.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/request/BreakdownRequest.java b/car-base-common/src/main/java/com/god/base/domain/request/BreakdownRequest.java similarity index 93% rename from car-base-common/src/main/java/com/god/base/common/domain/request/BreakdownRequest.java rename to car-base-common/src/main/java/com/god/base/domain/request/BreakdownRequest.java index dbba1ad..72f9549 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/request/BreakdownRequest.java +++ b/car-base-common/src/main/java/com/god/base/domain/request/BreakdownRequest.java @@ -1,8 +1,8 @@ -package com.god.base.common.domain.request; +package com.god.base.domain.request; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.god.base.common.domain.PageQuery; +import com.god.base.domain.PageQuery; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java b/car-base-common/src/main/java/com/god/base/domain/request/CarRequest.java similarity index 94% rename from car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java rename to car-base-common/src/main/java/com/god/base/domain/request/CarRequest.java index 759e060..37bbbd9 100644 --- a/car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java +++ b/car-base-common/src/main/java/com/god/base/domain/request/CarRequest.java @@ -1,6 +1,6 @@ -package com.god.base.server.common.domain.request; +package com.god.base.domain.request; -import com.god.base.common.domain.PageQuery; +import com.god.base.domain.PageQuery; import com.god.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/request/FaultRequest.java b/car-base-common/src/main/java/com/god/base/domain/request/FaultRequest.java similarity index 89% rename from car-base-common/src/main/java/com/god/base/common/domain/request/FaultRequest.java rename to car-base-common/src/main/java/com/god/base/domain/request/FaultRequest.java index 9b4ad0a..cbb2070 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/request/FaultRequest.java +++ b/car-base-common/src/main/java/com/god/base/domain/request/FaultRequest.java @@ -1,6 +1,6 @@ -package com.god.base.common.domain.request; +package com.god.base.domain.request; -import com.god.base.common.domain.PageQuery; +import com.god.base.domain.PageQuery; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/request/FenceAddRequest.java b/car-base-common/src/main/java/com/god/base/domain/request/FenceAddRequest.java similarity index 97% rename from car-base-common/src/main/java/com/god/base/common/domain/request/FenceAddRequest.java rename to car-base-common/src/main/java/com/god/base/domain/request/FenceAddRequest.java index 956f4ff..223044a 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/request/FenceAddRequest.java +++ b/car-base-common/src/main/java/com/god/base/domain/request/FenceAddRequest.java @@ -1,4 +1,4 @@ -package com.god.base.common.domain.request; +package com.god.base.domain.request; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/request/FenceQueryRequest.java b/car-base-common/src/main/java/com/god/base/domain/request/FenceQueryRequest.java similarity index 87% rename from car-base-common/src/main/java/com/god/base/common/domain/request/FenceQueryRequest.java rename to car-base-common/src/main/java/com/god/base/domain/request/FenceQueryRequest.java index 2b8ccfe..a984ae0 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/request/FenceQueryRequest.java +++ b/car-base-common/src/main/java/com/god/base/domain/request/FenceQueryRequest.java @@ -1,6 +1,6 @@ -package com.god.base.common.domain.request; +package com.god.base.domain.request; -import com.god.base.common.domain.PageQuery; +import com.god.base.domain.PageQuery; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/common/domain/response/BreakdownResponse.java b/car-base-common/src/main/java/com/god/base/domain/response/BreakdownResponse.java similarity index 87% rename from car-base-common/src/main/java/com/god/base/common/domain/response/BreakdownResponse.java rename to car-base-common/src/main/java/com/god/base/domain/response/BreakdownResponse.java index 52d03f2..035eed7 100644 --- a/car-base-common/src/main/java/com/god/base/common/domain/response/BreakdownResponse.java +++ b/car-base-common/src/main/java/com/god/base/domain/response/BreakdownResponse.java @@ -1,6 +1,6 @@ -package com.god.base.common.domain.response; +package com.god.base.domain.response; -import com.god.base.common.domain.PageQuery; +import com.god.base.domain.PageQuery; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/car-base-common/src/main/java/com/god/base/server/common/constants/VehicleConstant.java b/car-base-common/src/main/java/com/god/base/server/common/constants/VehicleConstant.java deleted file mode 100644 index 53f4924..0000000 --- a/car-base-common/src/main/java/com/god/base/server/common/constants/VehicleConstant.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.god.base.server.common.constants; - - -/** - * 车辆信息 - */ -public class VehicleConstant { - - /** - * 车辆启动 - */ - public static final Integer VEHICLE_START = 1; - /** - * 车辆停止 - */ - public static final Integer VEHICLE_END = 0 ; - /** - * 车辆状态更改队列 - */ - public static final String VEHICLE_STATUS_UPDATE_QUEUE = "vehicle_status_update_queue"; - /** - * 车辆信息前缀 - */ - public static final String VEHICLE_INFO_MAP = "vehicle_info_map"; - - - - - - - -} 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 deleted file mode 100644 index 7d7dd9f..0000000 --- a/car-base-common/src/main/java/com/god/base/server/common/domainConstants/VehicleConstant.java +++ /dev/null @@ -1,88 +0,0 @@ -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-remote/src/main/java/com/god/base/remote/RemoteCarService.java b/car-base-remote/src/main/java/com/god/base/remote/RemoteCarService.java index 3fcd086..715a5fc 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,13 +1,9 @@ package com.god.base.remote; -import com.god.base.common.domain.Fence; +import com.god.base.domain.Fence; import com.god.base.remote.factory.RemoteCarFallbackFactory; -import com.god.base.server.common.domain.Car; -import com.god.common.core.constant.SecurityConstants; -import com.god.common.core.constant.ServiceNameConstants; +import com.god.base.domain.Car; import com.god.common.core.domain.Result; -import com.god.common.security.annotation.RequiresPermissions; -import com.god.common.system.remote.factory.RemoteLogFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; 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 index b449e6c..3a2a5b4 100644 --- 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 @@ -1,10 +1,9 @@ package com.god.base.remote; -import com.god.base.common.domain.Fence; +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 com.god.common.log.annotation.Log; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestHeader; 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 a5a1b14..af2b7ae 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,8 @@ package com.god.base.remote.factory; -import com.god.base.common.domain.Fence; +import com.god.base.domain.Fence; import com.god.base.remote.RemoteCarService; -import com.god.base.server.common.domain.Car; +import com.god.base.domain.Car; import com.god.common.core.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 index a8ee745..db4f486 100644 --- 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 @@ -1,6 +1,6 @@ package com.god.base.remote.factory; -import com.god.base.common.domain.Fence; +import com.god.base.domain.Fence; import com.god.base.remote.RemoteFenceService; import com.god.common.core.domain.Result; import org.slf4j.Logger; diff --git a/car-base-server/src/main/java/com/god/base/server/config/SpringUtils.java b/car-base-server/src/main/java/com/god/base/server/config/SpringUtils.java deleted file mode 100644 index 9e9a870..0000000 --- a/car-base-server/src/main/java/com/god/base/server/config/SpringUtils.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.god.base.server.config; - -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - -/** - * @author ChenXinHai - * @version 2023/11/22 - 19:55 - */ -public class SpringUtils implements ApplicationContextAware { - private static ApplicationContext applicationContext; - - @Override - public void setApplicationContext(ApplicationContext applicationContext) { - SpringUtils.applicationContext=applicationContext; - } - public static ApplicationContext getApplicationContext(){ - return applicationContext; - } - - /** - * 通过name 获取bean - */ - public static Object getBean(String name){ - return getApplicationContext().getBean(name); - } -} diff --git a/car-base-server/src/main/java/com/god/base/server/controller/BreakdownController.java b/car-base-server/src/main/java/com/god/base/server/controller/BreakdownController.java index c4e1e88..74a3e9e 100644 --- a/car-base-server/src/main/java/com/god/base/server/controller/BreakdownController.java +++ b/car-base-server/src/main/java/com/god/base/server/controller/BreakdownController.java @@ -2,8 +2,8 @@ package com.god.base.server.controller; import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.api.model.v2.Result; -import com.god.base.common.domain.Breakdown; -import com.god.base.common.domain.request.BreakdownRequest; +import com.god.base.domain.Breakdown; +import com.god.base.domain.request.BreakdownRequest; import com.god.base.server.service.BreakdownService; import com.god.common.core.web.page.TableDataInfo; import lombok.extern.log4j.Log4j2; 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 a3c8d24..8dacd05 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,9 +1,9 @@ package com.god.base.server.controller; 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.domain.Car; +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.base.server.util.AopConfig; diff --git a/car-base-server/src/main/java/com/god/base/server/controller/DrivingRecordController.java b/car-base-server/src/main/java/com/god/base/server/controller/DrivingRecordController.java index 3b61b83..6da8eef 100644 --- a/car-base-server/src/main/java/com/god/base/server/controller/DrivingRecordController.java +++ b/car-base-server/src/main/java/com/god/base/server/controller/DrivingRecordController.java @@ -1,7 +1,7 @@ package com.god.base.server.controller; -import com.god.base.server.common.domain.DrivingRecord; -import com.god.base.server.common.domain.VehicleMessage; +import com.god.base.domain.DrivingRecord; +import com.god.base.domain.VehicleMessage; import com.god.base.server.service.IDrivingRecordService; import com.god.common.core.domain.Result; import com.god.common.core.utils.poi.ExcelUtil; diff --git a/car-base-server/src/main/java/com/god/base/server/controller/FaultController.java b/car-base-server/src/main/java/com/god/base/server/controller/FaultController.java index f8fbb17..ec7fd44 100644 --- a/car-base-server/src/main/java/com/god/base/server/controller/FaultController.java +++ b/car-base-server/src/main/java/com/god/base/server/controller/FaultController.java @@ -2,8 +2,8 @@ package com.god.base.server.controller; import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.api.model.v2.Result; -import com.god.base.common.domain.Fault; -import com.god.base.common.domain.request.FaultRequest; +import com.god.base.domain.Fault; +import com.god.base.domain.request.FaultRequest; import com.god.base.server.service.FaultService; import com.god.common.core.web.controller.BaseController; import com.god.common.core.web.page.TableDataInfo; 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 e28ea1a..2d67b1f 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 @@ -8,11 +8,9 @@ package com.god.base.server.controller; * @Description TODO **/ -import com.alibaba.fastjson.JSONObject; - -import com.god.base.common.domain.Fence; -import com.god.base.common.domain.request.FenceAddRequest; -import com.god.base.common.domain.request.FenceQueryRequest; +import com.god.base.domain.Fence; +import com.god.base.domain.request.FenceAddRequest; +import com.god.base.domain.request.FenceQueryRequest; import com.god.base.server.service.FenceService; import com.god.common.core.web.page.TableDataInfo; import com.god.common.log.annotation.Log; diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/BreakdownMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/BreakdownMapper.java index 96b5a0f..afdbf86 100644 --- a/car-base-server/src/main/java/com/god/base/server/mapper/BreakdownMapper.java +++ b/car-base-server/src/main/java/com/god/base/server/mapper/BreakdownMapper.java @@ -1,7 +1,7 @@ package com.god.base.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.god.base.common.domain.Breakdown; +import com.god.base.domain.Breakdown; import org.apache.ibatis.annotations.Mapper; /** 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 dfbc43f..fdb1807 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,8 +1,8 @@ package com.god.base.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.god.base.server.common.domain.Car; -import com.god.base.server.common.domain.request.CarRequest; +import com.god.base.domain.Car; +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; diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/DrivingRecordMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/DrivingRecordMapper.java index b27767e..471704f 100644 --- a/car-base-server/src/main/java/com/god/base/server/mapper/DrivingRecordMapper.java +++ b/car-base-server/src/main/java/com/god/base/server/mapper/DrivingRecordMapper.java @@ -1,6 +1,6 @@ package com.god.base.server.mapper; -import com.god.base.server.common.domain.DrivingRecord; +import com.god.base.domain.DrivingRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/FaultMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/FaultMapper.java index 619984b..cb9d90b 100644 --- a/car-base-server/src/main/java/com/god/base/server/mapper/FaultMapper.java +++ b/car-base-server/src/main/java/com/god/base/server/mapper/FaultMapper.java @@ -1,7 +1,7 @@ package com.god.base.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.god.base.common.domain.Fault; +import com.god.base.domain.Fault; import org.apache.ibatis.annotations.Mapper; /** diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java index 5b98412..450e759 100644 --- a/car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java +++ b/car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java @@ -1,8 +1,7 @@ package com.god.base.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.god.base.common.domain.Fence; -import org.apache.ibatis.annotations.Mapper; +import com.god.base.domain.Fence; /** * @ClassName FenceMapper diff --git a/car-base-server/src/main/java/com/god/base/server/service/BreakdownService.java b/car-base-server/src/main/java/com/god/base/server/service/BreakdownService.java index d90faa3..bccb3d7 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/BreakdownService.java +++ b/car-base-server/src/main/java/com/god/base/server/service/BreakdownService.java @@ -1,8 +1,8 @@ package com.god.base.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.god.base.common.domain.Breakdown; -import com.god.base.common.domain.request.BreakdownRequest; +import com.god.base.domain.Breakdown; +import com.god.base.domain.request.BreakdownRequest; import com.god.common.core.web.page.TableDataInfo; /** 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 e488fa5..0e3db1b 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,8 +1,8 @@ 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.domain.Car; +import com.god.base.domain.VehicleMessage; import com.god.common.core.domain.Result; import org.apache.ibatis.annotations.Param; diff --git a/car-base-server/src/main/java/com/god/base/server/service/FaultService.java b/car-base-server/src/main/java/com/god/base/server/service/FaultService.java index 134040f..67806ea 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/FaultService.java +++ b/car-base-server/src/main/java/com/god/base/server/service/FaultService.java @@ -1,8 +1,8 @@ package com.god.base.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.god.base.common.domain.Fault; -import com.god.base.common.domain.request.FaultRequest; +import com.god.base.domain.Fault; +import com.god.base.domain.request.FaultRequest; import com.god.common.core.web.page.TableDataInfo; /** diff --git a/car-base-server/src/main/java/com/god/base/server/service/FenceService.java b/car-base-server/src/main/java/com/god/base/server/service/FenceService.java index 9bb810a..7813eb6 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/FenceService.java +++ b/car-base-server/src/main/java/com/god/base/server/service/FenceService.java @@ -1,8 +1,8 @@ package com.god.base.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.god.base.common.domain.Fence; -import com.god.base.common.domain.request.FenceQueryRequest; +import com.god.base.domain.Fence; +import com.god.base.domain.request.FenceQueryRequest; import com.god.common.core.web.page.TableDataInfo; /** diff --git a/car-base-server/src/main/java/com/god/base/server/service/IDrivingRecordService.java b/car-base-server/src/main/java/com/god/base/server/service/IDrivingRecordService.java index 0d592b9..72b76a0 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/IDrivingRecordService.java +++ b/car-base-server/src/main/java/com/god/base/server/service/IDrivingRecordService.java @@ -1,7 +1,7 @@ package com.god.base.server.service; -import com.god.base.server.common.domain.DrivingRecord; +import com.god.base.domain.DrivingRecord; import org.apache.ibatis.annotations.Param; import java.util.List; 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 index 079f9a5..43c081b 100644 --- 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 @@ -1,7 +1,7 @@ //package com.god.base.server.service; // //import com.baomidou.mybatisplus.extension.service.IService; -//import com.god.base.common.domain.RequestLog; +//import com.god.base.domain.RequestLog; // ///** // * AOP diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/BreakdownServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/BreakdownServiceImpl.java index c2847ff..4e8835b 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/BreakdownServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/BreakdownServiceImpl.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.god.base.common.domain.Breakdown; -import com.god.base.common.domain.request.BreakdownRequest; +import com.god.base.domain.Breakdown; +import com.god.base.domain.request.BreakdownRequest; import com.god.base.server.mapper.BreakdownMapper; import com.god.base.server.service.BreakdownService; import com.god.common.core.web.page.TableDataInfo; 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 f5b10be..4f25d94 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,9 +1,9 @@ package com.god.base.server.service.impl; 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.domainConstants.RedisConstant; +import com.god.base.domain.Car; +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; diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/FaultServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/FaultServiceImpl.java index 17fe566..4a70e64 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/FaultServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/FaultServiceImpl.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.god.base.common.domain.Fault; -import com.god.base.common.domain.request.FaultRequest; +import com.god.base.domain.Fault; +import com.god.base.domain.request.FaultRequest; import com.god.base.server.mapper.FaultMapper; import com.god.base.server.service.FaultService; import com.god.common.core.web.page.TableDataInfo; diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java index d1f8362..f6a80e1 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.god.base.common.domain.Fence; -import com.god.base.common.domain.request.FenceQueryRequest; +import com.god.base.domain.Fence; +import com.god.base.domain.request.FenceQueryRequest; import com.god.base.server.mapper.FenceMapper; import com.god.base.server.service.FenceService; import com.god.common.core.web.page.TableDataInfo; diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/IDrivingRecordServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/IDrivingRecordServiceImpl.java index 4dbc0a7..29d0bbb 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/IDrivingRecordServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/IDrivingRecordServiceImpl.java @@ -1,6 +1,6 @@ package com.god.base.server.service.impl; -import com.god.base.server.common.domain.DrivingRecord; +import com.god.base.domain.DrivingRecord; import com.god.base.server.mapper.DrivingRecordMapper; import com.god.base.server.service.IDrivingRecordService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/car-base-server/src/main/java/com/god/base/server/webSocket/entity/VehicleAllData.java b/car-base-server/src/main/java/com/god/base/server/webSocket/entity/VehicleAllData.java index dff9389..5750207 100644 --- a/car-base-server/src/main/java/com/god/base/server/webSocket/entity/VehicleAllData.java +++ b/car-base-server/src/main/java/com/god/base/server/webSocket/entity/VehicleAllData.java @@ -1,6 +1,6 @@ package com.god.base.server.webSocket.entity; -import com.god.base.server.common.domain.VehicleMessage; +import com.god.base.domain.VehicleMessage; import lombok.Data; import java.util.List; diff --git a/car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketBatchHandler.java b/car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketBatchHandler.java index cf17ff3..bfa2332 100644 --- a/car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketBatchHandler.java +++ b/car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketBatchHandler.java @@ -1,8 +1,8 @@ package com.god.base.server.webSocket.handler; import com.alibaba.fastjson.JSON; -import com.god.base.server.common.domain.VehicleMessage; -import com.god.base.server.common.domainConstants.RedisConstant; +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.webSocket.entity.VehicleAllData; import lombok.extern.log4j.Log4j2; diff --git a/car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketHandler.java b/car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketHandler.java index 834abcd..fa39651 100644 --- a/car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketHandler.java +++ b/car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketHandler.java @@ -1,8 +1,8 @@ package com.god.base.server.webSocket.handler; import com.alibaba.fastjson.JSON; -import com.god.base.server.common.domain.VehicleMessage; -import com.god.base.server.common.domainConstants.RedisConstant; +import com.god.base.domain.VehicleMessage; +import com.god.base.common.constant.RedisConstant; import com.god.base.server.webSocket.entity.SocketData; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; diff --git a/car-base-server/src/main/resources/mapper/CarMapper.xml b/car-base-server/src/main/resources/mapper/CarMapper.xml index 03890c6..7a432e8 100644 --- a/car-base-server/src/main/resources/mapper/CarMapper.xml +++ b/car-base-server/src/main/resources/mapper/CarMapper.xml @@ -26,7 +26,7 @@ select car_vin_id, car_type_id, fence_id, battery_manufacturer, motor_manufacturer, motor_numberr, battery_number,status from t_car - and car_vin_id = #{carVinId}" @@ -56,7 +56,7 @@ from t_car - where car_vin_id = #{vinId} diff --git a/car-base-server/src/main/resources/mapper/DrivingRecordMapper.xml b/car-base-server/src/main/resources/mapper/DrivingRecordMapper.xml index 9fb4379..4a746f1 100644 --- a/car-base-server/src/main/resources/mapper/DrivingRecordMapper.xml +++ b/car-base-server/src/main/resources/mapper/DrivingRecordMapper.xml @@ -1,7 +1,7 @@ - + @@ -16,7 +16,7 @@ - and vin = #{vin} @@ -26,13 +26,13 @@ - where id = #{id} - + insert into driving_record vin, @@ -51,7 +51,7 @@ - + update driving_record vin = #{vin},