From 34fb3ff7efa8358914a0b78898ec7c81a7910e10 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 7 Sep 2020 12:50:04 +0800 Subject: [PATCH] update --- .../service/impl/WxMallServiceImpl.java | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 5d6b70f6d..6afedbf47 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -3,16 +3,14 @@ package com.iformall.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxProjectConfig; +import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.WxMall; -import com.iformall.domain.po.WxMallBuilding; -import com.iformall.domain.po.WxMallFloor; import com.iformall.mapper.WxMallBuildingMapper; import com.iformall.mapper.WxMallFloorMapper; import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxMallService; import com.iformall.utils.Constant; +import com.iformall.utils.RedisCacheUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,8 +42,10 @@ public class WxMallServiceImpl implements WxMallService { RedisTemplate mallRedisTemplate; @Autowired - @Qualifier("subMallListRedisTemplate") - RedisTemplate> subMallListRedisTemplate; + @Qualifier("objectCommonRedisTemplate") + RedisTemplate subMallListRedisTemplate; + + @Override public String wxMallInit(WxProjectConfig wxProjectConfig) { @@ -211,16 +211,13 @@ public class WxMallServiceImpl implements WxMallService { @Override public List getSubByParentTenantId(String parentTenantId) { String key = Constant.subMallinfoPrev + parentTenantId; - ValueOperations> operations = subMallListRedisTemplate.opsForValue(); - if(subMallListRedisTemplate.hasKey(key)) { - List wxMalls = operations.get(key); - return wxMalls; + List mallList = RedisCacheUtils.getCacheListObject(subMallListRedisTemplate, key, WxMall.class); + if(null == mallList || mallList.size() == 0){ + WxMall q = new WxMall(); + q.setParentTenantId(parentTenantId); + mallList = wxMallMapper.selectList(new QueryWrapper<>(q)); + RedisCacheUtils.cache(subMallListRedisTemplate, key, mallList, 3600*24*7); } - WxMall q = new WxMall(); - q.setParentTenantId(parentTenantId); - List mallList = wxMallMapper.selectList(new QueryWrapper<>(q)); - - operations.set(key, mallList, 7, TimeUnit.DAYS); return mallList; } @@ -243,14 +240,10 @@ public class WxMallServiceImpl implements WxMallService { mallRedisTemplate.delete(key1); } String key2 = Constant.subMallinfoPrev + tenantEntity.getTenantId(); - if(subMallListRedisTemplate.hasKey(key2)){ - subMallListRedisTemplate.delete(key2); - } + RedisCacheUtils.removeCache(subMallListRedisTemplate, key2); if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ String key3 = Constant.subMallinfoPrev + tenantEntity.getParentTenantId(); - if(subMallListRedisTemplate.hasKey(key3)){ - subMallListRedisTemplate.delete(key3); - } + RedisCacheUtils.removeCache(subMallListRedisTemplate, key3); } }