diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/Vehicle.java b/february-vehicle-common/src/main/java/com/february/common/domain/Vehicle.java
new file mode 100644
index 0000000..ce3e6fa
--- /dev/null
+++ b/february-vehicle-common/src/main/java/com/february/common/domain/Vehicle.java
@@ -0,0 +1,58 @@
+package com.february.common.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Vehicle {
+
+ /**
+ * 车辆主键
+ */
+ private Integer vehicleId;
+
+ /**
+ * 车辆VIN
+ */
+ private String vehicleVIN;
+
+ /**
+ * 车辆类型
+ */
+ private Integer vehicleTypeId;
+
+ /**
+ * 车辆状态
+ */
+ private Integer vehicleStatus;
+
+ /**
+ * 电子围栏
+ */
+ private Integer fenceId;
+
+ /**
+ * 电机厂商
+ */
+ private String motorManufacturer;
+
+ /**
+ * 电池厂商
+ */
+ private String batteryManufacturer;
+
+ /**
+ * 电机编码
+ */
+ private String motorCoding;
+
+ /**
+ * 电池编码
+ */
+ private String batteryCoding;
+}
diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/VehicleType.java b/february-vehicle-common/src/main/java/com/february/common/domain/VehicleType.java
new file mode 100644
index 0000000..2809ba4
--- /dev/null
+++ b/february-vehicle-common/src/main/java/com/february/common/domain/VehicleType.java
@@ -0,0 +1,23 @@
+package com.february.common.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class VehicleType {
+
+ /**
+ * 车辆类型主键
+ */
+ private Integer vehicleTypeId;
+
+ /**
+ * 车辆类型名称
+ */
+ private String vehicleTypeName;
+}
diff --git a/february-vehicle-server/pom.xml b/february-vehicle-server/pom.xml
index e972fad..537ed2a 100644
--- a/february-vehicle-server/pom.xml
+++ b/february-vehicle-server/pom.xml
@@ -48,6 +48,17 @@
3.6.3
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+
+ com.google.code.gson
+ gson
+ 2.8.5
+
${project.artifactId}
diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java
index 0fd5b9e..ed05e8b 100644
--- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java
+++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java
@@ -2,8 +2,9 @@ package com.vehicle.trajectory.controller;
import com.february.common.core.domain.Result;
-import com.february.common.domain.Car;
import com.february.common.domain.RealData;
+import com.february.common.domain.Vehicle;
+import com.february.common.domain.VehicleType;
import com.vehicle.trajectory.service.TrajectoryService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,11 +40,22 @@ public class TrajectoryController {
/**
* 车辆信息
*/
- @GetMapping("/carList")
- public Result> carList() {
+ @GetMapping("/vehicleList")
+ public Result> carList() {
log.info("功能名称:【查看在线车辆】,请求路径:【{}】,请求方式:【{}】", request.getRequestURI(), request.getMethod());
- Result> result = trajectoryService.carList();
+ Result> result = trajectoryService.vehicleList();
log.info("请求结果:【{}】", result);
return result;
}
+
+ /**
+ * 车辆类型
+ */
+ @GetMapping("/vehicleTypeList")
+ public Result> vehicleTypeList(){
+ log.info("功能名称:【车辆类型】,请求路径:【{}】,请求方式:【{}】",request.getRequestURI(),request.getMethod());
+ Result> result = trajectoryService.vehicleTypeList();
+ log.info("请求结果:【{}】",result);
+ return result;
+ }
}
diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/mapper/TrajectoryMapper.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/mapper/TrajectoryMapper.java
index 685502c..41d0ea5 100644
--- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/mapper/TrajectoryMapper.java
+++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/mapper/TrajectoryMapper.java
@@ -1,7 +1,8 @@
package com.vehicle.trajectory.mapper;
-import com.february.common.domain.Car;
import com.february.common.domain.RealData;
+import com.february.common.domain.Vehicle;
+import com.february.common.domain.VehicleType;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -10,5 +11,7 @@ import java.util.List;
public interface TrajectoryMapper {
List realDateList();
- List carList();
+ List vehicleList();
+
+ List vehicleTypeList();
}
diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java
index 1fb03c8..e301936 100644
--- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java
+++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java
@@ -1,13 +1,16 @@
package com.vehicle.trajectory.service;
import com.february.common.core.domain.Result;
-import com.february.common.domain.Car;
import com.february.common.domain.RealData;
+import com.february.common.domain.Vehicle;
+import com.february.common.domain.VehicleType;
import java.util.List;
public interface TrajectoryService {
Result> realDateList();
- Result> carList();
+ Result> vehicleList();
+
+ Result> vehicleTypeList();
}
diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java
index e7ddd5d..7ce64e8 100644
--- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java
+++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java
@@ -4,8 +4,9 @@ package com.vehicle.trajectory.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.february.common.core.domain.Result;
-import com.february.common.domain.Car;
import com.february.common.domain.RealData;
+import com.february.common.domain.Vehicle;
+import com.february.common.domain.VehicleType;
import com.february.common.redis.service.RedisService;
import com.vehicle.trajectory.mapper.TrajectoryMapper;
import com.vehicle.trajectory.service.TrajectoryService;
@@ -29,24 +30,32 @@ public class TrajectoryServiceImpl implements TrajectoryService {
@Autowired
private RedisService redisService;
@Override
- public Result> carList() {
+ public Result> vehicleList() {
Boolean aBoolean = redisService.hasKey("状态为上线的车辆信息");//查询redis中是否有此键
if (Boolean.TRUE.equals(aBoolean)){
List