Merge branch 'feature/advertisingWechatGroupList' into 'master'

feat: [none] 接口优化advertisingWechatGroupList

See merge request rays/pcloud-book!920

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java

@@ -7,6 +7,7 @@ import com.pcloud.book.advertising.biz.AdvertisingSpaceBiz;
 import com.pcloud.book.advertising.biz.BmBiz;
 import com.pcloud.book.advertising.check.AdvertisingCheck;
 import com.pcloud.book.advertising.check.AdvertisingPlanCheck;
+import com.pcloud.book.advertising.contants.AdvertisingConstants;
 import com.pcloud.book.advertising.dao.AdvertisingAdviserPermissionDao;
 import com.pcloud.book.advertising.dao.AdvertisingAgentPermissionDao;
 import com.pcloud.book.advertising.dao.AdvertisingBrowseRecordDao;
@@ -101,7 +102,7 @@ import com.pcloud.common.utils.DateNewUtils;
 import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
-import com.pcloud.common.utils.aliyun.OssUtils;
+import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.httpclient.UrlUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.convert.file.entity.FileUploadInfo;
@@ -114,7 +115,6 @@ import com.pcloud.wechatgroup.message.dto.GroupChatCountDTO;
 import com.sdk.wxgroup.SendArticleMessageVO;
 import com.sdk.wxgroup.SendPicMessageVO;
 import com.sdk.wxgroup.SendTextMessageVO;
-import com.sdk.wxgroup.WxGroupSDK;
 
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -1145,6 +1145,22 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
      */
     @Override
     public PageBean advertisingWechatGroupList(String name, PageParam pageParam) throws BizException {
+        //缓存中查
+        String key = AdvertisingConstants.WECHATGROUP_ADVERTISING;
+        String field = pageParam.getPageNum() + "-" + pageParam.getNumPerPage();
+        String countKey = AdvertisingConstants.WECHATGROUP_ADVERTISING_COUNT;
+        if (StringUtil.isEmpty(name)){
+            List<Object> groupQrcodeDTOS = JedisClusterUtils.hgetJson2List(key, field, Object.class);
+            Integer count = 0;
+            String countStr = JedisClusterUtils.get(countKey);
+            if (!StringUtil.isEmpty(countStr)) {
+                count = Integer.valueOf(countStr);
+            }
+            if (!ListUtils.isEmpty(groupQrcodeDTOS) && count>0){
+                return new PageBean(pageParam.getPageNum(),pageParam.getNumPerPage(),count,groupQrcodeDTOS);
+            }
+        }
+
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("name", StringUtil.isEmpty(name) ? null : name);
         PageBean pageBean = bookGroupClassifyDao.listPage(pageParam, paramMap, "advertisingWechatGroupList");
@@ -1214,6 +1230,12 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
             qrcodeDTO.setOutNum(outNum);
             qrcodeDTO.setOutRate(outRate);
         }
+        if (StringUtil.isEmpty(name)){
+            JedisClusterUtils.hset2Json(key, field, pageBean.getRecordList());
+            JedisClusterUtils.set(countKey, String.valueOf(pageBean.getTotalCount()));
+            JedisClusterUtils.expire(key, 60);
+            JedisClusterUtils.expire(countKey, 60);
+        }
         return pageBean;
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/advertising/contants/AdvertisingConstants.java

+package com.pcloud.book.advertising.contants;
+
+import com.pcloud.common.constant.CacheConstant;
+
+/**
+ * @ClassName com.pcloud.book.applet.contants.AdvertisingConstants
+ * @Author zhuyajie
+ * @Description 常量
+ * @Date 2020/5/25 11:23
+ * @Version 1.0
+ **/
+public class AdvertisingConstants {
+
+    /**
+     * 微信群与广告列表
+     */
+    public static final String  WECHATGROUP_ADVERTISING = CacheConstant.BOOK+"Advertising:advertisingWechatGroupList";
+    public static final String  WECHATGROUP_ADVERTISING_COUNT = CacheConstant.BOOK+"Advertising:advertisingWechatGroupList_count";
+
+}