Merge branch 'xiaoyao_correction_code' of https://gitea.qinmian.online/five-groups/work4-16

# Conflicts:
#	src/main/java/com/yao/common/aliy/AliYunEcsService.java

.gitignore

@@ -1,4 +1,5 @@
 target/
+.idea
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/

src/main/java/com/yao/common/aliy/AliYunEcsService.java

@@ -8,6 +8,7 @@ import com.aliyun.teautil.models.RuntimeOptions;
 import com.yao.common.aliy.model.EcsSelectModel;
 import com.yao.common.config.AlyConfigProperties;
 import com.yao.common.domain.aliy.InstanceInfo;
+import com.yao.gateway.cache.GatewayNodeSetVinCache;
 import com.yao.common.redis.service.RedisService;
 import com.yao.gateWay.cache.GatewayAliYunCache;
 import lombok.extern.log4j.Log4j2;
@@ -26,16 +27,14 @@ import java.util.List;
 @Log4j2
 public class AliYunEcsService {
 
-    @Autowired
-    private RedisService redisService;
     private final AlyConfigProperties alyConfigProperties;
     private final Client client;
 
-    private final GatewayAliYunCache gatewayAliYunCache;
-    public AliYunEcsService(AlyConfigProperties alyConfigProperties, Client client, GatewayAliYunCache gatewayAliYunCache) {
+    private final GatewayNodeSetVinCache gatewayNodeSetVinCache;
+    public AliYunEcsService(AlyConfigProperties alyConfigProperties, Client client, GatewayNodeSetVinCache gatewayNodeSetVinCache) {
         this.alyConfigProperties = alyConfigProperties;
         this.client = client;
-        this.gatewayAliYunCache = gatewayAliYunCache;
+        this.gatewayNodeSetVinCache = gatewayNodeSetVinCache;
     }
 
     //todo----------------------------------------------------以下是查询代码--------------------------------------------
@@ -126,7 +125,7 @@ public class AliYunEcsService {
                     String publicIP = item.getPublicIpAddress().substring(1, item.getPublicIpAddress().length() - 1);
                     item.setPublicIpAddress(publicIP);
                     //存入数据
-                    redisService.setCacheSet("new:real:column",item);
+                    gatewayNodeSetVinCache.newInstance(item);
                     log.info("公网IP:" + item.getPublicIpAddress());
                 }
         );

src/main/java/com/yao/common/domain/GateWayNodeInfo.java

@@ -0,0 +1,28 @@
+package com.yao.common.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/15
+ * @Description:
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GateWayNodeInfo {
+
+    /**
+     * 节点id
+     */
+    private String nodeId;
+    /**
+     * 权重值
+     */
+    private Double score;
+
+}

src/main/java/com/yao/common/domain/WorkGateWayNode.java

@@ -1,6 +1,7 @@
 package com.yao.common.domain;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@Builder
 public class WorkGateWayNode {
 
     private String nodeId;

src/main/java/com/yao/common/mqtt/MqttConnectService.java

@@ -2,12 +2,11 @@ package com.yao.common.mqtt;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.yao.common.redis.service.RedisService;
+import com.yao.gateway.cache.GatewayVehicleLineNodeCache;
 import lombok.extern.log4j.Log4j2;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -21,11 +20,11 @@ import java.io.IOException;
 @Log4j2
 public class MqttConnectService {
 
-    /**
-     * 调用redis分装好的方法
-     */
-    @Autowired
-    private RedisService redisService;
+    private GatewayVehicleLineNodeCache gatewayVehicleLineNodeCache;
+
+    public MqttConnectService(GatewayVehicleLineNodeCache gatewayVehicleLineNodeCache) {
+        this.gatewayVehicleLineNodeCache = gatewayVehicleLineNodeCache;
+    }
 
     //todo-----------------------连接mqtt方法-------------------
 
@@ -37,7 +36,7 @@ public class MqttConnectService {
         String URL = "http://" + ip + ":8080/public/cluster";
         OkHttpClient client = new OkHttpClient();
         Request request = new Request.Builder().url(URL).get().addHeader("User-Agent", "Apifox/1.0.0 (https://apifox.com)").addHeader("Accesstoken", "").build();
-        redisService.setCacheSet("ECS", ip);
+        gatewayVehicleLineNodeCache.address(ip);
         Response response = null;
         try {
             response = client.newCall(request).execute();

src/main/java/com/yao/common/redis/service/RedisService.java

@@ -151,7 +151,6 @@ public class RedisService {
     }
     /**
      * 获得缓存的list对象
-     *
      * @param key 缓存的键值
      * @return 缓存键值对应的数据
      */
@@ -250,10 +249,30 @@ public class RedisService {
      *
      * @param key   Redis键
      * @param zValue  Hash键
-     * @param value 值
+     * @param score 值
      */
-    public <T> void setCacheZSet(final String key, final T zValue, final double value) {
-        redisTemplate.opsForZSet().add(key,zValue,value);
+    public <T> void setCacheZSet(final String key, final T zValue, final double score) {
+        redisTemplate.opsForZSet().add(key,zValue,score);
+    }
+
+    /**
+     * 取值
+     * @param key 键名
+     * @return 对象
+     * @param <T>
+     */
+    public <T> Set<T> getCacheZSet(final String key) {
+       return redisTemplate.opsForZSet().range(key,0,-1);
+    }
+
+    /**
+     * 获取集合中是分数数据
+     * @param zSetKey
+     * @return
+     * @param <T>
+     */
+    public <T> Set<ZSetOperations.TypedTuple<String>> getZSet(String zSetKey) {
+        return redisTemplate.opsForZSet().rangeWithScores(zSetKey,0,-1);
     }
 
     /**
@@ -327,4 +346,6 @@ public class RedisService {
         return redisTemplate.opsForValue().increment(cursor,l);
     }
 
+
+
 }

src/main/java/com/yao/gateWay/cache/GatewayNodeScoreCache.java

@@ -1,19 +0,0 @@
-package com.yao.gateWay.cache;
-
-import com.yao.gateWay.cache.abs.GatewayNodeAbstract;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: LiJiaYao
- * @Date: 2024/4/18
- * @Description: 网关节点分数
- */
-@Component
-public class GatewayNodeScoreCache extends GatewayNodeAbstract {
-
-
-
-
-
-
-}

src/main/java/com/yao/gateWay/cache/GatewayNodeSetVinCache.java

@@ -1,13 +0,0 @@
-package com.yao.gateWay.cache;
-
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: LiJiaYao
- * @Date: 2024/4/18
- * @Description: 网关节点存储vin详情
- */
-@Component
-public class GatewayNodeSetVinCache {
-
-}

src/main/java/com/yao/gateWay/cache/GatewayVehicleLineNodeCache.java

@@ -1,9 +0,0 @@
-package com.yao.gateWay.cache;
-
-/**
- * @Author: LiJiaYao
- * @Date: 2024/4/18
- * @Description: 网关连接车俩
- */
-public class GatewayVehicleLineNodeCache {
-}

src/main/java/com/yao/gateway/cache/GateWayNodeInfo.java

@@ -1,4 +1,4 @@
-package com.yao.gateWay.cache;
+package com.yao.gateway.cache;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/yao/gateway/cache/GatewayArithmeticCache.java

@@ -0,0 +1,58 @@
+package com.yao.gateway.cache;
+
+import com.yao.gateway.cache.abs.GatewayNodeAbstract;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/18
+ * @Description: 网关算法缓存
+ */
+@Component
+@Log4j2
+public class GatewayArithmeticCache extends GatewayNodeAbstract {
+
+    private static final String loadNode ="work:node:gateway";
+    private static final String cursor ="cursor";
+    /**
+     * 计数器
+     */
+    public void count(){
+        redisService.setCacheObject(cursor, 0);
+    }
+
+    /**
+     * 自增
+     * @return 把这个值自增
+     */
+    public Long increment(){
+        return redisService.increment(cursor, 1L);
+    }
+    /**
+     * 删除loadNode的值
+     */
+    public void remove(){
+        redisService.deleteObject(loadNode);
+    }
+
+    /**
+     * 存储数据
+     * @param loadNodeList 节点数据
+     */
+    public void loadNode(List<String> loadNodeList){
+        redisService.setCacheList(loadNode, loadNodeList);
+    }
+
+    /**
+     * 获取list信息
+     * @param count 传入的数据
+     * @return nodeId
+     */
+    public String cacheList(Long count){
+         return redisService.getCacheList(loadNode, count % 100);
+    }
+}
+

src/main/java/com/yao/gateway/cache/GatewayLoadNodeCache.java

@@ -1,6 +1,6 @@
-package com.yao.gateWay.cache;
+package com.yao.gateway.cache;
 
-import com.yao.gateWay.cache.abs.GatewayNodeAbstract;
+import com.yao.gateway.cache.abs.GatewayNodeAbstract;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

src/main/java/com/yao/gateway/cache/GatewayLoadSeriesCache.java

@@ -1,6 +1,6 @@
-package com.yao.gateWay.cache;
+package com.yao.gateway.cache;
 
-import com.yao.gateWay.cache.abs.GatewayNodeAbstract;
+import com.yao.gateway.cache.abs.GatewayNodeAbstract;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;

src/main/java/com/yao/gateway/cache/GatewayNodeCache.java

@@ -1,6 +1,6 @@
-package com.yao.gateWay.cache;
+package com.yao.gateway.cache;
 
-import com.yao.gateWay.cache.abs.GatewayNodeAbstract;
+import com.yao.gateway.cache.abs.GatewayNodeAbstract;
 import org.springframework.stereotype.Component;
 
 /**

src/main/java/com/yao/gateway/cache/GatewayNodeScoreCache.java

@@ -0,0 +1,74 @@
+package com.yao.gateway.cache;
+
+import com.yao.common.domain.GateWayNodeInfo;
+import com.yao.common.domain.WorkGateWayNode;
+import com.yao.common.domain.aliy.InstanceInfo;
+import com.yao.gateway.cache.abs.GatewayNodeAbstract;
+import org.springframework.data.redis.core.ZSetOperations;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/18
+ * @Description: 网关节点分数
+ */
+@Component
+public class GatewayNodeScoreCache extends GatewayNodeAbstract {
+
+    private static final String zSetKey = "gateway:zSet:count";
+
+    /**
+     * 网关连接计数
+     *
+     * @param info  新增数据的信息
+     * @param count 网关连接的个数
+     */
+    public void newCount(InstanceInfo info, Integer count) {
+        redisService.setCacheZSet(zSetKey, info, count);
+    }
+
+    /**
+     * 取出数据
+     *
+     * @return 取出的内容
+     */
+    public Set<InstanceInfo> get() {
+        Set<InstanceInfo> cacheZSet = redisService.getCacheZSet(zSetKey);
+
+        return cacheZSet;
+    }
+
+    /**
+     * 获取他的内容
+     * @return
+     */
+    public List<GateWayNodeInfo> getCacheZSet() {
+        Set<ZSetOperations.TypedTuple<String>> set = redisService.getZSet(zSetKey);
+//        Map<String, Double> nodeMap = set.stream()
+//                .collect(Collectors.toMap(
+//                        ZSetOperations.TypedTuple::getValue,
+//                        ZSetOperations.TypedTuple::getScore
+//                ));
+        return set.stream()
+                .map(zset->
+                    GateWayNodeInfo.builder()
+                            .nodeId(zset.getValue())
+                            .score(zset.getScore())
+                            .build()
+                ).toList();
+        //算法：有没有超过百分比
+//        double sum = nodeMap.values().stream().mapToDouble(value -> value).sum();
+    }
+
+    /**
+     * 删除数据
+     */
+    public void remove() {
+        redisService.deleteObject(zSetKey);
+    }
+
+}

src/main/java/com/yao/gateway/cache/GatewayNodeSetVinCache.java

@@ -1,20 +1,19 @@
-package com.yao.gateWay.cache;
+package com.yao.gateway.cache;
 
+import com.aliyun.teautil.Common;
 import com.yao.common.domain.aliy.InstanceInfo;
-import com.yao.gateWay.cache.abs.GatewayNodeAbstract;
+import com.yao.gateway.cache.abs.GatewayNodeAbstract;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 import java.util.Set;
 
 /**
  * @Author: LiJiaYao
  * @Date: 2024/4/18
- * @Description: 阿里云缓存
+ * @Description: 网关节点存储vin详情
  */
 @Component
-public class GatewayAliYunCache extends GatewayNodeAbstract {
-
+public class GatewayNodeSetVinCache extends GatewayNodeAbstract {
     /**
      * 阿里云键
      */
@@ -33,8 +32,16 @@ public class GatewayAliYunCache extends GatewayNodeAbstract {
      * @param realKey 键名称
      * @return 相关实例数据值
      */
-    public Set<InstanceInfo> get(String realKey){
+    public Set<InstanceInfo> get(){
         return redisService.getCacheSet(realKey);
     }
 
+    /**
+     * 删除这个key其中的一个数据
+     * @param realKey new:real:column键
+     * @param info 对应的值
+     */
+    public void remote(InstanceInfo info){
+        redisService.deleteCacheMapValue(realKey, Common.toJSONString(info));
+    }
 }

src/main/java/com/yao/gateway/cache/GatewayVehicleLineNodeCache.java

@@ -0,0 +1,44 @@
+package com.yao.gateway.cache;
+
+import com.yao.gateway.cache.abs.GatewayNodeAbstract;
+import org.springframework.stereotype.Component;
+
+import java.util.Set;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/18
+ * @Description: 网关连接车俩
+ */
+@Component
+public class GatewayVehicleLineNodeCache extends GatewayNodeAbstract {
+
+    private final static String reconnectCar = "reconnectCar";
+
+    /**
+     * 把数据存入数据
+     * @param ip ip地址
+     */
+    public void save(String ip){
+        redisService.setCacheSet(reconnectCar,ip);
+    }
+
+    /**
+     * 存储ip地址数据
+     * @param ip ip地址
+     */
+    public void address(String ip) {
+        redisService.setCacheSet("ECS", ip);
+    }
+
+    /**
+     * 获取存储ecs的ip
+     */
+    public Set<String> getAddress() {
+       return redisService.getCacheSet("ECS");
+    }
+
+
+
+
+}

src/main/java/com/yao/gateway/cache/abs/GatewayNodeAbstract.java

@@ -1,4 +1,4 @@
-package com.yao.gateWay.cache.abs;
+package com.yao.gateway.cache.abs;
 
 import com.yao.common.redis.service.RedisService;
 
@@ -14,8 +14,4 @@ public abstract class GatewayNodeAbstract {
      */
     public RedisService redisService;
 
-
-
-
-
 }

src/main/java/com/yao/server/controller/LoadController.java

@@ -18,7 +18,6 @@ public class LoadController {
     private LoadService loadService;
     @PostMapping("/load")
     public Result<?> loadInfo(){
-        String load = loadService.load();
-        return Result.success(load);
+        return Result.success(loadService.load());
     }
 }

src/main/java/com/yao/server/service/impl/GatewayLoadServiceImpl.java

@@ -1,9 +1,9 @@
 package com.yao.server.service.impl;
 
-import com.yao.gateWay.cache.GateWayNodeInfo;
-import com.yao.gateWay.cache.GatewayLoadNodeCache;
-import com.yao.gateWay.cache.GatewayLoadSeriesCache;
-import com.yao.gateWay.cache.GatewayNodeCache;
+import com.yao.gateway.cache.GateWayNodeInfo;
+import com.yao.gateway.cache.GatewayLoadNodeCache;
+import com.yao.gateway.cache.GatewayLoadSeriesCache;
+import com.yao.gateway.cache.GatewayNodeCache;
 import com.yao.server.service.GatewayLoadService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/yao/server/service/impl/LoadServiceImpl.java

@@ -3,10 +3,10 @@ package com.yao.server.service.impl;
 import com.yao.common.config.Constants;
 import com.yao.common.domain.WorkGateWayNode;
 import com.yao.common.mqtt.MqttConnectService;
-import com.yao.common.redis.service.RedisService;
+import com.yao.gateway.cache.GatewayArithmeticCache;
+import com.yao.gateway.cache.GatewayVehicleLineNodeCache;
 import com.yao.server.service.LoadService;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -21,20 +21,22 @@ import java.util.concurrent.CountDownLatch;
 @Log4j2
 @Service
 public class LoadServiceImpl implements LoadService {
-
-    @Autowired
-    private RedisService redisService;
-
+    //网关算法缓存
+    private final GatewayArithmeticCache gatewayArithmeticCache;
+    // 网关连接车俩
+    private final GatewayVehicleLineNodeCache gatewayVehicleLineNodeCache;
     private MqttConnectService mqttConnectService;
 
-    public LoadServiceImpl(MqttConnectService mqttConnectService) {
+    public LoadServiceImpl(GatewayArithmeticCache gatewayArithmeticCache, GatewayVehicleLineNodeCache gatewayVehicleLineNodeCache, MqttConnectService mqttConnectService) {
+        this.gatewayArithmeticCache = gatewayArithmeticCache;
+        this.gatewayVehicleLineNodeCache = gatewayVehicleLineNodeCache;
         this.mqttConnectService = mqttConnectService;
     }
 
     @Override
     public String load() {
         //初始化序列
-        redisService.setCacheObject("cursor", 0);
+        gatewayArithmeticCache.count();
         ArrayList<WorkGateWayNode> nodeIdList = carWorkGatewayNode();
         //100
         List<String> loadNodeList = new ArrayList<>();
@@ -68,13 +70,13 @@ public class LoadServiceImpl implements LoadService {
                 }
             }
         }
-        redisService.deleteObject("work:node:gateway");
-        redisService.setCacheList("work:node:gateway", loadNodeList);
+        gatewayArithmeticCache.remove();
+        gatewayArithmeticCache.loadNode(loadNodeList);
         CountDownLatch countDownLatch = new CountDownLatch(300);
         new Thread(() -> {
             for (int i = 0; i < Constants.SUM; i++) {
-                long cursor = redisService.increment("cursor", 1L);
-                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
+                long cursor = gatewayArithmeticCache.increment();
+                String cacheList = gatewayArithmeticCache.cacheList(cursor);
                 log.info(cursor + "---------" + cacheList);
                 SitNode.sti(cacheList);
                 countDownLatch.countDown();
@@ -83,8 +85,8 @@ public class LoadServiceImpl implements LoadService {
 
         new Thread(() -> {
             for (int i = 0; i < Constants.SUM; i++) {
-                long cursor = redisService.increment("cursor", 1L);
-                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
+                long cursor = gatewayArithmeticCache.increment();
+                String cacheList = gatewayArithmeticCache.cacheList(cursor);
                 log.info(cursor + "---------" + cacheList);
                 SitNode.sti(cacheList);
                 countDownLatch.countDown();
@@ -93,8 +95,8 @@ public class LoadServiceImpl implements LoadService {
 
         new Thread(() -> {
             for (int i = 0; i < Constants.SUM; i++) {
-                Long cursor = redisService.increment("cursor", 1L);
-                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
+                long cursor = gatewayArithmeticCache.increment();
+                String cacheList = gatewayArithmeticCache.cacheList(cursor);
                 log.info(cursor + "---------" + cacheList);
                 SitNode.sti(cacheList);
                 countDownLatch.countDown();
@@ -123,7 +125,7 @@ public class LoadServiceImpl implements LoadService {
     }
 
     public ArrayList<WorkGateWayNode> carWorkGatewayNode() {
-        Set<String> ip = redisService.getCacheSet("ECS");
+        Set<String> ip = gatewayVehicleLineNodeCache.getAddress();
         ArrayList<WorkGateWayNode> list = new ArrayList<>();
         for (String s : ip) {
             Integer connectSize = mqttConnectService.connectMqtt(s);
@@ -170,6 +172,4 @@ class SitNode {
 
         return map;
     }
-
-
 }

src/main/java/com/yao/server/test/Test.java

@@ -1,11 +1,9 @@
 package com.yao.server.test;
 
-import com.aliyun.ecs20140526.Client;
 import com.aliyun.ecs20140526.models.DescribeAvailableResourceRequest;
 import com.aliyun.ecs20140526.models.DescribeAvailableResourceResponse;
 import com.aliyun.tea.TeaException;
 import com.aliyun.tea.TeaModel;
-import com.aliyun.teaopenapi.models.Config;
 
 /**
  * @Author: LiJiaYao

src/main/java/com/yao/server/timer/Timer.java

@@ -1,20 +1,18 @@
 package com.yao.server.timer;
 
-import com.aliyun.teautil.Common;
 import com.yao.common.aliy.AliYunEcsService;
-import com.yao.common.aliy.model.EcsSelectModel;
+import com.yao.common.domain.GateWayNodeInfo;
 import com.yao.common.domain.aliy.InstanceInfo;
-import com.yao.common.domain.aliy.InstanceRequest;
 import com.yao.common.mqtt.MqttConnectService;
-import com.yao.common.redis.service.RedisService;
+import com.yao.gateway.cache.GatewayNodeScoreCache;
+import com.yao.gateway.cache.GatewayNodeSetVinCache;
+import com.yao.gateway.cache.GatewayVehicleLineNodeCache;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -27,96 +25,61 @@ import java.util.Set;
 @EnableAsync //开启异步支持
 @Component
 public class Timer {
+    private final AliYunEcsService aliYunEcsService;
+    private final MqttConnectService mqttConnectService;
+    // 阿里云缓存
+    private final GatewayNodeSetVinCache gatewayNodeSetVinCache;
+    private final GatewayVehicleLineNodeCache gatewayVehicleLineNodeCache;
+    private final GatewayNodeScoreCache gatewayNodeScoreCache;
 
-    @Autowired
-    private RedisService redisService;
-    private AliYunEcsService aliYunEcsService;
-    private MqttConnectService mqttConnectService;
-
-    public Timer(AliYunEcsService aliYunEcsService, MqttConnectService mqttConnectService) {
+    public Timer(AliYunEcsService aliYunEcsService, MqttConnectService mqttConnectService, GatewayNodeSetVinCache gatewayAliYunCache, GatewayVehicleLineNodeCache gatewayVehicleLineNodeCache, GatewayNodeScoreCache gatewayNodeScoreCache) {
         this.aliYunEcsService = aliYunEcsService;
         this.mqttConnectService = mqttConnectService;
+        this.gatewayNodeSetVinCache = gatewayAliYunCache;
+        this.gatewayVehicleLineNodeCache = gatewayVehicleLineNodeCache;
+        this.gatewayNodeScoreCache = gatewayNodeScoreCache;
     }
 
     @Async
     @Scheduled(cron = "0/20 * * * * ?")
     public void timer() {
-        long startTime = System.currentTimeMillis(); // 记录开始时间
-        long endTime = startTime + 10 * 60 * 1000; // 设置结束时间为10分钟后
-//        redisService.deleteObject("new:real:column");
-        Set<InstanceInfo> instance = redisService.getCacheSet("new:real:column");
-//        List<InstanceInfo> myFirstEcsInstance = null;
-//        try {
-//            myFirstEcsInstance = aliYunEcsService.selectList(ecsSelectModelName("MyFirstEcsInstance"));
-//            for (InstanceInfo instanceInfo : myFirstEcsInstance) {
-//                String publicIpAddress = instanceInfo.getPublicIpAddress();
-//                String instanceId = instanceInfo.getInstanceId();
-//                InstanceRequest instanceRequest = new InstanceRequest(publicIpAddress, instanceId);
-//                redisService.setCacheSet("new:real:column", instanceRequest);
-//            }
-            if (instance.isEmpty()) {
-//                if (myFirstEcsInstance.isEmpty()) {
+        // 记录开始时间
+        long startTime = System.currentTimeMillis();
+        // 设置结束时间为10分钟后
+        long endTime = startTime + 10 * 60 * 1000;
+        Set<InstanceInfo> instance = gatewayNodeSetVinCache.get();
+        if (instance.isEmpty()) {
+            try {
+                aliYunEcsService.startCreate();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+        for (InstanceInfo s : instance) {
+            Integer connectSize = mqttConnectService.connectMqtt(s.getPublicIpAddress());
+            List<String> instanceId = null;
+            String deleteInstanceId = null;
+            if (connectSize >= 79) {
+                //执行节点扩容
+                //返回实例的ID
+                if (!instanceId.isEmpty()) {
                     try {
-                        aliYunEcsService.startCreate();
+                        instanceId = aliYunEcsService.startCreate();
+                        log.info("扩容成功！");
+                        log.info("扩容的节点id为：" + instanceId);
                     } catch (Exception e) {
                         throw new RuntimeException(e);
                     }
-//                }
-            }
-            for (InstanceInfo s : instance) {
-                Integer connectSize = mqttConnectService.connectMqtt(s.getPublicIpAddress());
-                List<String> instanceId = null;
-                String deleteInstanceId = null;
-                if (connectSize >= 80) {
-                    //执行节点扩容
-                    //返回实例的ID
-                    if (!instanceId.isEmpty()) {
-                        try {
-                            instanceId = aliYunEcsService.startCreate();
-                            log.info("扩容成功！");
-                            log.info("扩容的节点id为：" + instanceId);
-                        } catch (Exception e) {
-                            throw new RuntimeException(e);
-                        }
-                    }
-                }
-                if (connectSize <= 20 && System.currentTimeMillis() < endTime) {
-//                    if (!deleteInstanceId.isEmpty()) {
-                    aliYunEcsService.delete(s.getInstanceId());
-                    //删除实列以后再去把redis的值删除 再去通知重新上线
-                    redisService.deleteCacheMapValue("new:real:column", Common.toJSONString(s));
-                    redisService.setCacheSet("reconnectCar",s.getPublicIpAddress());
-                    log.info("缩容成功！");
-                    log.info("锁容的节点id为：" + deleteInstanceId);
                 }
             }
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
+            if (connectSize <= 20 && System.currentTimeMillis() < endTime) {
+                aliYunEcsService.delete(s.getInstanceId());
+                //删除实列以后再去把redis的值删除 再去通知重新上线
+                gatewayNodeSetVinCache.remote(s);
+                gatewayVehicleLineNodeCache.save(s.getPublicIpAddress());
+                log.info("缩容成功！");
+                log.info("锁容的节点id为：" + deleteInstanceId);
+            }
         }
-
     }
-
-    /**
-     * 查出来数据以后把值返回给要查的数据
-     *
-     * @param instance
-     * @return
-     */
-//    public EcsSelectModel ecsSelectModel(Set<InstanceInfo> instance) {
-//        List<String> instanceIdList = new ArrayList<>();
-//        for (InstanceInfo req : instance) {
-//            instanceIdList.add(req.getInstanceId());
-//        }
-//        EcsSelectModel ecsSelectModel = new EcsSelectModel();
-//        ecsSelectModel.setInstanceIdList(instanceIdList);
-//        return ecsSelectModel;
-//    }
-//    public EcsSelectModel ecsSelectModelName(String instanceName) {
-//        List<String> instanceIdList = new ArrayList<>();
-//        instanceIdList.add(instanceName);
-//        EcsSelectModel ecsSelectModel = new EcsSelectModel();
-//        ecsSelectModel.setInstanceIdList(instanceIdList);
-//        return ecsSelectModel;
-//    }
-
-//}
+}

src/test/java/com/yao/LoadService1.java

@@ -20,13 +20,10 @@ import java.util.concurrent.CountDownLatch;
 @SpringBootTest(classes = APISpringBootApplication.class)
 public class LoadService1 {
 
-    @Autowired
-    private RedisService redisService;
-
     @Test
     public void load() {
         //初始化序列
-        redisService.setCacheObject("cursor",0);
+//        redisService.setCacheObject("cursor",0);
 
         List<WorkGateWayNode> nodeIdList = new ArrayList() {
             {
@@ -77,33 +74,33 @@ public class LoadService1 {
 //        for (int i = 0; i < 100; i++) {
 //            loadNodeList.add(nodeIdList.get(i % nodeIdList.size()));
 //        }
-        redisService.deleteObject("work:node:gateway");
-        redisService.setCacheList("work:node:gateway",loadNodeList);
+//        redisService.deleteObject("work:node:gateway");
+//        redisService.setCacheList("work:node:gateway",loadNodeList);
         CountDownLatch countDownLatch = new CountDownLatch(300);
         new Thread(()->{
             for (int i = 0; i < 100; i++) {
-                Long cursor = redisService.increment("cursor", 1L);
-                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
-                log.info(cursor+"---------"+cacheList);
-                SitNode.sti(cacheList);
+//                Long cursor = redisService.increment("cursor", 1L);
+//                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
+//                log.info(cursor+"---------"+cacheList);
+//                SitNode.sti(cacheList);
                 countDownLatch.countDown();
             }
         }).start();
         new Thread(()->{
             for (int i = 0; i < 100; i++) {
-                Long cursor = redisService.increment("cursor", 1L);
-                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
-                log.info(cursor+"---------"+cacheList);
-                SitNode.sti(cacheList);
+//                Long cursor = redisService.increment("cursor", 1L);
+//                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
+//                log.info(cursor+"---------"+cacheList);
+//                SitNode.sti(cacheList);
                 countDownLatch.countDown();
             }
         }).start();
         new Thread(()->{
             for (int i = 0; i < 100; i++) {
-                Long cursor = redisService.increment("cursor", 1L);
-                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
-                log.info(cursor+"---------"+cacheList);
-                SitNode.sti(cacheList);
+//                Long cursor = redisService.increment("cursor", 1L);
+//                String cacheList = redisService.getCacheList("work:node:gateway", cursor % 100);
+//                log.info(cursor+"---------"+cacheList);
+//                SitNode.sti(cacheList);
                 countDownLatch.countDown();
             }
         }).start();