Merge branch 'customer_service_SZlu'

src/main/java/com/yaoyaozw/customer/constants/FollowReplyCommonConstant.java

@@ -11,6 +11,8 @@ import java.util.List;
  */
 public class FollowReplyCommonConstant {
 
+    public final static String FOLLOW_REPLY_REDIS_KEY = "followReplyMap";
+
     public final static String TENCENT_MEDIA_TYPE_PIC = "image";
     public final static String TENCENT_MEDIA_TYPE_VOICE = "voice";
     public final static String TENCENT_MEDIA_TYPE_NEWS = "news";

src/main/java/com/yaoyaozw/customer/service/impl/CustomerFollowReplyServiceImpl.java

@@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -59,6 +60,8 @@ public class CustomerFollowReplyServiceImpl extends ServiceImpl<CustomerFollowRe
     private ReferralEntityService referralEntityService;
     @Autowired
     private AuthorizerInfoService authorizerInfoService;
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
 
 
     @Override
@@ -136,6 +139,7 @@ public class CustomerFollowReplyServiceImpl extends ServiceImpl<CustomerFollowRe
         } else {
             this.updateById(entity);
         }
+        putMaterialToRedis(entity.getAppid(), null);
         return new GenericsResult<>(String.valueOf(entity.getId()));
     }
 
@@ -183,6 +187,8 @@ public class CustomerFollowReplyServiceImpl extends ServiceImpl<CustomerFollowRe
         this.removeById(id);
         // 删除相关链接
         referralEntityService.remove(new QueryWrapper<ReferralEntity>().eq(ReferralEntity.COL_MATERIAL_GRAPHICS_ID, id));
+        // 重置redis中的素材
+        putMaterialToRedis(entity.getAppid(), null);
 
         return new BaseResult().success("删除");
     }
@@ -237,6 +243,8 @@ public class CustomerFollowReplyServiceImpl extends ServiceImpl<CustomerFollowRe
             } else {
                 if (CollectionUtil.isNotEmpty(result.getMaterialList())) {
                     this.saveBatch(result.getMaterialList());
+                    // 复用之后的结果存储到 redis
+                    putMaterialToRedis(targetAuth.getAppId(), result.getMaterialList());
                 }
                 if (CollectionUtil.isNotEmpty(result.getReferralEntityList())) {
                     referralEntityService.saveBatch(result.getReferralEntityList());
@@ -355,4 +363,17 @@ public class CustomerFollowReplyServiceImpl extends ServiceImpl<CustomerFollowRe
         return null;
     }
 
+    private void putMaterialToRedis(String appid, List<CustomerFollowReply> entityList) {
+        if (StringUtils.isNotEmpty(appid) && CollectionUtil.isEmpty(entityList)) {
+            // 传参没传实体, 现查
+            entityList = this.list(new QueryWrapper<CustomerFollowReply>().eq("appid", appid));
+        }
+        if (CollectionUtil.isNotEmpty(entityList)) {
+            String jsonStr = JSONUtil.toJsonStr(entityList);
+            redisTemplate.opsForHash().put(FollowReplyCommonConstant.FOLLOW_REPLY_REDIS_KEY, appid, jsonStr);
+        } else {
+            redisTemplate.opsForHash().delete(FollowReplyCommonConstant.FOLLOW_REPLY_REDIS_KEY, appid);
+        }
+    }
+
 }