Optimize caching related content

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/SEApplication.java

@@ -4,18 +4,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.io.File;
 
 @EnableScheduling
 @MapperScan("com.zhangy.skyeye.**.mapper")
-@SpringBootApplication(scanBasePackages = "com.zhangy.**")
+@SpringBootApplication(scanBasePackages = "com.zhangy")
-@ComponentScan(basePackages = {
-        "com.zhangy.skyeye",               // 主包
-        "com.zhangy.skyeye.publics.config" // 明确包含 CacheConfig 包
-})
 @Slf4j
 public class SEApplication {
 

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/device/service/impl/PayloadServiceImpl.java

@@ -133,7 +133,7 @@ public class PayloadServiceImpl implements IPayloadService {
         // 筛选出未在任务中且已连接的雷达
         List<SkyeyePayload> payloadList = sarList.stream()
                 .filter(sar -> !jobSarSet.contains(sar.getId())
-                        && CacheUtil.get(sarShortCache, CacheKey.getSarConnect(sar.getIp()), JmSarStatusDTO.class) != null)
+                        && CacheUtil.get(sarShortCache, CacheKey.getSarStatus(sar.getIp()), JmSarStatusDTO.class) != null)
                 .collect(Collectors.toList());
         return payloadList;
     }
@@ -224,7 +224,7 @@ public class PayloadServiceImpl implements IPayloadService {
 
     @Override
     public JmSarStatusDTO getLastStatus(String payloadIp) {
-        String statusKey = CacheKey.getSarConnect(payloadIp);
+        String statusKey = CacheKey.getSarStatus(payloadIp);
         JmSarStatusDTO status = CacheUtil.get(sarShortCache, statusKey, JmSarStatusDTO.class);
         if (status == null) {
             try {

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/device/service/impl/UavServiceImpl.java

@@ -40,9 +40,9 @@ public class UavServiceImpl implements IUavService {
 
     @PostConstruct
     public void initCache() {
-        permanentCache = cacheManager.getCache("sar-payload-permanent");
+        permanentCache = cacheManager.getCache("sar-permanent");
         if (permanentCache == null) {
-            throw new IllegalStateException("永久缓存 sar-payload-permanent 未找到，请检查 CacheConfig 配置");
+            throw new IllegalStateException("永久缓存 sar-permanent 未找到，请检查 CacheConfig 配置");
         }
     }
 

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/task/JmTaskScheduler.java

@@ -49,8 +49,8 @@ public class JmTaskScheduler {
 
     @PostConstruct
     public void initCaches() {
-        sarPermanentCache = cacheManager.getCache("sar-payload-permanent");
+        sarPermanentCache = cacheManager.getCache("sar-permanent");
-        sarShortCache = cacheManager.getCache("sar-short-lived");
+        sarShortCache = cacheManager.getCache("sar-short");
     }
 
     /**
@@ -118,7 +118,7 @@ public class JmTaskScheduler {
             sarList.forEach(sar -> {
                 String ip = sar.getIp();
                 // 判断是否已连接：看 shortCache 里是否有该 ip 的状态（最近有状态包）
-                boolean hasStatus = CacheUtil.get(sarShortCache, CacheKey.getSarConnect(ip), JmSarStatusDTO.class) != null;
+                boolean hasStatus = CacheUtil.get(sarShortCache, CacheKey.getSarStatus(ip), JmSarStatusDTO.class) != null;
                 // 判断是否已执行连接指令：看 permanentCache 里是否有该 ip 的连接标志
                 boolean hasConnectedFlag = sarPermanentCache.get(ip) != null;
                 // 如果缺少状态 或 缺少连接标志，则尝试连接

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/config/CacheConfig.java

@@ -40,18 +40,18 @@ public class CacheConfig {
                         .maximumSize(5000)  // 预计活跃用户数
                         .build());
         // 永久缓存：SAR 载荷专用（不设过期）
-        cacheManager.registerCustomCache("sar-payload-permanent", Caffeine.newBuilder()
+        cacheManager.registerCustomCache("sar-permanent", Caffeine.newBuilder()
                 .maximumSize(5000)  // 根据 SAR 载荷数量调整
                 .build());
+        // 短时状态/连接（已存在，确认过期时间）
+        cacheManager.registerCustomCache("sar-short", Caffeine.newBuilder()
+                .expireAfterWrite(3, TimeUnit.SECONDS)  // 建议 3~5 秒，防边界丢失
+                .maximumSize(2000)
+                .build());
         // 永久缓存：UAV 专用（不设过期）
         cacheManager.registerCustomCache("uav-permanent", Caffeine.newBuilder()
                 .maximumSize(5000)  // 根据无人机数量调整
                 .build());
-        // 短时状态/连接（已存在，确认过期时间）
-        cacheManager.registerCustomCache("sar-short-lived", Caffeine.newBuilder()
-                .expireAfterWrite(3, TimeUnit.SECONDS)  // 建议 3~5 秒，防边界丢失
-                .maximumSize(2000)
-                .build());
         cacheManager.registerCustomCache("uav-status", Caffeine.newBuilder()
                 .expireAfterWrite(10, TimeUnit.MINUTES)   // 与原 CACHE_EXPIRE_SECONDS 一致
                 .maximumSize(1000)                        // 按设备/IP 数量预估

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/consts/CacheKey.java

@@ -2,109 +2,57 @@ package com.zhangy.skyeye.publics.consts;
 
 public class CacheKey {
 
-    /*==========================================
+    /*==================== publics 模块 ====================*/
-        publics 模块用 skyeye: 前缀
+    // 用户token，30分钟
-     ==========================================*/
-
-    /**
-     * 用户token，30分钟
-     */
     private static final String USER_TOEKN = "skyeye:user:token:%s@%s";
 
-    /**
+    // 获取token key
-     * 获取token key
+    public static String getToken(Long userId, String userName) {
-     */
-    public static String getToekn(Long userId, String userName) {
         return String.format(CacheKey.USER_TOEKN, userId, userName);
     }
 
-    /*==========================================
+    /*==================== 分布式锁 ====================*/
-        分布式锁用 skyeye:lock: 前缀
+    // 上传sar图像锁
-     ==========================================*/
-
-    /**
-     * 上传sar图像锁
-     */
     public static final String SAR_IMAGE_UPLOAD_LOCK = "skyeye:lock:image";
 
-    /*==========================================
+    /*==================== SAR 模块 ====================*/
-        sar 模块用 skyeye:sar: 前缀
+    // 控制回包，1秒
-     ==========================================*/
-
-    /**
-     * 控制回包，1秒
-     */
     private static final String SAR_CONTROL_BACK = "skyeye:sar:control";
-
+    // sar状态，1秒
-    /**
+    private static final String SAR_STATUS = "skyeye:sar:status";
-     * 获取控制回包key：加ip
+    // 已执行连接命令的sar，永久
-     */
-    public static String getSarControlBack(String ip) {
-        return SAR_CONTROL_BACK + ip;
-    }
-
-    /**
-     * sar状态，1秒
-     */
-    private static final String SAR_STATUS = "skyeye:sar:status:";
-
-    /**
-     * 获取状态key：加ip
-     */
-    public static String getSarConnect(String ip) {
-        return SAR_STATUS + ip;
-    }
-
-    /**
-     * 已执行连接命令的sar，永久
-     */
     public static final String SAR_CONNECTED = "skyeye:sar:connected";
 
-    /*==========================================
+    // 获取控制回包key：加ip
-        device 模块用 skyeye:device: 前缀
+    public static String getSarControlBack(String ip) {
-     ==========================================*/
+        return SAR_CONTROL_BACK + ":" + ip;
+    }
+    // 获取状态key：加ip
+    public static String getSarStatus(String ip) {
+        return SAR_STATUS + ":" + ip;
+    }
+    // 获取已执行连接命令的sar-key：加ip
+    public static String getSarConnected(String ip) {
+        return SAR_CONNECTED + ":" + ip;
+    }
 
-    /**
+    /*==================== Device 模块 ====================*/
-     * sar载荷，永久
+    // sar载荷，永久
-     */
     public static final String DEVICE_SAR = "skyeye:device:sar";
-
+    // 无人机，永久
-    /**
-     * 无人机，永久
-     */
     public static final String DEVICE_UAV = "skyeye:device:uav";
 
-    /*==========================================
+    /*==================== SMP 模块 ====================*/
-        smp 模块用 skyeye:smp: 前缀
+    // 运动规划响应，1秒
-     ==========================================*/
-
-    /**
-     * 运动规划响应，1秒
-     */
     public static final String SMP_WAYPOINT_RES = "skyeye:smp:waypoint:";
-
+    // 飞行控制响应，1秒
-    /**
-     * 飞行控制响应，1秒
-     */
     public static final String SMP_FLIGHT_RES = "skyeye:smp:flight:";
-
+    // 云台控制响应，1秒
-    /**
-     * 云台控制响应，1秒
-     */
     public static final String SMP_GIMBALMGR_RES = "skyeye:smp:gimbalmgr:";
-
+    // 数据订阅响应，1秒
-    /**
-     * 数据订阅响应，1秒
-     */
     public static final String SMP_SUBSCRIPT_RES = "skyeye:smp:subscript:";
-
+    // 数据订阅回传数据，1秒
-    /**
-     * 数据订阅回传数据，1秒
-     */
     public static final String SMP_SUBSCRIPT_DATA = "skyeye:smp:subscript:";
-
+    // 相机视频流响应，1秒
-    /**
-     * 相机视频流响应，1秒
-     */
     public static final String SMP_VIDEO_RES = "skyeye:smp:video:";
 }

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/controller/SysUserController.java

@@ -94,7 +94,7 @@ public class SysUserController {
     public Result logout() {
         UserDTO userDTO = SecurityUtil.getUser();
         if (userDTO != null) {
-            String key = CacheKey.getToekn(userDTO.getId(), userDTO.getAccount());
+            String key = CacheKey.getToken(userDTO.getId(), userDTO.getAccount());
             Objects.requireNonNull(cacheManager.getCache("user-tokens")).evict(key);
         }
         return Result.status(true);

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/dto/UserDTO.java

@@ -41,6 +41,6 @@ public class UserDTO {
      * @return
      */
     public String getTokenKey() {
-        return CacheKey.getToekn(id, account);
+        return CacheKey.getToken(id, account);
     }
 }

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/control/SarControlConnectStrategy.java

@@ -1,5 +1,6 @@
 package com.zhangy.skyeye.sar.control;
 
+import com.zhangy.skyeye.sar.cache.SarCache;
 import com.zhangy.skyeye.sar.dto.SarControlDTO;
 import com.zhangy.skyeye.sar.dto.SarControlParamDTO;
 import com.zhangy.skyeye.sar.enums.SarControlTypeEnum;
@@ -32,7 +33,7 @@ public class SarControlConnectStrategy implements ISarControlStrategy {
 
     @PostConstruct
     public void initCache() {
-        this.permanentCache = cacheManager.getCache("sar-payload-permanent");
+        this.permanentCache = cacheManager.getCache("sar-permanent");
         if (this.permanentCache == null) {
             log.error("永久缓存 sar-payload-permanent 未找到，请检查 CacheConfig 配置");
         }

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/control/SarControlContext.java

@@ -170,9 +170,9 @@ public class SarControlContext {
      * 轮询等待缓存中的回执（带超时）
      */
     private SarErrorDTO waitForResponse(String cacheKey, String ip, SarControlTypeEnum controlType) {
-        Cache sarShortCache = cacheManager.getCache("sar-short-lived");
+        Cache sarShortCache = cacheManager.getCache("sar-short");
         if (sarShortCache == null) {
-            log.error("无法获取 sar-short-lived cache");
+            log.error("无法获取 sar-short cache");
             return null;
         }
         long start = System.currentTimeMillis();

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/control/SarControlDisconnectStrategy.java

@@ -31,8 +31,8 @@ public class SarControlDisconnectStrategy implements ISarControlStrategy {
 
     @PostConstruct
     public void init() {
-        this.sarShortCache = cacheManager.getCache("sar-short-lived");
+        this.sarShortCache = cacheManager.getCache("sar-short");
-        this.sarPermanentCache = cacheManager.getCache("sar-payload-permanent");
+        this.sarPermanentCache = cacheManager.getCache("sar-permanent");
     }
 
     @Override
@@ -50,7 +50,7 @@ public class SarControlDisconnectStrategy implements ISarControlStrategy {
 
     @Override
     public void sendPost(SarControlDTO sar) {
-        String connectKey = CacheKey.getSarConnect(sar.getIp());
+        String connectKey = CacheKey.getSarStatus(sar.getIp());
         if (sarShortCache != null) {
             sarShortCache.evict(connectKey);
         }

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/controller/SarControlController.java

@@ -41,14 +41,12 @@ public class SarControlController {
      */
     @RequestMapping("/turnon")
     public Result turnOn(@RequestBody String ip) {
-        String ipVal = "";
+        String ipVal;
         try {
             // 1. 使用 ObjectMapper 将 JSON 字符串解析成一个 JsonNode 树
             JsonNode rootNode = objectMapper.readTree(ip);
-
             // 2. 从树中获取 "payloadId" 节点，并将其值转换为文本
             ipVal = rootNode.path("payloadId").asText();
-
             // 检查是否成功获取
             if (ipVal == null || ipVal.isEmpty()) {
                 // 根据你的业务逻辑返回错误，例如

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/listen/SarStatusListener.java

@@ -82,10 +82,10 @@ public class SarStatusListener extends SarAbstractListener {
                 log.warn("状态包校验失败，已丢弃。");
             return;
         }
-        Cache sarShortCache = cacheManager.getCache("sar-short-lived");
+        Cache sarShortCache = cacheManager.getCache("sar-short");
         if (sarShortCache == null) {
-            log.error("sar-short-lived 缓存未找到！请检查 CacheConfig");
+            log.error("sar-short 缓存未找到！请检查 CacheConfig");
-            throw new IllegalStateException("sar-short-lived 缓存未找到");
+            throw new IllegalStateException("sar-short 缓存未找到");
         }
         // 错误包 → 回执
         int errorStatus = packDTO.getErrorPacketStatus();
@@ -103,7 +103,7 @@ public class SarStatusListener extends SarAbstractListener {
             JmSarStatusDTO info = packDTO.getDeviceStatusInfo();
             log.debug("sar开机状态：{}", info.getIsBoot());
             sarJobStatusService.update(ip, info);
-            String connectKey = CacheKey.getSarConnect(ip);
+            String connectKey = CacheKey.getSarStatus(ip);
             sarShortCache.put(connectKey, info);  // 写入，自动过期
         }
         log.debug("----------------------状态包解析完毕");

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarControlServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import java.util.Objects;
 import java.util.Optional;
 
 import static com.zhangy.skyeye.jm.consts.JmJobModeEnum.CRUISE;
@@ -31,16 +32,19 @@ import static com.zhangy.skyeye.jm.consts.JmJobModeEnum.CRUISE;
 public class SarControlServiceImpl implements ISarControlService {
 
     private final SarControlContext udpSendContext;
-
     private final CacheManager cacheManager;  // final 字段
-
     private Cache sarShortCache;
+    private Cache sarPermanentCache;
 
     @PostConstruct
     public void init() {
-        this.sarShortCache = cacheManager.getCache("sar-short-lived");
+        this.sarPermanentCache = cacheManager.getCache("sar-permanent");
+        this.sarShortCache = cacheManager.getCache("sar-short");
         if (sarShortCache == null) {
-            log.error("sar-short-lived cache 未找到！");
+            log.error("sar-short cache 未找到！");
+        }
+        if (sarPermanentCache == null) {
+            log.error("sar-permanent cache 未找到！");
         }
     }
 
@@ -96,27 +100,27 @@ public class SarControlServiceImpl implements ISarControlService {
 
     @Override
     public void turnOn(String ip) {
-        if (!redisUtil.hHasKey(CacheKey.SAR_CONNECTED, ip) || !redisUtil.hasKey(CacheKey.getSarConnect(ip))) {
+        if (Objects.nonNull(sarPermanentCache.get(CacheKey.getSarConnected(ip))) &&
+                Objects.nonNull(sarPermanentCache.get(CacheKey.getSarStatus(ip)))) {
             throw new ServiceException("请先加电并连接sar");
         }
-
         SarControlParamDTO param = new SarControlParamDTO(ip, SarControlTypeEnum.TURNON);
         udpSendContext.execute(param);
     }
 
     @Override
     public void endAll(String ip) {
-        if (!redisUtil.hHasKey(CacheKey.SAR_CONNECTED, ip) || !redisUtil.hasKey(CacheKey.getSarConnect(ip))) {
+        if (Objects.nonNull(sarPermanentCache.get(CacheKey.getSarConnected(ip))) &&
+                Objects.nonNull(sarPermanentCache.get(CacheKey.getSarStatus(ip)))) {
             throw new ServiceException("请先加电并连接sar");
         }
-
         SarControlParamDTO param = new SarControlParamDTO(ip, SarControlTypeEnum.ENDALL);
         udpSendContext.execute(param);
     }
 
     @Override
     public JmSarStatusDTO getLatestStatus(String ip) {
-        String connectKey = CacheKey.getSarConnect(ip);
+        String connectKey = CacheKey.getSarStatus(ip);
         return CacheUtil.get(sarShortCache, connectKey, JmSarStatusDTO.class);
     }
 }

library/skyeye-dev/skyeye-redis/src/main/java/com/zhangy/skyeye/redis/config/DTRedisTemplateConfiguration.java

@@ -1,70 +0,0 @@
-//package com.zhangy.skyeye.redis.config;
-//
-//import com.zhangy.skyeye.redis.utils.RedisUtil;
-//import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-//import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-//import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-//import org.springframework.cache.CacheManager;
-//import org.springframework.cache.annotation.EnableCaching;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.data.redis.cache.RedisCacheConfiguration;
-//import org.springframework.data.redis.cache.RedisCacheManager;
-//import org.springframework.data.redis.cache.RedisCacheWriter;
-//import org.springframework.data.redis.connection.RedisConnectionFactory;
-//import org.springframework.data.redis.core.RedisTemplate;
-//import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
-//import org.springframework.data.redis.serializer.RedisSerializer;
-//
-//import java.time.Duration;
-//
-///**
-// * Redis 配置
-// */
-//@EnableCaching
-//@Configuration(proxyBeanMethods = false)
-//@AutoConfigureBefore(RedisAutoConfiguration.class)
-//public class DTRedisTemplateConfiguration {
-//
-//	/**
-//	 * value 值 序列化
-//	 * @return RedisSerializer
-//	 */
-//	@Bean
-//	@ConditionalOnMissingBean(RedisSerializer.class)
-//	public RedisSerializer<Object> redisSerializer() {
-//		return new JdkSerializationRedisSerializer();
-//	}
-//
-//	@Bean(name = "redisTemplate")
-//	@ConditionalOnMissingBean(RedisTemplate.class)
-//	public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory, RedisSerializer<Object> redisSerializer) {
-//		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-//		RedisKeySerializer redisKeySerializer = new RedisKeySerializer();
-//		// key 序列化
-//		redisTemplate.setKeySerializer(redisKeySerializer);
-//		redisTemplate.setHashKeySerializer(redisKeySerializer);
-//		// value 序列化
-//		redisTemplate.setValueSerializer(redisSerializer);
-//		redisTemplate.setHashValueSerializer(redisSerializer);
-//		redisTemplate.setConnectionFactory(redisConnectionFactory);
-//		return redisTemplate;
-//	}
-//
-//	@Bean
-//	public CacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
-//		RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
-//			.entryTtl(Duration.ofHours(1));
-//		return RedisCacheManager
-//			.builder(RedisCacheWriter.nonLockingRedisCacheWriter(redisConnectionFactory))
-//			.cacheDefaults(redisCacheConfiguration).build();
-//	}
-//
-//	@Bean(name = "redisUtil")
-//	@ConditionalOnBean(RedisTemplate.class)
-//	public RedisUtil redisUtils(RedisTemplate<String, Object> redisTemplate) {
-//		return new RedisUtil(redisTemplate);
-//	}
-//
-//}