From c438b54222c1dfac967ea3ff8e44f412e69df218 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Thu, 30 Nov 2023 16:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=B5=8B=E8=AF=95=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=88=86=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/controller/VehicleController.java    |  1 +
 .../controller/VehicleInstanceController.java |  2 +-
 .../controller/VehiclePositionController.java |  2 +-
 .../com/muyu/controller/VerifyController.java | 25 +++++++++++++++++++
 src/main/java/com/muyu/vehicle/Test.java      | 12 +++++----
 src/main/resources/application.yml            |  8 +++---
 6 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/muyu/controller/VerifyController.java

diff --git a/src/main/java/com/muyu/controller/VehicleController.java b/src/main/java/com/muyu/controller/VehicleController.java
index e120722..36f0e76 100644
--- a/src/main/java/com/muyu/controller/VehicleController.java
+++ b/src/main/java/com/muyu/controller/VehicleController.java
@@ -18,6 +18,7 @@ import java.util.List;
  * @date 2023/11/9
  */
 @RestController
+@RequestMapping("/vehicle")
 public class VehicleController {
 
     @Autowired
diff --git a/src/main/java/com/muyu/controller/VehicleInstanceController.java b/src/main/java/com/muyu/controller/VehicleInstanceController.java
index 0d1bd46..ba6439f 100644
--- a/src/main/java/com/muyu/controller/VehicleInstanceController.java
+++ b/src/main/java/com/muyu/controller/VehicleInstanceController.java
@@ -22,7 +22,7 @@ import java.util.List;
  */
 @Log4j2
 @RestController
-@RequestMapping("/instance")
+@RequestMapping("/vehicle/instance")
 public class VehicleInstanceController {
 
     @Autowired
diff --git a/src/main/java/com/muyu/controller/VehiclePositionController.java b/src/main/java/com/muyu/controller/VehiclePositionController.java
index e4e8aed..f3282c4 100644
--- a/src/main/java/com/muyu/controller/VehiclePositionController.java
+++ b/src/main/java/com/muyu/controller/VehiclePositionController.java
@@ -16,7 +16,7 @@ import java.util.List;
  * @Date 2023-11-27 上午 10:50
  */
 @RestController
-@RequestMapping("/position")
+@RequestMapping("/vehicle/position")
 public class VehiclePositionController {
 
     @Autowired
diff --git a/src/main/java/com/muyu/controller/VerifyController.java b/src/main/java/com/muyu/controller/VerifyController.java
new file mode 100644
index 0000000..6dd6b8f
--- /dev/null
+++ b/src/main/java/com/muyu/controller/VerifyController.java
@@ -0,0 +1,25 @@
+package com.muyu.controller;
+
+import com.muyu.common.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author DongZl
+ * @description: 车辆上线默认类
+ * @Date 2023-11-30 下午 02:59
+ */
+@RestController
+@RequestMapping("/verify")
+public class VerifyController {
+
+    /**
+     * 新增车辆默认上线主题
+     * @return 默认返回test
+     */
+    @PostMapping("/vehicleConnection")
+    public Result<String> vehicleConnection(){
+        return Result.success("test");
+    }
+}
diff --git a/src/main/java/com/muyu/vehicle/Test.java b/src/main/java/com/muyu/vehicle/Test.java
index b7e7ad2..2191566 100644
--- a/src/main/java/com/muyu/vehicle/Test.java
+++ b/src/main/java/com/muyu/vehicle/Test.java
@@ -3,6 +3,7 @@ package com.muyu.vehicle;
 import com.alibaba.fastjson2.JSONArray;
 import com.muyu.domain.Vehicle;
 import com.muyu.domain.model.PositionModel;
+import com.muyu.utils.VehicleUtils;
 import com.muyu.vehicle.core.LocalContainer;
 import com.muyu.vehicle.model.VehicleData;
 import com.muyu.vehicle.model.properties.MqttProperties;
@@ -27,7 +28,7 @@ public class Test {
 
     private static MqttProperties mqttProperties = MqttProperties.builder()
             .broker("tcp://fluxmq.muyu.icu:1883")
-            .topic("test")
+            .topic("mqttAA")
             .username("123456")
             .password("AJLJWIEJLASDJOWQES")
             .build();
@@ -36,10 +37,10 @@ public class Test {
         log.info("开始生成VIN");
         long genVinStartTime = System.currentTimeMillis();
         List<String> list = new ArrayList<>();
-        list.add("VIN12345678912345");
-//        for (int i = 0; i < 10; i++) {
-//            list.add(VehicleUtils.genVin());
-//        }
+//        list.add("VIN12345678912345");
+        for (int i = 0; i < 100; i++) {
+            list.add(VehicleUtils.genVin());
+        }
         log.info("生成VIN结束：[{}MS]", System.currentTimeMillis()-genVinStartTime);
         log.info("开始创建车辆");
         long initVehicleStartTime = System.currentTimeMillis();
@@ -47,6 +48,7 @@ public class Test {
         log.info("创建车辆结束：[{}MS]", System.currentTimeMillis()-initVehicleStartTime);
         list.forEach(vin -> {
             VehicleInstance vehicleIns = LocalContainer.getVehicleInstance(vin);
+            vehicleIns.setPositionCode("123");
             vehicleIns.initVehicleThread();
             vehicleIns.startSend();
         });
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 309ed44..9e14c5e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,5 @@
 server:
   port: 81
-  servlet:
-    context-path: /vehicle
 spring:
   datasource:
     username: muyu
@@ -76,11 +74,11 @@ forest:
   variables:
     adminHost: ${mqtt.admin.host}
     adminTopicUri: ${mqtt.admin.topic-uri}
-    
+
 # 服务器配置
 mqtt:
   server:
-    host: tcp://47.99.149.28:1883
+    host: tcp://fluxmq.muyu.icu:1883
   admin:
-    host: http://47.120.48.139:9000
+    host: http://127.0.0.1:${server.port}
     topic-uri: /verify/vehicleConnection