代码重构三次

dev.car.gateway
冷调 2024-10-09 12:10:26 +08:00
parent 51e7c2c0c0
commit 48916dce82
9 changed files with 70 additions and 21 deletions

View File

@ -51,6 +51,9 @@ public class AliYunEcsService {
public List<String> generateInstance(Integer amount) {
redisService.deleteObject("instanceIds");
redisService.deleteObject("instanceList");
redisService.deleteObject("ipList");
redisService.deleteObject("count");
redisService.deleteObject("vinIp");
// 检查生成实例的数量是否有效
if (amount == null || amount <= 0) {
throw new ServiceException("生成数量不能小于1");
@ -125,6 +128,7 @@ public class AliYunEcsService {
// 创建运行时选项对象,用于配置请求的额外参数
RuntimeOptions runtimeOptions = new RuntimeOptions();
List<AliInstance> aliInstances = new ArrayList<>();
List<String> stringArrayList = new ArrayList<>();
try {
// 发送请求并获取响应对象
DescribeInstancesResponse describeInstancesResponse = client.describeInstancesWithOptions(request, runtimeOptions);
@ -140,12 +144,16 @@ public class AliYunEcsService {
// ip地址
String ipAddress = bodyInstance.getPublicIpAddress().getIpAddress().get(0);
log.info("实例ip为{}", ipAddress);
stringArrayList.add(ipAddress);
// 实例状态
String status = bodyInstance.getStatus();
log.info("实例状态为:{}", status);
AliInstance aliInstance = new AliInstance(instanceId, ipAddress, status);
aliInstances.add(aliInstance);
}
log.info("======================ipList{}", stringArrayList);
redisService.setCacheList("ipList", stringArrayList);
log.info("查询成功");
} catch (Exception e) {
log.error("查询服务器实例错误:[{}]", e.getMessage(), e);

View File

@ -36,7 +36,7 @@ public class CarOneClickOperationController {
@PostMapping("/receiveMsg/connect")
public Result<MqttServerModel> receiveMsg(@RequestBody VehicleConnectionReq vehicleConnectionReq){
log.info(">"+vehicleConnectionReq);
MqttServerModel mqttServerModel =carOneClickOperationService.getConnect(vehicleConnectionReq);
return Result.success(mqttServerModel);
return carOneClickOperationService.getConnect(vehicleConnectionReq);
}
}

View File

@ -19,9 +19,9 @@ public class VinIp {
/**
* vin
*/
String vehicleVin;
String vin;
/**
* ip
*/
String ipAddress;
String ip;
}

View File

@ -26,4 +26,6 @@ public class MqttServerModel {
* MQTT
*/
private String topic;
}

View File

@ -18,4 +18,7 @@ public interface CarOneClickOperationMapper {
void addConnect(VehicleConnection vehicleConnection);
List<String> selectByVehicleVin(String vehicleVin);
List<String> selectVin();
}

View File

@ -2,6 +2,7 @@ package com.muyu.cargateway.service;
import com.muyu.cargateway.domain.model.MqttServerModel;
import com.muyu.cargateway.domain.req.VehicleConnectionReq;
import com.muyu.common.core.domain.Result;
/**
* @ ToolIntelliJ IDEA
@ -18,5 +19,5 @@ public interface CarOneClickOperationService {
* @param vehicleConnectionReq
* @return
*/
MqttServerModel getConnect(VehicleConnectionReq vehicleConnectionReq);
Result<MqttServerModel> getConnect(VehicleConnectionReq vehicleConnectionReq);
}

View File

@ -6,14 +6,15 @@ 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.common.core.domain.Result;
import com.muyu.common.redis.service.RedisService;
import lombok.extern.log4j.Log4j2;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @ ToolIntelliJ IDEA
* @ AuthorCHX
@ -28,11 +29,12 @@ public class CarOneClickOperationServiceImpl implements CarOneClickOperationServ
@Autowired
private CarOneClickOperationMapper carOneClickOperationMapper;
@Autowired
private RabbitTemplate rabbitTemplate;
@Autowired
private RedisService redisService;
@Autowired
private StringRedisTemplate redisTemplate;
/**
*
@ -40,7 +42,7 @@ public class CarOneClickOperationServiceImpl implements CarOneClickOperationServ
* @return
*/
@Override
public MqttServerModel getConnect(VehicleConnectionReq vehicleConnectionReq) {
public Result<MqttServerModel> getConnect(VehicleConnectionReq vehicleConnectionReq) {
log.info("车辆连接请求:{}",vehicleConnectionReq.toString());
// 使用交换机发送消息
@ -55,24 +57,54 @@ public class CarOneClickOperationServiceImpl implements CarOneClickOperationServ
vehicleConnection.setUsername(vehicleConnectionReq.getUsername());
//密码(vin+时间戳+随机数)
vehicleConnection.setPassword(vehicleConnectionReq.getVehicleVin()+vehicleConnectionReq.getTimestamp()+vehicleConnectionReq.getNonce());
//查询车辆vin集合
List<String> vehicleConnections =carOneClickOperationMapper.selectByVehicleVin(vehicleConnectionReq.getVehicleVin());
if(vehicleConnections.isEmpty()){
//添加
carOneClickOperationMapper.addConnect(vehicleConnection);
//添加连接信息
carOneClickOperationMapper.addConnect(vehicleConnection);
//先判断vin码
HashOperations<String, String, String> hashOps = redisTemplate.opsForHash();
String vinIp = hashOps.get("vinIp", vehicleConnectionReq.getVehicleVin());
if(vinIp!=null){
log.info("车辆绑定ip失败已经存在");
throw new RuntimeException("车辆绑定ip失败已经存在");
}
log.info("该车辆已存在,不能重复预上线");
//TODO 返回连接信息 做轮询操作
//判断redis有没有count键
if(redisTemplate.hasKey("count")){
//取出count
Integer count = Integer.valueOf(redisTemplate.opsForValue().get("count"));
if(count == 1){
redisTemplate.opsForValue().set("count",String.valueOf(0));
}else {
redisTemplate.opsForValue().set("count",String.valueOf(count+1));
}
//根据游标count获取服务IP
// String ip = redisTemplate.opsForList().index("ipList", count);
Object ipList = redisService.redisTemplate.opsForList().index("ipList", count);
return new MqttServerModel("tcp://"+"106.15.136.7"+":1883","vehicle");
log.info("=========================ipList:"+ipList);
//关联车辆和服务
this.addIpAddress(new VinIp(vehicleConnectionReq.getVehicleVin(),ipList.toString()));
//响应信息
log.info("车辆:{}",vehicleConnectionReq.getVehicleVin()+"绑定成功:{}",ipList);
return Result.success(new MqttServerModel("tcp://"+ipList+":1883","vehicle"));
}else {
redisTemplate.opsForValue().set("count",String.valueOf(0));
//根据游标count获取服务器Ip
Object ipList = redisService.redisTemplate.opsForList().index("ipList", 0);
//关联车辆和服务
this.addIpAddress(new VinIp(vehicleConnectionReq.getVehicleVin(),ipList.toString()));
//响应信息
log.info("车辆:{}",vehicleConnectionReq.getVehicleVin(),"与:{}绑定成功",ipList);
return Result.success(new MqttServerModel("tcp://"+ipList+":1883","vehicle"));
}
}
/**
* IPredis
*/
public void addIpAddress(VinIp vinIp){
redisService.setCacheObject("vehicle_ip_address:"+vinIp.getVehicleVin(),vinIp.getIpAddress());
public void addIpAddress(VinIp vinIp) {
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());
}
}

View File

@ -82,4 +82,4 @@ aliyun:
instance-type: ecs.t6-c1m1.large
security-group-id: sg-uf642d5u4ja5gsiitx8y
switch-id: vsw-uf66lifrkhxqc94xi06v3
amount: 1
amount: 2

View File

@ -14,6 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectByVehicleVin" resultType="java.lang.String">
select vehicle_vin from car_one_click_operation where vehicle_vin = #{vehicleVin}
</select>
<select id="selectVin" resultType="java.lang.String">
select vehicle_vin from car_one_click_operation where vehicle_vin=#{vehicleVin}
</select>
</mapper>