From c4bcfcb33b861fe759c5722a5f01f6c89ca59eb8 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Mon, 25 Sep 2023 18:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=9C=81=E5=B8=82=E5=8C=BA?= =?UTF-8?q?=E5=8F=8A=E5=A4=A7=E5=8C=BA=E4=B8=9A=E5=8A=A1=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=9A=84=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MDMAreaServiceImpl.java | 51 +++++++++---------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java index ab8893c33..dcc1589c9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java @@ -1,8 +1,5 @@ package com.cool.store.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.RedisConstant; import com.cool.store.dto.response.MDMResultDTO; import com.cool.store.entity.MDMAreaDO; import com.cool.store.exception.ApiException; @@ -13,13 +10,11 @@ import com.cool.store.response.mdm.BusinessRegion; import com.cool.store.service.MDMAreaService; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.text.MessageFormat; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -41,13 +36,13 @@ public class MDMAreaServiceImpl implements MDMAreaService { */ @Override public List getProvince() { - String provincesJson = redisUtilPool.getString(RedisConstant.MDM_AREA_PROVINCE); - if (StringUtils.isNotEmpty(provincesJson)) { - return (List) JSONObject.parseObject(provincesJson, List.class); - } +// String provincesJson = redisUtilPool.getString(RedisConstant.MDM_AREA_PROVINCE); +// if (StringUtils.isNotEmpty(provincesJson)) { +// return (List) JSONObject.parseObject(provincesJson, List.class); +// } List areaDOList = mdmAreaMapper.getProvince(); //过期时间三小时 - redisUtilPool.setString(RedisConstant.MDM_AREA_PROVINCE, JSONObject.toJSONString(areaDOList), 3 * 60 * 60); +// redisUtilPool.setString(RedisConstant.MDM_AREA_PROVINCE, JSONObject.toJSONString(areaDOList), 3 * 60 * 60); return areaDOList; } @@ -57,17 +52,17 @@ public class MDMAreaServiceImpl implements MDMAreaService { */ @Override public List getSonArea(String code) { - String provincesJson = redisUtilPool.getString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code)); - if (StringUtils.isNotEmpty(provincesJson)) { - return (List) JSONObject.parseObject(provincesJson, List.class); - } +// String provincesJson = redisUtilPool.getString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code)); +// if (StringUtils.isNotEmpty(provincesJson)) { +// return (List) JSONObject.parseObject(provincesJson, List.class); +// } List areaDOList = mdmAreaMapper.getSonArea(code); //数据库也没有该数据就缓存空值，但是只缓存一分钟 - if (areaDOList == null || areaDOList.size() == 0) { - redisUtilPool.setString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code), "", 60); - } +// if (areaDOList == null || areaDOList.size() == 0) { +// redisUtilPool.setString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code), "", 60); +// } //过期时间三小时 - redisUtilPool.setString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code), JSONObject.toJSONString(areaDOList), 3 * 60 * 60); +// redisUtilPool.setString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code), JSONObject.toJSONString(areaDOList), 3 * 60 * 60); return areaDOList; } @@ -114,16 +109,16 @@ public class MDMAreaServiceImpl implements MDMAreaService { */ @Override public List getBelongRegion() throws ApiException { - String belongRegionsString = redisUtilPool.getString(RedisConstant.MDM_BELONG_REGION); - if (StringUtil.isNotEmpty(belongRegionsString)) { - return (List) JSONObject.parseObject(belongRegionsString, List.class); - } +// String belongRegionsString = redisUtilPool.getString(RedisConstant.MDM_BELONG_REGION); +// if (StringUtil.isNotEmpty(belongRegionsString)) { +// return (List) JSONObject.parseObject(belongRegionsString, List.class); +// } Map headers = new HashMap<>(); headers.put("Authorization", mdmHttpRequest.getMdmAccessToken()); ResponseEntity belongRegionResp = mdmHttpRequest.getBelongRegion(headers); List belongRegions = (List) belongRegionResp.getBody().getData(); //缓存，半个小时过期 - redisUtilPool.setString(RedisConstant.MDM_BELONG_REGION, JSON.toJSONString(belongRegions), 30 * 60); +// redisUtilPool.setString(RedisConstant.MDM_BELONG_REGION, JSON.toJSONString(belongRegions), 30 * 60); return belongRegions; } @@ -133,16 +128,16 @@ public class MDMAreaServiceImpl implements MDMAreaService { */ @Override public List getBusinessRegion() throws ApiException { - String belongRegionsString = redisUtilPool.getString(RedisConstant.MDM_BUSINESS_REGION); - if (StringUtil.isNotEmpty(belongRegionsString)) { - return (List) JSONObject.parseObject(belongRegionsString, List.class); - } +// String belongRegionsString = redisUtilPool.getString(RedisConstant.MDM_BUSINESS_REGION); +// if (StringUtil.isNotEmpty(belongRegionsString)) { +// return (List) JSONObject.parseObject(belongRegionsString, List.class); +// } Map headers = new HashMap<>(); headers.put("Authorization", mdmHttpRequest.getMdmAccessToken()); ResponseEntity belongRegionResp = mdmHttpRequest.getBusinessRegion(headers); List businessRegions = (List) belongRegionResp.getBody().getData(); //缓存，半个小时过期 - redisUtilPool.setString(RedisConstant.MDM_BUSINESS_REGION, JSON.toJSONString(businessRegions), 30 * 60); +// redisUtilPool.setString(RedisConstant.MDM_BUSINESS_REGION, JSON.toJSONString(businessRegions), 30 * 60); return businessRegions; }