diff --git a/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java index 52e91f4de..7da08a3d9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java @@ -1,11 +1,9 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -162,22 +160,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - } diff --git a/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java index 29ceeaa55..7e167a93e 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java @@ -1,11 +1,9 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -124,21 +122,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - } diff --git a/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java index b99a2236f..39666265b 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java @@ -1,12 +1,10 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; import com.iformall.domain.vo.WxCouponCVo; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -142,21 +140,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - } diff --git a/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java b/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java index 90b93d911..7da08a3d9 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java @@ -1,11 +1,9 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -162,21 +160,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - } diff --git a/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java b/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java index 91be4cbfe..8f732eb31 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java @@ -1,11 +1,9 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -146,20 +144,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } } diff --git a/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java index 59852710d..7e167a93e 100644 --- a/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java @@ -1,11 +1,9 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -124,20 +122,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } } diff --git a/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java b/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java index 6e35c905f..9195744e4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java @@ -1,11 +1,9 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -147,21 +145,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java index a13751591..332e4a631 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java @@ -7,7 +7,6 @@ import com.iformall.domain.po.WxTopic; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.po.WxCouponChannel; -import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.Param; public interface WxCouponChannelMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 4499e8443..6b2b499d2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -5,7 +5,6 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxTopic; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponStatisVo; -import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.Param; import com.iformall.domain.po.WxCoupon; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 7fb800d74..6fd63f643 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -21,13 +21,9 @@ import com.iformall.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; import java.util.*; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @Service @@ -50,9 +46,6 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { QrCodeService qrCodeService; @Autowired WxCardInfoMapper wxCardInfoMapper; - @Autowired - @Qualifier("couponChannelRedisTemplate") - RedisTemplate> cdRedisTemplate; /** * B端业务端 @@ -118,23 +111,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { record.setUpdateDate(new Date()); wxCouponChannelMapper.updateByPrimaryKeySelective(record); } - - //清除缓存 - clearCache(record.getTenantId()); return new ResultData(); } - /** - * 清除c端首页卷列表缓存 - * @param tenantId - */ - public void clearCache(String tenantId){ - for (int i = 1; i <=20 ; i++) { - String key = "couponChannelList_"+tenantId+"_" + i + ":"; - cdRedisTemplate.delete(key); - } - } - @Override public ResultData addBatch(String[] ids, String[] channelId, String tanantId, Date beginTime, Date endTime) { List errorList = new ArrayList<>(); @@ -305,24 +284,6 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { */ @Override public PageInfo listPageCVo(WxCouponChannel record, Integer pageIndex, Integer pageSize) { - PageInfo pageInfo; - //首页走缓存 - if(EnumTargetAd.LIST.getCode().equals(record.getTargetAd()) && new Integer(6).equals(pageSize) && pageIndex.intValue() <=20 ) { - logger.info("---------chache"); - String key = "couponChannelList_"+record.getTenantId()+"_" + pageIndex + ":"; - ValueOperations> operations = cdRedisTemplate.opsForValue(); - boolean hasKey = cdRedisTemplate.hasKey(key); - if (hasKey) { - pageInfo = operations.get(key); - logger.info("---------get:{}",pageInfo.getList().size()); - }else{ - pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoList(record)); - } - //插入缓存 - operations.set(key, pageInfo, 3600, TimeUnit.SECONDS); - return pageInfo; - } - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoList(record)); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 10c61d8cb..282ec1180 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -180,7 +180,7 @@ - select from wx_coupon_channel cc left join wx_coupon c on cc.coupon_id = c.id diff --git a/mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java b/mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java index 90b93d911..7da08a3d9 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java @@ -1,11 +1,9 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -162,21 +160,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - } diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java b/mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java index c4cbd5fef..8f732eb31 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java @@ -1,11 +1,9 @@ package com.iformall.config; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScoreRules; -import com.iformall.domain.vo.WxCouponChannelVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -146,21 +144,4 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - }