redis db切换

common/src/main/java/com/kym/common/config/RedisDBChangeUtil.java

@@ -10,7 +10,8 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class RedisDBChangeUtil {
-    private final StringRedisTemplate redisTemplate;
+
+    public final StringRedisTemplate redisTemplate;
 
     public RedisDBChangeUtil(StringRedisTemplate redisTemplate) {
         this.redisTemplate = redisTemplate;

service/src/main/java/com/kym/service/enplus/impl/EnNotifyServiceImpl.java

@@ -22,7 +22,6 @@ import com.kym.service.utils.KymCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,8 +53,6 @@ public class EnNotifyServiceImpl implements EnNotifyService {
 
     private final KymCache kymCache;
 
-    private final StringRedisTemplate redisTemplate;
-
     private final RedisDBChangeUtil redisDBChangeUtil;
 
     @Value("${kym.notify-email}")
@@ -64,7 +61,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     public EnNotifyServiceImpl(EnPlusService enPlusService, ChargeOrderService chargeOrderService,
                                AccountService accountService, WalletDetailService walletDetailService,
                                MonitorLogService monitorLogService, EquipmentInfoService equipmentInfoService,
-                               KymCache kymCache, StringRedisTemplate redisTemplate, RedisDBChangeUtil redisDBChangeUtil) {
+                               KymCache kymCache, RedisDBChangeUtil redisDBChangeUtil) {
         this.enPlusService = enPlusService;
         this.chargeOrderService = chargeOrderService;
         this.accountService = accountService;
@@ -72,7 +69,6 @@ public class EnNotifyServiceImpl implements EnNotifyService {
         this.monitorLogService = monitorLogService;
         this.equipmentInfoService = equipmentInfoService;
         this.kymCache = kymCache;
-        this.redisTemplate = redisTemplate;
         this.redisDBChangeUtil = redisDBChangeUtil;
     }
 
@@ -110,14 +106,14 @@ public class EnNotifyServiceImpl implements EnNotifyService {
             monitorLogService.save(monitorLog);
 
             // 离线设备放入队列，5分钟之后如果还未恢复则放入长时间离线设备集合中并发送提醒，上线后发送提醒
-            redisTemplate.opsForZSet().add(RedisKeys.OFFLINE, connectorStatusInfo.getConnectorId(), System.currentTimeMillis() + 5 * 60 * 1000);
+            redisDBChangeUtil.redisTemplate.opsForZSet().add(RedisKeys.OFFLINE, connectorStatusInfo.getConnectorId(), System.currentTimeMillis() + 5 * 60 * 1000);
 
 //            MailUtil.send(notifyEmail, "【设备离线通知】", "站点:%s,设备%s离线"
 //                    .formatted(kymCache.getStationName(monitorLog.getStationId()), kymCache.getShortId(monitorLog.getSn())), false);
         } else {
             // 先删除离线设备队列的记录,再删除离线超时队列中的记录
-            var isDelete = redisTemplate.opsForZSet().remove(RedisKeys.OFFLINE, connectorStatusInfo.getConnectorId());
-            var exist = redisTemplate.opsForSet().remove(RedisKeys.OFFLINE_EXPIRED, connectorStatusInfo.getConnectorId());
+            var isDelete = redisDBChangeUtil.redisTemplate.opsForZSet().remove(RedisKeys.OFFLINE, connectorStatusInfo.getConnectorId());
+            var exist = redisDBChangeUtil.redisTemplate.opsForSet().remove(RedisKeys.OFFLINE_EXPIRED, connectorStatusInfo.getConnectorId());
             if ((isDelete != null && isDelete > 0) || (exist != null && exist > 0)) {
                 // 更新设备监控表
                 monitorLogService.lambdaUpdate()