方便测试,增加默认分区

master
DongZeLiang 2023-11-30 16:48:38 +08:00
parent a9246688b2
commit c438b54222
6 changed files with 38 additions and 12 deletions

View File

@ -18,6 +18,7 @@ import java.util.List;
* @date 2023/11/9
*/
@RestController
@RequestMapping("/vehicle")
public class VehicleController {
@Autowired

View File

@ -22,7 +22,7 @@ import java.util.List;
*/
@Log4j2
@RestController
@RequestMapping("/instance")
@RequestMapping("/vehicle/instance")
public class VehicleInstanceController {
@Autowired

View File

@ -16,7 +16,7 @@ import java.util.List;
* @Date 2023-11-27 10:50
*/
@RestController
@RequestMapping("/position")
@RequestMapping("/vehicle/position")
public class VehiclePositionController {
@Autowired

View File

@ -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");
}
}

View File

@ -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();
});

View File

@ -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