From 3d83df91b521d11d483f54313421b7b4ac279475 Mon Sep 17 00:00:00 2001 From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com> Date: Tue, 16 Apr 2024 10:26:12 +0800 Subject: [PATCH] asdas --- .idea/misc.xml | 9 +++ .../com/muyu/config/RestClientConfig.java | 23 +++++++ .../impl/VehicleInstanceServiceImpl.java | 26 ++++--- src/main/resources/application.yml | 4 +- src/main/resources/package.json | 6 ++ src/test/java/com/AdminTest.java | 68 +++++++++---------- 6 files changed, 91 insertions(+), 45 deletions(-) create mode 100644 src/main/java/com/muyu/config/RestClientConfig.java create mode 100644 src/main/resources/package.json diff --git a/.idea/misc.xml b/.idea/misc.xml index 4731638..8f21fc3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,12 @@ + + \ No newline at end of file diff --git a/src/main/java/com/muyu/config/RestClientConfig.java b/src/main/java/com/muyu/config/RestClientConfig.java new file mode 100644 index 0000000..1c60122 --- /dev/null +++ b/src/main/java/com/muyu/config/RestClientConfig.java @@ -0,0 +1,23 @@ +package com.muyu.config;//package com.muyu.business.domain.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +/** + * @ProjectName: cloud-vehicles + * @PackageName: com.muyu.system.common.domain.config + * @Description TODO + * @Author XiaoFan + * @Date 2024/4/2 19:37 + * @Version 1.0 + */ +@Configuration +public class RestClientConfig { + @Bean + public RestTemplate restTemplate(){ + return new RestTemplate(); + } + + +} diff --git a/src/main/java/com/muyu/service/impl/VehicleInstanceServiceImpl.java b/src/main/java/com/muyu/service/impl/VehicleInstanceServiceImpl.java index 5ab2368..0f5e564 100644 --- a/src/main/java/com/muyu/service/impl/VehicleInstanceServiceImpl.java +++ b/src/main/java/com/muyu/service/impl/VehicleInstanceServiceImpl.java @@ -24,7 +24,9 @@ import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; +import javax.servlet.http.HttpServletRequest; import java.util.Comparator; import java.util.List; import java.util.UUID; @@ -42,6 +44,8 @@ public class VehicleInstanceServiceImpl implements VehicleInstanceService { @Autowired private PositionRouteService positionRouteService; + @Autowired + private RestTemplate restTemplate; @Autowired private ClientAdmin clientAdmin; @@ -79,7 +83,6 @@ public class VehicleInstanceServiceImpl implements VehicleInstanceService { if (vehicleInstanceListReq.isOnline()){ stream = stream.sorted(Comparator.comparingInt(o -> (o.isOnline() ? 0 : 1))); } - return PageList.builder() .total(LocalContainer.total()) .rows( @@ -111,15 +114,20 @@ public class VehicleInstanceServiceImpl implements VehicleInstanceService { .userName(MD5Util.encrypted(vin+timestamp)) .nonce(MD5Util.encrypted(UUID.randomUUID().toString().replace("-", ""))) .build(); - Result result = clientAdmin.vehicleConnection(connectionReq); - if (result.getCode() != 200){ - log.error("车辆：[{}]，申请上线异常：[{}]", vin, result.getMsg()); - throw new RuntimeException("远程服务器没有【"+vin+"】车辆"); - } - MqttServerModel mqttServerModel = result.getData(); +// Result result = clientAdmin.vehicleConnection(connectionReq); +// if (result.getCode() != 200){ +// log.error("车辆：[{}]，申请上线异常：[{}]", vin, result.getMsg()); +// throw new RuntimeException("远程服务器没有【"+vin+"】车辆"); +// } + String url = "http://localhost:8080/load"; + Result result = restTemplate.postForObject(url, null, Result.class); + log.info(result.getData()); + +// MqttServerModel mqttServerModel = result.getData(); +// String ip ="tcp://"++":1883"; MqttProperties mqttProperties = MqttProperties.builder() - .broker(mqttServerModel.getBroker()) - .topic(mqttServerModel.getTopic()) + .broker("tcp://"+result.getData()+":1883") +// .topic(mqttServerModel.getTopic()) .clientId(vin) .username(connectionReq.getUserName()) .password(vin + connectionReq.getTimestamp() + connectionReq.getNonce()) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b9792f4..bac0133 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -86,8 +86,8 @@ forest: # 服务器配置 mqtt: server: - host: tcp://fluxmq.muyu.icu:1883 - topic: test1 + host: tcp://47.103.100.132:1883 + topic: xiaoYao admin: host: http://127.0.0.1:${server.port} topic-uri: /verify/vehicleConnection diff --git a/src/main/resources/package.json b/src/main/resources/package.json new file mode 100644 index 0000000..84d61aa --- /dev/null +++ b/src/main/resources/package.json @@ -0,0 +1,6 @@ +{ + "name": "resources", + "version": "1.0.0", + "dependencies": { + } +} diff --git a/src/test/java/com/AdminTest.java b/src/test/java/com/AdminTest.java index 7f6cf1e..7532a16 100644 --- a/src/test/java/com/AdminTest.java +++ b/src/test/java/com/AdminTest.java @@ -1,34 +1,34 @@ -package com; - -import com.muyu.VehicleSimulationApplication; -import com.muyu.common.Result; -import com.muyu.vehicle.api.ClientAdmin; -import com.muyu.vehicle.api.req.VehicleConnectionReq; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * @author DongZl - * @description: - * @Date 2023-11-28 上午 10:36 - */ -@SpringBootTest(classes = VehicleSimulationApplication.class) -public class AdminTest { - - @Autowired - private ClientAdmin clientAdmin; - - @Test - public void vehicleConnTest(){ - Result result = clientAdmin.vehicleConnection( - VehicleConnectionReq.builder() - .vin("VIN1234567894") - .timestamp(String.valueOf(System.currentTimeMillis())) - .userName("156841600") - .nonce("134812") - .build() - ); - System.out.println(result); - } -} +//package com; +// +//import com.muyu.VehicleSimulationApplication; +//import com.muyu.common.Result; +//import com.muyu.vehicle.api.ClientAdmin; +//import com.muyu.vehicle.api.req.VehicleConnectionReq; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +// +///** +// * @author DongZl +// * @description: +// * @Date 2023-11-28 上午 10:36 +// */ +//@SpringBootTest(classes = VehicleSimulationApplication.class) +//public class AdminTest { +// +// @Autowired +// private ClientAdmin clientAdmin; +// +// @Test +// public void vehicleConnTest(){ +// Result result = clientAdmin.vehicleConnection( +// VehicleConnectionReq.builder() +// .vin("VIN1234567894") +// .timestamp(String.valueOf(System.currentTimeMillis())) +// .userName("156841600") +// .nonce("134812") +// .build() +// ); +// System.out.println(result); +// } +//}