diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/api/req/VehicleConnectionReq.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/api/req/VehicleConnectionReq.java index 4dc38c2..296c035 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/api/req/VehicleConnectionReq.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/api/req/VehicleConnectionReq.java @@ -1,5 +1,6 @@ package com.muyu.car.domain.api.req; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -31,7 +32,8 @@ public class VehicleConnectionReq { /** * vin */ - private String vin; + @JSONField(name = "vehicleVin") + private String vehicleVin; /** * 时间戳 */ @@ -39,10 +41,15 @@ public class VehicleConnectionReq { /** * 用户名 */ - private String userName; + @JSONField(name = "username") + private String username; /** * 随机字符串 */ private String nonce; + /** + * 密码 + */ + private String password; } diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/VehicleInformation.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/VehicleInformation.java deleted file mode 100644 index 1546865..0000000 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/VehicleInformation.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.muyu.car.gateway.controller; - -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 车辆信息接口 - * @Author:蓬叁 - * @Package:com.muyu.car.gateway.controller - * @Project:cloud-server-8 - * @name:VehicleInformation - * @Date:2024/10/4 上午9:40 - */ -@RestController -@RequestMapping("/vehicle") -public class VehicleInformation { - -// @PostMapping("/") - -} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/impl/VehicleInformationServiceImpl.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/impl/VehicleInformationServiceImpl.java index 80cad24..ed34e74 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/impl/VehicleInformationServiceImpl.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/impl/VehicleInformationServiceImpl.java @@ -38,7 +38,7 @@ public class VehicleInformationServiceImpl implements VehicleInformationService{ log.info("车辆无法重复预上线"); } - return new MqttServerModel("tcp://47.97.2.212:1883","vehicle"); + return new MqttServerModel("tcp://121.199.172.3:1883","vehicle"); } } diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java index 737feca..e9e3fb4 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java @@ -45,7 +45,7 @@ public class GenerateInstance implements ApplicationRunner { // 设置地域ID .setRegionId("cn-hangzhou") // 设置镜像ID - .setImageId("m-bp10rcc4nsihqfoz0w7s") + .setImageId("m-bp1hkxfctk751s62jqhq") // 设置实例类型 .setInstanceType("ecs.t6-c1m1.large") // 设置安全组ID @@ -65,7 +65,7 @@ public class GenerateInstance implements ApplicationRunner { // 设置实例密码 .setPassword("EightGroup123.") // 设置创建实例的数量 - .setAmount(2); + .setAmount(1); com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); try { diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/QueryInstance.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/QueryInstance.java index ffaaf8a..21d562a 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/QueryInstance.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/QueryInstance.java @@ -28,7 +28,6 @@ public class QueryInstance { .setInstanceIds(JSON.toJSONString(instanceIds)) .setRegionId("cn-hangzhou"); - com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); try { diff --git a/cloud-modules/cloud-modules-carData/pom.xml b/cloud-modules/cloud-modules-carData/pom.xml index 991a9f7..5388022 100644 --- a/cloud-modules/cloud-modules-carData/pom.xml +++ b/cloud-modules/cloud-modules-carData/pom.xml @@ -13,10 +13,6 @@ cloud-modules-carData - - 数据处理模块 - - 17 17