From 6e255fea5df14412e5ff36307a15aa0f752ed2b0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 18:03:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponChannelController.java | 5 ----- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 2 -- 2 files changed, 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 0421ef77e..83c680ed7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -5,18 +5,13 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.controller.app.WxAppinfoController; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponSourceType; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.mapper.WxCouponChannelMapper; -import com.iformall.service.QrCodeService; import com.iformall.service.WxCouponChannelService; -import com.iformall.service.WxCouponService; -import com.iformall.service.WxFlowService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index c3fc9e6db..b3518d137 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -26,8 +26,6 @@ import com.iformall.service.excel.WxCardDataExporter; import com.iformall.service.excel.WxCouponDataExporter; import com.iformall.service.excel.WxPressDataExporter; -import cn.afterturn.easypoi.handler.inter.IExcelExportServer; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; From e365fbfa1bd2ae3ee61e8f379f4cf7bfd0804888 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 18:13:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponChannelController.java | 2 ++ .../main/java/com/iformall/controller/WxTopicController.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 57627923e..155877c60 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -73,6 +73,7 @@ public class WxCouponChannelController extends BaseController { String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + pageNum + ":"; PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class); + logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); if (null == page ) { page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); @@ -153,6 +154,7 @@ public class WxCouponChannelController extends BaseController { } key = EnumCacheKey.MERCHANT_COUPON_PAGE_LIST.getMessage() + key + "_" + pageNum + ":"; PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class); + logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); if (null == page ) { page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index a9afd0b88..a5feb1f55 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -46,6 +46,7 @@ public class WxTopicController extends BaseController { String key = EnumCacheKey.TOPIC_ONE.getMessage() + wxTopic.getTenantId() + ":"; WxTopic show = RedisCacheUtils.getCacheObject(redisTemplate, key, WxTopic.class); + logger.info("WxCouponChannelController.chache.get:{} show:{}",key,show); if (null == show ) { show = wxTopicService.show(wxTopic); RedisCacheUtils.cache(redisTemplate, key, show, 100); @@ -63,6 +64,7 @@ public class WxTopicController extends BaseController { String key = EnumCacheKey.TOPIC_LIST.getMessage() + wxTopic.getTenantId() + ":"; List topicList = RedisCacheUtils.getCacheObject(redisTemplate, key, List.class); + logger.info("WxTopicController.chache.get:{} topicList:{}",key,topicList); if (null == topicList ) { topicList = wxTopicService.showList(wxTopic); RedisCacheUtils.cache(redisTemplate, key, topicList, 100); From d2aa7de2629baf3d1e392822f1a31a618c23b553 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 18:59:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponChannelController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 155877c60..10bec7332 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -71,7 +71,7 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.setShowBeginTime(new Date()); - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + pageNum + ":"; + String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + wxCouponChannel.getBusiness() + "_" + pageNum + ":"; PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class); logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); if (null == page ) { From 41463c2be14e281bb1ca3b73e83d0d2d293a63d6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 18:59:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponChannelController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 10bec7332..155182248 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -107,7 +107,7 @@ public class WxCouponChannelController extends BaseController { // return new ResultData(map); // } - @RedisCache(expireTime = 100) + @RedisCache() @ApiOperation("商户活动列表信息") @PostMapping("listByMerchant") @ApiImplicitParams({