缓存改造- sweet:integralActivity:DrawInfo:drawId 增加缓存过期时间

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/utils/SweetRedisAdminUtils.java

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.sweet.utils;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.base.constant.RedisKeyExpireConst;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
@@ -90,7 +91,7 @@ public class SweetRedisAdminUtils {
                 .concat(drawId);
         IntegralActivityDrawVo info = (IntegralActivityDrawVo) redisDataSourceUtil.getRedisSweetUtil().get(redisKeyDraw);
         info.setReceivingStatus(2);
-        redisDataSourceUtil.getRedisSweetUtil().set(redisKeyDraw, info);
+        redisDataSourceUtil.getRedisSweetUtil().set(redisKeyDraw, info, RedisKeyExpireConst.SWEET_INTEGRALACTIVITY_DRAWINFO_DRAWID_EXPIRE);
     }
 
     /**

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

 package com.liquidnet.service.sweet.utils;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
@@ -8,6 +10,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.RandomUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.base.constant.RedisKeyExpireConst;
 import com.liquidnet.service.feign.slime.api.FeignSlimeApiClient;
 import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
@@ -25,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -54,6 +58,8 @@ public class RedisDataUtils {
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
     @Autowired
+    private SweetIntegralActivityDrawMapper sweetIntegralActivityDrawMapper;
+    @Autowired
     @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
@@ -563,7 +569,7 @@ public class RedisDataUtils {
         // 抽奖详情
         String redisKeyDraw = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_INFO
                 .concat(integralActivityDrawVo.getDrawId());
-        redisUtil.set(redisKeyDraw, integralActivityDrawVo);
+        redisUtil.set(redisKeyDraw, integralActivityDrawVo, RedisKeyExpireConst.SWEET_INTEGRALACTIVITY_DRAWINFO_DRAWID_EXPIRE);
     }
 
     public LinkedList<IntegralActivityDrawVo> getIntegralActivityDrawAll(String integralActivityId) {
@@ -668,7 +674,19 @@ public class RedisDataUtils {
                 .concat(drawId);
         Object obj = redisUtil.get(redisKeyDraw);
         if (null == obj) {
-            return IntegralActivityDrawVo.getNew();
+            log.info("redis cache value is null, key: {}", redisKeyDraw);
+            IntegralActivityDrawVo integralActivityDrawVo = IntegralActivityDrawVo.getNew();
+            // 从MySQL数据库查询
+            LambdaQueryWrapper<SweetIntegralActivityDraw> lambda = new QueryWrapper<SweetIntegralActivityDraw>().lambda();
+            lambda.eq(SweetIntegralActivityDraw::getDrawId, drawId);
+
+            List<SweetIntegralActivityDraw> sweetIntegralActivityDraws = sweetIntegralActivityDrawMapper.selectList(lambda);
+            if (!CollectionUtils.isEmpty(sweetIntegralActivityDraws)) {
+                log.info("query mysql successed, drawId: {}", drawId);
+                integralActivityDrawVo.copy(sweetIntegralActivityDraws.get(0));
+                setIntegralActivityDrawInfo(drawId, integralActivityDrawVo);
+            }
+            return integralActivityDrawVo;
         } else {
             return (IntegralActivityDrawVo) obj;
         }
@@ -677,7 +695,7 @@ public class RedisDataUtils {
     public void setIntegralActivityDrawInfo(String drawId, IntegralActivityDrawVo drawVo) {
         String redisKeyDraw = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_INFO
                 .concat(drawId);
-        redisUtil.set(redisKeyDraw, drawVo);
+        redisUtil.set(redisKeyDraw, drawVo, RedisKeyExpireConst.SWEET_INTEGRALACTIVITY_DRAWINFO_DRAWID_EXPIRE);
     }
 
     public void updateIntegralActivityDrawInfo(String drawId, String couponId) {
@@ -687,7 +705,7 @@ public class RedisDataUtils {
         info.setReceivingStatus(2);
         info.setRelationId(couponId);
         info.setUpdatedAt(LocalDateTime.now());
-        redisUtil.set(redisKeyDraw, info);
+        redisUtil.set(redisKeyDraw, info, RedisKeyExpireConst.SWEET_INTEGRALACTIVITY_DRAWINFO_DRAWID_EXPIRE);
     }
 
     public void setIntegralActivityDrawBlack(List<String> uidS) {