From abfc6d8a91457058edee1f3b09a9afce510c0a5c Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Fri, 31 May 2024 22:15:44 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E8=8E=B7=E5=8F=96=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=BF=A1=E6=81=AF=20version-2():=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B8=B8=E6=A0=87=EF=BC=8C=E9=80=9A=E8=BF=87=E6=B8=B8=E6=A0=87?= =?UTF-8?q?+1=E8=BD=AE=E8=AF=A2IP=E5=88=97=E8=A1=A8=EF=BC=8C=20=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=E5=AD=98=E5=85=A5=E8=8A=82=E7=82=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../controller/FluxGetInfoController.java | 13 ++- .../java/com/mobai/domain/HttpStatus.java | 93 +++++++++++++++++++ .../com/mobai/domain/MqttServerModel.java | 28 ++++++ src/main/java/com/mobai/domain/Result.java | 54 ++++++----- .../mobai/domain/VehicleConnectionReq.java | 51 ++++++++++ .../com/mobai/openApi/SelectInstances.java | 23 +++-- .../com/mobai/service/FluxGetInfoService.java | 5 + .../service/impl/FluxGetInfoServiceImpl.java | 63 ++++++++++--- src/main/resources/application.yml | 2 + 10 files changed, 284 insertions(+), 49 deletions(-) create mode 100644 src/main/java/com/mobai/domain/HttpStatus.java create mode 100644 src/main/java/com/mobai/domain/MqttServerModel.java create mode 100644 src/main/java/com/mobai/domain/VehicleConnectionReq.java diff --git a/pom.xml b/pom.xml index 92b3be8..e2fb029 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,7 @@ 2.0.46 + org.apache.commons commons-lang3 diff --git a/src/main/java/com/mobai/controller/FluxGetInfoController.java b/src/main/java/com/mobai/controller/FluxGetInfoController.java index 363ad88..78ea11c 100644 --- a/src/main/java/com/mobai/controller/FluxGetInfoController.java +++ b/src/main/java/com/mobai/controller/FluxGetInfoController.java @@ -1,12 +1,12 @@ package com.mobai.controller; +import com.mobai.domain.MqttServerModel; import com.mobai.domain.Result; +import com.mobai.domain.VehicleConnectionReq; import com.mobai.service.FluxGetInfoService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @ClassName FluxGetInfo @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Log4j2 -@RequestMapping("fluxmq") +@RequestMapping("fluxmq/") public class FluxGetInfoController { @Autowired private FluxGetInfoService fluxGetInfoService; @@ -25,4 +25,9 @@ public class FluxGetInfoController { public Result getInfo(){ return fluxGetInfoService.getInfo(null); } + + @PostMapping("/getIp") + public Result vehicleConnection(@RequestBody(required = false) VehicleConnectionReq req){ + return fluxGetInfoService.vehicleConnection(req); + } } diff --git a/src/main/java/com/mobai/domain/HttpStatus.java b/src/main/java/com/mobai/domain/HttpStatus.java new file mode 100644 index 0000000..a7f01a7 --- /dev/null +++ b/src/main/java/com/mobai/domain/HttpStatus.java @@ -0,0 +1,93 @@ +package com.mobai.domain; + +/** + * 返回状态码 + * + * @author ruoyi + */ +public class HttpStatus { + /** + * 操作成功 + */ + public static final int SUCCESS = 200; + + /** + * 对象创建成功 + */ + public static final int CREATED = 201; + + /** + * 请求已经被接受 + */ + public static final int ACCEPTED = 202; + + /** + * 操作已经执行成功，但是没有返回数据 + */ + public static final int NO_CONTENT = 204; + + /** + * 资源已被移除 + */ + public static final int MOVED_PERM = 301; + + /** + * 重定向 + */ + public static final int SEE_OTHER = 303; + + /** + * 资源没有被修改 + */ + public static final int NOT_MODIFIED = 304; + + /** + * 参数列表错误（缺少，格式不匹配） + */ + public static final int BAD_REQUEST = 400; + + /** + * 未授权 + */ + public static final int UNAUTHORIZED = 401; + + /** + * 访问受限，授权过期 + */ + public static final int FORBIDDEN = 403; + + /** + * 资源，服务未找到 + */ + public static final int NOT_FOUND = 404; + + /** + * 不允许的http方法 + */ + public static final int BAD_METHOD = 405; + + /** + * 资源冲突，或者资源被锁 + */ + public static final int CONFLICT = 409; + + /** + * 不支持的数据，媒体类型 + */ + public static final int UNSUPPORTED_TYPE = 415; + + /** + * 系统内部错误 + */ + public static final int ERROR = 500; + + /** + * 接口未实现 + */ + public static final int NOT_IMPLEMENTED = 501; + + /** + * 系统警告消息 + */ + public static final int WARN = 601; +} diff --git a/src/main/java/com/mobai/domain/MqttServerModel.java b/src/main/java/com/mobai/domain/MqttServerModel.java new file mode 100644 index 0000000..7c55531 --- /dev/null +++ b/src/main/java/com/mobai/domain/MqttServerModel.java @@ -0,0 +1,28 @@ +package com.mobai.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author DongZl + * @description: Mqtt服务器模型 + * @Date 2024-3-26 上午 09:53 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MqttServerModel { + + /** + * MQTT服务节点 + */ + private String broker; + + /** + * MQTT订阅主题 + */ + private String topic; +} diff --git a/src/main/java/com/mobai/domain/Result.java b/src/main/java/com/mobai/domain/Result.java index 5af41e8..551d077 100644 --- a/src/main/java/com/mobai/domain/Result.java +++ b/src/main/java/com/mobai/domain/Result.java @@ -1,33 +1,30 @@ package com.mobai.domain; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serializable; /** * 响应信息主体 * - * @author mobai + * @author ruoyi */ @Data -@Builder -@NoArgsConstructor -@AllArgsConstructor public class Result implements Serializable { /** * 成功 */ - public static final int SUCCESS = Constants.SUCCESS; + public static final int SUCCESS = HttpStatus.SUCCESS; /** * 失败 */ - public static final int FAIL = Constants.FAIL; - - + public static final int FAIL = HttpStatus.ERROR; private static final long serialVersionUID = 1L; + /** + * 系统警告消息 + */ + private static final int WARN = HttpStatus.WARN; + private int code; private String msg; @@ -35,11 +32,11 @@ public class Result implements Serializable { private T data; public static Result success () { - return restResult(null, SUCCESS, null); + return restResult(null, SUCCESS, "操作成功"); } public static Result success (T data) { - return restResult(data, SUCCESS, null); + return restResult(data, SUCCESS, "操作成功"); } public static Result success (T data, String msg) { @@ -47,7 +44,7 @@ public class Result implements Serializable { } public static Result error () { - return restResult(null, FAIL, null); + return restResult(null, FAIL, "操作失败"); } public static Result error (String msg) { @@ -55,7 +52,7 @@ public class Result implements Serializable { } public static Result error (T data) { - return restResult(data, FAIL, null); + return restResult(data, FAIL, "操作失败"); } public static Result error (T data, String msg) { @@ -66,16 +63,32 @@ public class Result implements Serializable { return restResult(null, code, msg); } + public static Result warn () { + return restResult(null, WARN, "操作失败"); + } + + public static Result warn (String msg) { + return restResult(null, WARN, msg); + } + + public static Result warn (T data) { + return restResult(data, WARN, "操作失败"); + } + + public static Result warn (T data, String msg) { + return restResult(data, WARN, msg); + } + public static Result warn (int code, String msg) { return restResult(null, code, msg); } private static Result restResult (T data, int code, String msg) { - return Result.builder() - .code(code) - .data(data) - .msg(msg) - .build(); + Result apiResult = new Result<>(); + apiResult.setCode(code); + apiResult.setData(data); + apiResult.setMsg(msg); + return apiResult; } public static Boolean isError (Result ret) { @@ -85,5 +98,4 @@ public class Result implements Serializable { public static Boolean isSuccess (Result ret) { return Result.SUCCESS == ret.getCode(); } - } diff --git a/src/main/java/com/mobai/domain/VehicleConnectionReq.java b/src/main/java/com/mobai/domain/VehicleConnectionReq.java new file mode 100644 index 0000000..678d7f8 --- /dev/null +++ b/src/main/java/com/mobai/domain/VehicleConnectionReq.java @@ -0,0 +1,51 @@ +package com.mobai.domain; + +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author DongZl + * @description: 车辆获取连接地址 + * @Date 2023-11-28 上午 10:32 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class VehicleConnectionReq { + + /** + * { + * "vehicleVin": "VIN1234567894", + * "timestamp": "11111", + * "username": "你好", + * "nonce": "33" + * } + */ + + /** + * vin + */ + @JSONField(name = "vehicleVin") + private String vin; + + /** + * 时间戳 + */ + private String timestamp; + + /** + * 用户名 + */ + @JSONField(name = "username") + private String userName; + + /** + * 随机字符串 + */ + private String nonce; + +} diff --git a/src/main/java/com/mobai/openApi/SelectInstances.java b/src/main/java/com/mobai/openApi/SelectInstances.java index 478e898..d1d198f 100644 --- a/src/main/java/com/mobai/openApi/SelectInstances.java +++ b/src/main/java/com/mobai/openApi/SelectInstances.java @@ -7,6 +7,7 @@ import com.aliyun.ecs20140526.models.DescribeInstancesResponse; import com.aliyun.ecs20140526.models.DescribeInstancesResponseBody; import com.aliyun.tea.TeaException; import com.mobai.domain.ApifoxModel; +import com.mobai.domain.MqttServerModel; import com.mobai.domain.Result; import com.mobai.service.FluxGetInfoService; import lombok.AllArgsConstructor; @@ -50,6 +51,7 @@ public class SelectInstances { return new com.aliyun.ecs20140526.Client(config); } + // @Scheduled(cron = "0 0/10 * * * ? ") @Scheduled(cron = "0/10 * * * * ? ") public void saveIps() throws Exception { List ips = new ArrayList<>(); @@ -126,35 +128,38 @@ public class SelectInstances { arithmet.put(node.getIp(), value); }// 根据权重总和计算每个节点的特定比例 log.info("总可负载量：{}", arithmet); - List ips = new ArrayList<>(); + List ips = new ArrayList<>(); //获取每个ip的分配率 for (String ip : arithmet.keySet()) { //概率 BigDecimal probability = arithmet.get(ip).divide(sum, 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)); arithmet.put(ip, probability); - log.info("{}可负载率(权重值)：{}",ip, probability); + log.info("{}可负载率(权重值)：{}", ip, probability); } Set ipSet = arithmet.keySet(); BigDecimal finalSum = sum; Map map = new HashMap<>(); // 转换成数量 - ipSet.forEach(ip -> - map.put(ip, arithmet.get(ip).multiply(finalSum).intValue() / 100) - ); + ipSet.forEach(ip -> map.put(ip, arithmet.get(ip).multiply(finalSum).intValue() / 100)); Long i = 0L; - log.info("ip对应可分配车辆：{}",map); + log.info("ip对应可分配车辆：{}", map); int sumInit = map.values().stream().mapToInt(num -> num).sum(); + while (true) { ipSet = map.keySet(); Iterator iterator = ipSet.iterator(); i++; while (iterator.hasNext()) { + MqttServerModel mqttServerModel = new MqttServerModel(); String ip = iterator.next(); - ips.add(ip); + for (SmallNode node : nodes) { + if (node.ip.equals(ip)) mqttServerModel = new MqttServerModel(ip, "topic" + nodes.indexOf(node)); + } + ips.add(mqttServerModel); int i1 = map.get(ip) - 1; map.put(ip, i1); - if (map.get(ip).equals(0)) { + if (i1 == 0) { map.remove(ip); } } @@ -162,7 +167,7 @@ public class SelectInstances { break; } } - redisTemplate.opsForValue().set("fluxMq", JSON.toJSONString(ips)); + redisTemplate.opsForList().leftPush("fluxMq", JSON.toJSONString(ips)); // 可负载IP轮询排列 log.info("排列ip,{}", ips); } diff --git a/src/main/java/com/mobai/service/FluxGetInfoService.java b/src/main/java/com/mobai/service/FluxGetInfoService.java index 88d0704..ccf35d7 100644 --- a/src/main/java/com/mobai/service/FluxGetInfoService.java +++ b/src/main/java/com/mobai/service/FluxGetInfoService.java @@ -1,6 +1,7 @@ package com.mobai.service; import com.mobai.domain.Result; +import com.mobai.domain.VehicleConnectionReq; /** * @ClassName FluxGetInfoService @@ -12,4 +13,8 @@ public interface FluxGetInfoService { Result getInfo(String ip); + + + Result vehicleConnection(VehicleConnectionReq req); + } diff --git a/src/main/java/com/mobai/service/impl/FluxGetInfoServiceImpl.java b/src/main/java/com/mobai/service/impl/FluxGetInfoServiceImpl.java index 023f052..2626223 100644 --- a/src/main/java/com/mobai/service/impl/FluxGetInfoServiceImpl.java +++ b/src/main/java/com/mobai/service/impl/FluxGetInfoServiceImpl.java @@ -1,26 +1,20 @@ package com.mobai.service.impl; import com.alibaba.fastjson2.JSON; -import com.mobai.domain.AcceptToken; -import com.mobai.domain.ApifoxModel; -import com.mobai.domain.Result; -import com.mobai.domain.User; +import com.mobai.domain.*; import com.mobai.service.FluxGetInfoService; -import okhttp3.*; -import org.apache.catalina.authenticator.SpnegoAuthenticator; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; -import java.io.IOException; import java.util.List; -import java.util.Map; /** * @ClassName FluxGetInfoServiceImpl @@ -28,23 +22,33 @@ import java.util.Map; * @Author SaiSai.Liu * @Date 2024/5/28 22:01 */ + +@Log4j2 @Service public class FluxGetInfoServiceImpl implements FluxGetInfoService { @Autowired private RestTemplate restTemplate; + @Autowired + private RedisTemplate redis; + + /** + * 通过ip获取详细信息 + * + * @param ip + * @return + */ @Override public Result getInfo(String ip) { String url = null; - if (ip==null){ - url= "http://39.98.50.223:8080/public/"; - }else { - url = "http://"+ip+":8080/public/"; + if (ip == null) { + url = "http://39.98.50.223:8080/public/"; + } else { + url = "http://" + ip + ":8080/public/"; } User user = new User("fluxmq", "fluxmq"); //登录 - AcceptToken token = restTemplate.postForObject(url+"login", user, AcceptToken.class); - + AcceptToken token = restTemplate.postForObject(url + "login", user, AcceptToken.class); //请求头 HttpHeaders headers = new HttpHeaders(); headers.add("token", token.getAccessToken()); @@ -58,4 +62,33 @@ public class FluxGetInfoServiceImpl implements FluxGetInfoService { return Result.success(apifoxModel.get(0)); } + + + @Override + public Result vehicleConnection(VehicleConnectionReq req) { + // "vehicleVin": "VIN1234567894" vin + // "timestamp": "11111" new Date().getMillis() + // "username": "你好" Vin + timestamp + // "nonce": "33" 随机 + log.warn("参数为：{}", req); + String string = redis.opsForList().range("fluxMq", 0, -1).get(0); + List mqtts = JSON.parseArray(string, MqttServerModel.class); + log.info("集合：{}",mqtts); + if (redis.hasKey("fluxMqIndex")) { + redis.opsForValue().increment("fluxMqIndex", 1); + } else { + redis.opsForValue().set("fluxMqIndex", 0 + ""); + } + int index = Integer.valueOf(redis.opsForValue().get("fluxMqIndex")); + log.info("下标：{}",index); + MqttServerModel mqttServerModel = mqtts.get(index); + if (index + 1 == redis.opsForList().size("fluxmq")) { + redis.delete("fluxMqIndex"); + } + log.info("已获取到对象：{}",mqttServerModel); + return Result.success(mqttServerModel); + } + } + +// 达到60%开启新服务，30%关闭低实例 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 06211b3..856ec49 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,5 @@ +server: + port: 8081 spring: redis: host: 43.142.100.73