diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/Aliyun/AliYunConfig.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/AliYunConfig.java similarity index 93% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/Aliyun/AliYunConfig.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/AliYunConfig.java index 489a044..6848146 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/Aliyun/AliYunConfig.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/AliYunConfig.java @@ -1,8 +1,8 @@ -package com.muyu.cargateway.Aliyun; +package com.muyu.car.gateway.Aliyun; import com.aliyun.ecs20140526.Client; import com.aliyun.teaopenapi.models.Config; -import com.muyu.cargateway.config.AliProperties; +import com.muyu.car.gateway.config.AliProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/instance/DeleteSample.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/instance/DeleteSample.java similarity index 89% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/instance/DeleteSample.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/instance/DeleteSample.java index d7cd031..eb1f35b 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/instance/DeleteSample.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/instance/DeleteSample.java @@ -1,6 +1,6 @@ -package com.muyu.cargateway.instance; +package com.muyu.car.gateway.Aliyun.instance; -import com.muyu.cargateway.Aliyun.service.AliYunEcsService; +import com.muyu.car.gateway.Aliyun.service.AliYunEcsService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/instance/Sample.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/instance/Sample.java similarity index 72% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/instance/Sample.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/instance/Sample.java index ecf2176..9e796ac 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/instance/Sample.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/instance/Sample.java @@ -1,9 +1,8 @@ -package com.muyu.cargateway.instance; +package com.muyu.car.gateway.Aliyun.instance; -import com.muyu.cargateway.Aliyun.service.AliYunEcsService; -import com.muyu.cargateway.config.AliProperties; -import com.muyu.cargateway.domain.AliInstance; -import com.muyu.common.redis.service.RedisService; +import com.muyu.car.gateway.Aliyun.service.AliYunEcsService; +import com.muyu.car.gateway.config.AliProperties; +import com.muyu.car.gateway.domain.AliInstance; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; @@ -28,8 +27,6 @@ public class Sample implements ApplicationRunner{ private AliYunEcsService aliYunEcsService; @Autowired private AliProperties aliProperties; - @Autowired - private RedisService redisService; @Override public void run(ApplicationArguments args) throws Exception { @@ -42,17 +39,14 @@ public class Sample implements ApplicationRunner{ throw new RuntimeException(e); } log.info("创建实例成功"); - redisService.setCacheList("instanceIds", list); +// redisService.setCacheList("instanceIds", list); try { - Thread.sleep(6000); + Thread.sleep(9000); } catch (InterruptedException e) { throw new RuntimeException(e); } List aliInstances = aliYunEcsService.selectInstance(list); - log.info("查询实例信息成功：{}",aliInstances); - // 将查询到的实例信息列表存储到Redis中 - redisService.setCacheList("instanceList", aliInstances); - log.info("redis存储成功：{}", aliInstances); + log.info("================查询实例信息成功：{}",aliInstances); } // @Override diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/Aliyun/service/AliYunEcsService.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/service/AliYunEcsService.java similarity index 92% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/Aliyun/service/AliYunEcsService.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/service/AliYunEcsService.java index 2f0fb62..8d704a4 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/Aliyun/service/AliYunEcsService.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/Aliyun/service/AliYunEcsService.java @@ -1,11 +1,11 @@ -package com.muyu.cargateway.Aliyun.service; +package com.muyu.car.gateway.Aliyun.service; import com.aliyun.ecs20140526.Client; import com.aliyun.ecs20140526.models.*; import com.aliyun.tea.TeaException; import com.aliyun.teautil.models.RuntimeOptions; -import com.muyu.cargateway.config.AliProperties; -import com.muyu.cargateway.domain.AliInstance; +import com.muyu.car.gateway.domain.AliInstance; +import com.muyu.car.gateway.config.AliProperties; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.redis.service.RedisService; import lombok.extern.log4j.Log4j2; @@ -49,11 +49,9 @@ public class AliYunEcsService { * @return 实例id集合 */ public List generateInstance(Integer amount) { - redisService.deleteObject("instanceIds"); - redisService.deleteObject("instanceList"); - redisService.deleteObject("ipList"); - redisService.deleteObject("count"); - redisService.deleteObject("vinIp"); + redisService.deleteObject("oneIpList"); + redisService.deleteObject("oneCount"); + redisService.deleteObject("oneVinIp"); // 检查生成实例的数量是否有效 if (amount == null || amount <= 0) { throw new ServiceException("生成数量不能小于1"); @@ -140,20 +138,25 @@ public class AliYunEcsService { for (DescribeInstancesResponseBody.DescribeInstancesResponseBodyInstancesInstance bodyInstance : instance) { // 实例id String instanceId = bodyInstance.getInstanceId(); - log.info("实例id为：{}", instanceId); // ip地址 String ipAddress = bodyInstance.getPublicIpAddress().getIpAddress().get(0); - log.info("实例ip为：{}", ipAddress); - stringArrayList.add(ipAddress); - // 实例状态 String status = bodyInstance.getStatus(); - log.info("实例状态为：{}", status); + + log.info("=======================实例id为：{}", instanceId); + log.info("=======================实例ip为：{}", ipAddress); + log.info("=======================实例状态为：{}", status); + + + stringArrayList.add(ipAddress); AliInstance aliInstance = new AliInstance(instanceId, ipAddress, status); aliInstances.add(aliInstance); + redisService.setCacheList(instanceId, aliInstances); + aliInstances.remove(aliInstance); + } log.info("======================ipList：{}", stringArrayList); - redisService.setCacheList("ipList", stringArrayList); + redisService.setCacheList("oneIpList", stringArrayList); log.info("查询成功"); } catch (Exception e) { log.error("查询服务器实例错误：[{}]", e.getMessage(), e); diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/CarGatewayApplication.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/CarGatewayApplication.java similarity index 95% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/CarGatewayApplication.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/CarGatewayApplication.java index bce08e8..f360231 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/CarGatewayApplication.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/CarGatewayApplication.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway; +package com.muyu.car.gateway; import com.muyu.common.security.annotation.EnableCustomConfig; import lombok.extern.log4j.Log4j2; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/config/AliProperties.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/config/AliProperties.java similarity index 96% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/config/AliProperties.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/config/AliProperties.java index c0ff543..b1148a9 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/config/AliProperties.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/config/AliProperties.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.config; +package com.muyu.car.gateway.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/config/RabbitmqConfig.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/config/RabbitmqConfig.java similarity index 98% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/config/RabbitmqConfig.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/config/RabbitmqConfig.java index 734b37f..25435f9 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/config/RabbitmqConfig.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/config/RabbitmqConfig.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.config; +package com.muyu.car.gateway.config; import lombok.extern.log4j.Log4j2; import org.slf4j.Logger; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/controller/CarOneClickOperationController.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/CarOneClickOperationController.java similarity index 83% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/controller/CarOneClickOperationController.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/CarOneClickOperationController.java index 54ffd3c..822008f 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/controller/CarOneClickOperationController.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/CarOneClickOperationController.java @@ -1,8 +1,8 @@ -package com.muyu.cargateway.controller; +package com.muyu.car.gateway.controller; -import com.muyu.cargateway.domain.model.MqttServerModel; -import com.muyu.cargateway.domain.req.VehicleConnectionReq; -import com.muyu.cargateway.service.CarOneClickOperationService; +import com.muyu.car.gateway.domain.req.VehicleConnectionReq; +import com.muyu.car.gateway.service.CarOneClickOperationService; +import com.muyu.car.gateway.domain.model.MqttServerModel; import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/AliInstance.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/AliInstance.java similarity index 93% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/AliInstance.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/AliInstance.java index eb1b4ae..4c61dcc 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/AliInstance.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/AliInstance.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain; +package com.muyu.car.gateway.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/AliServerConfig.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/AliServerConfig.java similarity index 95% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/AliServerConfig.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/AliServerConfig.java index b6d545a..a34b3eb 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/AliServerConfig.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/AliServerConfig.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain; +package com.muyu.car.gateway.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/ConnectWeight.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/ConnectWeight.java similarity index 92% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/ConnectWeight.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/ConnectWeight.java index efd0076..c8a7389 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/ConnectWeight.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/ConnectWeight.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain; +package com.muyu.car.gateway.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/HttpStatus.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/HttpStatus.java similarity index 97% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/HttpStatus.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/HttpStatus.java index 8665adb..ef5db8d 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/HttpStatus.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/HttpStatus.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain; +package com.muyu.car.gateway.domain; /** * 返回状态码 diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/ServerConfig.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/ServerConfig.java similarity index 96% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/ServerConfig.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/ServerConfig.java index 6628de0..38b34de 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/ServerConfig.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/ServerConfig.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain; +package com.muyu.car.gateway.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/VehicleConnection.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/VehicleConnection.java similarity index 94% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/VehicleConnection.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/VehicleConnection.java index 819d48e..6030dd8 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/VehicleConnection.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/VehicleConnection.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain; +package com.muyu.car.gateway.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/VinIp.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/VinIp.java similarity index 91% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/VinIp.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/VinIp.java index 7d37381..e2ad14d 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/VinIp.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/VinIp.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain; +package com.muyu.car.gateway.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/model/MqttServerModel.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/model/MqttServerModel.java similarity index 91% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/model/MqttServerModel.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/model/MqttServerModel.java index 17181d1..c76292d 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/model/MqttServerModel.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/model/MqttServerModel.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain.model; +package com.muyu.car.gateway.domain.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/properties/MqttProperties.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/properties/MqttProperties.java similarity index 93% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/properties/MqttProperties.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/properties/MqttProperties.java index f848275..7af69a7 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/properties/MqttProperties.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/properties/MqttProperties.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain.properties; +package com.muyu.car.gateway.domain.properties; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/req/VehicleConnectionReq.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/req/VehicleConnectionReq.java similarity index 93% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/req/VehicleConnectionReq.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/req/VehicleConnectionReq.java index 3101fac..842fa2d 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/req/VehicleConnectionReq.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/req/VehicleConnectionReq.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain.req; +package com.muyu.car.gateway.domain.req; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/resp/AliServerConfig.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/resp/AliServerConfig.java similarity index 94% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/resp/AliServerConfig.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/resp/AliServerConfig.java index ded0cc8..51a70fb 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/resp/AliServerConfig.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/domain/resp/AliServerConfig.java @@ -1,4 +1,4 @@ -package com.muyu.cargateway.domain.resp; +package com.muyu.car.gateway.domain.resp; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/mapper/CarOneClickOperationMapper.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/mapper/CarOneClickOperationMapper.java similarity index 71% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/mapper/CarOneClickOperationMapper.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/mapper/CarOneClickOperationMapper.java index 8ca2ce8..66e0ca3 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/mapper/CarOneClickOperationMapper.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/mapper/CarOneClickOperationMapper.java @@ -1,6 +1,6 @@ -package com.muyu.cargateway.mapper; +package com.muyu.car.gateway.mapper; -import com.muyu.cargateway.domain.VehicleConnection; +import com.muyu.car.gateway.domain.VehicleConnection; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -19,6 +19,8 @@ public interface CarOneClickOperationMapper { List selectByVehicleVin(String vehicleVin); - List selectVin(); + + List getMqttServerModel(String vehicleVin); + } diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/service/CarOneClickOperationService.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/CarOneClickOperationService.java similarity index 74% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/service/CarOneClickOperationService.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/CarOneClickOperationService.java index e2deaa9..3f20de1 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/service/CarOneClickOperationService.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/CarOneClickOperationService.java @@ -1,7 +1,7 @@ -package com.muyu.cargateway.service; +package com.muyu.car.gateway.service; -import com.muyu.cargateway.domain.model.MqttServerModel; -import com.muyu.cargateway.domain.req.VehicleConnectionReq; +import com.muyu.car.gateway.domain.model.MqttServerModel; +import com.muyu.car.gateway.domain.req.VehicleConnectionReq; import com.muyu.common.core.domain.Result; /** diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/service/Impl/CarOneClickOperationServiceImpl.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/Impl/CarOneClickOperationServiceImpl.java similarity index 51% rename from cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/service/Impl/CarOneClickOperationServiceImpl.java rename to cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/Impl/CarOneClickOperationServiceImpl.java index a24f1cf..704cb9f 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/service/Impl/CarOneClickOperationServiceImpl.java +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/Impl/CarOneClickOperationServiceImpl.java @@ -1,11 +1,12 @@ -package com.muyu.cargateway.service.Impl; +package com.muyu.car.gateway.service.Impl; -import com.muyu.cargateway.domain.VehicleConnection; -import com.muyu.cargateway.domain.VinIp; -import com.muyu.cargateway.domain.model.MqttServerModel; -import com.muyu.cargateway.domain.req.VehicleConnectionReq; -import com.muyu.cargateway.mapper.CarOneClickOperationMapper; -import com.muyu.cargateway.service.CarOneClickOperationService; +import com.muyu.car.gateway.domain.VehicleConnection; +import com.muyu.car.gateway.domain.VinIp; +import com.muyu.car.gateway.domain.model.MqttServerModel; +import com.muyu.car.gateway.domain.properties.MqttProperties; +import com.muyu.car.gateway.domain.req.VehicleConnectionReq; +import com.muyu.car.gateway.mapper.CarOneClickOperationMapper; +import com.muyu.car.gateway.service.CarOneClickOperationService; import com.muyu.common.core.domain.Result; import com.muyu.common.redis.service.RedisService; import lombok.extern.log4j.Log4j2; @@ -15,6 +16,11 @@ import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.util.List; + +import static com.muyu.car.gateway.config.RabbitmqConfig.EXCHANGE_TOPICS_INFORM; +import static com.muyu.car.gateway.config.RabbitmqConfig.ROUTINGKEY_SMS; + /** * @ Tool：IntelliJ IDEA * @ Author：CHX @@ -45,10 +51,9 @@ public class CarOneClickOperationServiceImpl implements CarOneClickOperationServ public Result getConnect(VehicleConnectionReq vehicleConnectionReq) { log.info("车辆连接请求:{}",vehicleConnectionReq.toString()); - // 使用交换机发送消息 - rabbitTemplate.convertAndSend("exchange_topics_inform","inform.#.email.#",vehicleConnectionReq.getVehicleVin()); - log.info("发送消息成功:{}",vehicleConnectionReq.getVehicleVin()); - +// // 使用交换机发送消息 给事件系统发 +// rabbitTemplate.convertAndSend("exchange_topics_inform","inform.#.email.#",vehicleConnectionReq.getVehicleVin()); +// log.info("发送消息成功:{}",vehicleConnectionReq.getVehicleVin()); VehicleConnection vehicleConnection = new VehicleConnection(); //车辆vin @@ -57,44 +62,67 @@ public class CarOneClickOperationServiceImpl implements CarOneClickOperationServ vehicleConnection.setUsername(vehicleConnectionReq.getUsername()); //密码(vin+时间戳+随机数) vehicleConnection.setPassword(vehicleConnectionReq.getVehicleVin()+vehicleConnectionReq.getTimestamp()+vehicleConnectionReq.getNonce()); - //添加连接信息 - carOneClickOperationMapper.addConnect(vehicleConnection); + //查询有没有这辆车的vin码 + List selectVehicle = carOneClickOperationMapper.selectByVehicleVin(vehicleConnectionReq.getVehicleVin()); + + if(selectVehicle.isEmpty()){ + //添加连接信息 + carOneClickOperationMapper.addConnect(vehicleConnection); + log.info("车辆上线成功"); + }else { + throw new RuntimeException("车辆无法重复上线"); + + } //先判断vin码 HashOperations hashOps = redisTemplate.opsForHash(); - String vinIp = hashOps.get("vinIp", vehicleConnectionReq.getVehicleVin()); + String vinIp = hashOps.get("oneVinIp", vehicleConnectionReq.getVehicleVin()); if(vinIp!=null){ - log.info("车辆绑定ip失败，已经存在"); throw new RuntimeException("车辆绑定ip失败，已经存在"); } - + MqttProperties mqttProperties = new MqttProperties(); + List vehicleVin = selectByVehicleVin(vehicleConnectionReq.getVehicleVin()); + for (VehicleConnection connection : vehicleVin) { + mqttProperties.setClientId(connection.getVehicleVin()); + mqttProperties.setUserName(connection.getUsername()); + mqttProperties.setPassword(connection.getPassword()); + } + mqttProperties.setTopic("vehicle"); + mqttProperties.setQos(0); //判断redis有没有count键 - if(redisTemplate.hasKey("count")){ + if(redisTemplate.hasKey("oneCount")){ //取出count - Integer count = Integer.valueOf(redisTemplate.opsForValue().get("count")); + Integer count = Integer.valueOf(redisTemplate.opsForValue().get("oneCount")); if(count == 1){ - redisTemplate.opsForValue().set("count",String.valueOf(0)); + redisTemplate.opsForValue().set("oneCount",String.valueOf(0)); }else { - redisTemplate.opsForValue().set("count",String.valueOf(count+1)); + redisTemplate.opsForValue().set("oneCount",String.valueOf(count+1)); } //根据游标count获取服务IP // String ip = redisTemplate.opsForList().index("ipList", count); - Object ipList = redisService.redisTemplate.opsForList().index("ipList", count); + Object ipList = redisService.redisTemplate.opsForList().index("oneIpList", count); - log.info("=========================ipList:"+ipList); + log.info("=========================oneIpList:"+ipList); //关联车辆和服务 this.addIpAddress(new VinIp(vehicleConnectionReq.getVehicleVin(),ipList.toString())); //响应信息 log.info("车辆:{}",vehicleConnectionReq.getVehicleVin()+"绑定成功:{}",ipList); + mqttProperties.setBroker("tcp://"+ipList+":1883"); + // 使用交换机发送消息 + rabbitTemplate.convertAndSend(EXCHANGE_TOPICS_INFORM,ROUTINGKEY_SMS,mqttProperties); + log.info("============================发送消息成功:{}",mqttProperties); return Result.success(new MqttServerModel("tcp://"+ipList+":1883","vehicle")); - }else { - redisTemplate.opsForValue().set("count",String.valueOf(0)); + redisTemplate.opsForValue().set("oneCount",String.valueOf(0)); //根据游标count获取服务器Ip - Object ipList = redisService.redisTemplate.opsForList().index("ipList", 0); + Object ipList = redisService.redisTemplate.opsForList().index("oneIpList", 0); //关联车辆和服务 this.addIpAddress(new VinIp(vehicleConnectionReq.getVehicleVin(),ipList.toString())); //响应信息 log.info("车辆:{}",vehicleConnectionReq.getVehicleVin(),"与:{}绑定成功",ipList); + mqttProperties.setBroker("tcp://"+ipList+":1883"); + // 使用交换机发送消息 + rabbitTemplate.convertAndSend(EXCHANGE_TOPICS_INFORM,ROUTINGKEY_SMS,mqttProperties); + log.info("============================发送消息成功:{}",mqttProperties); return Result.success(new MqttServerModel("tcp://"+ipList+":1883","vehicle")); } } @@ -105,6 +133,15 @@ public class CarOneClickOperationServiceImpl implements CarOneClickOperationServ if (vinIp == null || vinIp.getVin() == null || vinIp.getVin().isEmpty() || vinIp.getIp() == null || vinIp.getIp().isEmpty()) { throw new IllegalArgumentException("vin 或 ip 不能为空或无效"); } - redisTemplate.opsForHash().put("vinIp", vinIp.getVin(), vinIp.getIp()); + redisTemplate.opsForHash().put("oneVinIp", vinIp.getVin(), vinIp.getIp()); + } + + /** + * 查询车辆绑定的服务器信息 + * @param vehicleVin 车辆vin码集合 + * @return + */ + public List selectByVehicleVin(String vehicleVin) { + return carOneClickOperationMapper.getMqttServerModel(vehicleVin); } } diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/model/TaskModel.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/model/TaskModel.java deleted file mode 100644 index f4ea58c..0000000 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/domain/model/TaskModel.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.muyu.cargateway.domain.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.extern.log4j.Log4j2; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-26-20:23 - * @ Version：1.0 - * @ Description：任务执行模型 - * @author Lenovo - */ -@Data -@Log4j2 -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class TaskModel { - /** - * 任务状态 默认为false状态 - * true为执行中，false为未执行 - */ - private final AtomicBoolean status =new AtomicBoolean(Boolean.FALSE); - /** - * 堵塞计数器 - */ - private CountDownLatch countDownLatch; - /** - * 任务执行堵塞队列 - */ - private LinkedBlockingDeque carQueue =new LinkedBlockingDeque<>(); - /** - * 任务是否执行 - * true 执行中 - * false 未执行 - * @return 是否有任务执行 - */ - private boolean isExecution(){ - return !status.get(); - } - /** - * 任务名称 - */ - private String taskName; - /** - * 任务执行次数 - */ - private Integer taskExecutionCount=0; - /** - * 任务开始时间 - */ - private Long taskStartTime; - /** - * 任务成功执行次数 - */ - private AtomicInteger taskSuccessSum=new AtomicInteger(); - /** - * 任务执行失败次数 - */ - private AtomicInteger taskErrorSum=new AtomicInteger(); - - /** - * 判断是否有任务 - * @return true 有任务 - */ - public boolean hashNext(){ - return !carQueue.isEmpty(); - } - - /** - * 获取下一个任务节点 - * @return 任务VIN - */ - public String next(){ - return carQueue.poll(); - } - -} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/utils/ECSTool.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/utils/ECSTool.java deleted file mode 100644 index e96fac4..0000000 --- a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/cargateway/utils/ECSTool.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.muyu.cargateway.utils; - -import com.aliyun.ecs20140526.Client; -import com.aliyun.ecs20140526.models.DeleteInstanceRequest; -import com.aliyun.ecs20140526.models.DescribeInstancesRequest; -import com.aliyun.ecs20140526.models.DescribeInstancesResponse; -import com.aliyun.ecs20140526.models.RunInstancesRequest; -import com.aliyun.tea.TeaException; -import com.aliyun.teaopenapi.models.Config; -import com.aliyun.teautil.Common; -import com.aliyun.teautil.models.RuntimeOptions; -import lombok.extern.log4j.Log4j2; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-10-02-16:04 - * @ Version：1.0 - * @ Description：ecs实例工具类 - * @author Lenovo - */ -@Log4j2 -public class ECSTool { - - public static final String ACCESS_KEY_ID = "LTAI5tDH3FyRx4PRr6anx2TL"; - public static final String ACCESS_KEY_SECRET = "xdQnX2tDattY50raNkUWmHzE2tondP"; - - public static Client createClient() throws Exception { - // 工程代码泄露可能会导致 AccessKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考。 - Config config = new Config() - // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。 - .setAccessKeyId(ACCESS_KEY_ID) - // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。 - .setAccessKeySecret(ACCESS_KEY_SECRET); - // Endpoint 请参考 https://api.aliyun.com/product/Ecs - config.endpoint = "ecs-cn-hangzhou.aliyuncs.com"; - return new Client(config); - } - public static void runEcsInstance(String regionId, String launchTemplateId) throws Exception { - Client client = ECSTool.createClient(); - RunInstancesRequest request = new RunInstancesRequest(); - request.setRegionId(regionId) - .setLaunchTemplateId(launchTemplateId); - RuntimeOptions runtimeOptions = new RuntimeOptions(); - try{ - client.runInstancesWithOptions(request, runtimeOptions); - }catch (Exception error){ - // 处理API调用过程中出现的异常 - System.out.println(error.getMessage()); - if (error instanceof TeaException) { - // 处理特定类型的异常，如TeaException - TeaException teaError = (TeaException) error; - // 打印诊断推荐链接 - System.out.println(teaError.getData().get("Recommend")); - // 断言错误信息 - com.aliyun.teautil.Common.assertAsString(teaError.getMessage()); - } else { - // 处理其他类型的异常 - System.out.println(error.getMessage()); - } - } - } - - /** - *销毁实例 - */ - public static void runEcsRemove(String instanceId) throws Exception { - Client client = ECSTool.createClient(); - DeleteInstanceRequest deleteInstancesRequest = new DeleteInstanceRequest(); - deleteInstancesRequest.setInstanceId(instanceId); - RuntimeOptions runtimeOptions = new RuntimeOptions(); - - try { - // 复制代码运行请自行打印 API 的返回值 - client.deleteInstanceWithOptions(deleteInstancesRequest, runtimeOptions); - } catch (TeaException error) { - // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 - // 错误 message - System.out.println(error.getMessage()); - // 诊断地址 - System.out.println(error.getData().get("Recommend")); - com.aliyun.teautil.Common.assertAsString(error.message); - } catch (Exception _error) { - TeaException error = new TeaException(_error.getMessage(), _error); - // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 - // 错误 message - System.out.println(error.getMessage()); - // 诊断地址 - System.out.println(error.getData().get("Recommend")); - com.aliyun.teautil.Common.assertAsString(error.message); - } - } - - /** - * 查询实例列表 - * @param regionId 地域ID - */ - public static List findInstance(String regionId) throws Exception { - Client client = ECSTool.createClient(); - DescribeInstancesRequest describeInstancesRequest = new DescribeInstancesRequest(); - describeInstancesRequest.setRegionId(regionId); - RuntimeOptions runtimeOptions = new RuntimeOptions(); - List stringArrayList = new ArrayList<>(); - try { - DescribeInstancesResponse response = client.describeInstancesWithOptions(describeInstancesRequest, runtimeOptions); - List> ipListList = response.getBody().instances.getInstance().stream().map(instance -> instance.publicIpAddress.ipAddress).collect(Collectors.toList()); - for (List strings : ipListList) { - for (String ip : strings) { - stringArrayList.add(ip); - } - return stringArrayList; - } - } catch (TeaException error) { - // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 - // 错误 message - System.out.println(error.getMessage()); - // 诊断地址 - System.out.println(error.getData().get("Recommend")); - Common.assertAsString(error.message); - } catch (Exception _error) { - TeaException error = new TeaException(_error.getMessage(), _error); - // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 - // 错误 message - System.out.println(error.getMessage()); - // 诊断地址 - System.out.println(error.getData().get("Recommend")); - Common.assertAsString(error.message); - } - return null; - } -} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/resources/mapper/CarOneClickOperationMapper.xml b/cloud-modules/cloud-modules-car-gateway/src/main/resources/mapper/CarOneClickOperationMapper.xml index 2f06cdf..b40427b 100644 --- a/cloud-modules/cloud-modules-car-gateway/src/main/resources/mapper/CarOneClickOperationMapper.xml +++ b/cloud-modules/cloud-modules-car-gateway/src/main/resources/mapper/CarOneClickOperationMapper.xml @@ -2,7 +2,7 @@ - + @@ -14,8 +14,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select + vehicle_vin,user_name,password + from + car_one_click_operation + where + vehicle_vin = #{vehicleVin}