From c5bc13d3af3ead52754e972a1468c402d193f8c2 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 29 Sep 2021 16:23:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=E3=80=90?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=8E=92=E5=90=8D=E3=80=91&=E3=80=90?= =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7=E3=80=91=E4=B8=AD=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E7=BC=93=E5=AD=98=E5=86=85=E5=AE=B9=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 9 ----- .../redis/common/bean/GridInfoCache.java | 12 ------- .../impl/BizPointTotalDetailServiceImpl.java | 36 ++++++++----------- .../java/com/epmet/dto/CustomerGridDTO.java | 3 ++ .../service/impl/CustomerGridServiceImpl.java | 7 ++-- 5 files changed, 21 insertions(+), 46 deletions(-) delete mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index a6a83e64e7..6fe4130225 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -212,15 +212,6 @@ public class RedisKeys { return rootPrefix.concat("gov:agency:").concat(agencyId); } - /** - * 网格信息key - * @param gridId - * @return - */ - public static String getGridByIdKey(String gridId) { - return rootPrefix.concat("gov:grid:").concat(gridId); - } - /** * 客户标签排行 缓存Key * @param customerId diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java deleted file mode 100644 index 2900180581..0000000000 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.epmet.commons.tools.redis.common.bean; - -import lombok.Data; - -@Data -public class GridInfoCache { - private String gridId; - private String gridNamePath; - private String customerId; - private String pid; - private String pids; -} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java index 78d6fd7c81..87b7b20a32 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java @@ -29,7 +29,7 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisKeys; -import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; @@ -47,7 +47,6 @@ import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO; import com.epmet.dto.result.GroupPointRankingResultDTO; import com.epmet.entity.BizPointTotalDetailEntity; import com.epmet.resi.group.dto.group.ResiGroupDTO; -import com.epmet.resi.group.dto.group.result.RankingResultDTO; import com.epmet.resi.group.enums.SearchScopeTypeEnum; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.BizPointTotalDetailService; @@ -88,6 +87,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl redisTemplate; @Autowired private GovOrgOpenFeignClient govOrgOpenFeignClient; + @Autowired + private RedisUtils redisUtils; @Override public PageData page(Map params) { @@ -320,8 +321,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl ope = redisTemplate.opsForHash(); - Map entries = ope.entries(RedisKeys.getGridInfoKey(gridId)); - if (entries.size() != 0) { - return BeanUtil.mapToBean(entries, GridInfoCache.class, true); + public CustomerGridDTO getGridInfo(String gridId) { + String redisKey = RedisKeys.getGridInfoKey(gridId); + Map gridCache = redisUtils.hGetAll(redisKey); + if (gridCache != null && gridCache.size() > 0) { + // 直接取缓存中的 + CustomerGridDTO gridInfo = BeanUtil.mapToBean(gridCache, CustomerGridDTO.class, true); + return gridInfo; } CustomerGridFormDTO form = new CustomerGridFormDTO(); form.setGridId(gridId); - Result result = govOrgOpenFeignClient.getCustomerGridByGridId(form); - if (result == null || !result.success() || result.getData() == null) { - return null; - } - - GridInfoCache cache = new GridInfoCache(); - cache.setCustomerId(result.getData().getCustomerId()); - cache.setGridId(result.getData().getId()); - cache.setGridNamePath(result.getData().getGridName()); - cache.setPid(result.getData().getPid()); - cache.setPids(result.getData().getPids()); - ope.putAll(RedisKeys.getGridInfoKey(gridId), BeanUtil.beanToMap(cache)); - return cache; + Result result = govOrgOpenFeignClient.getGridBaseInfoByGridId(form); + return getResultDataOrThrowsException(result, ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【小组排名】查询网格信息失败"); } @Override diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java index 39a0968121..d58682f00a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java @@ -49,6 +49,9 @@ public class CustomerGridDTO implements Serializable { */ private String gridName; + /** 组织-网格 */ + private String gridNamePath; + /** * 中心位置经度 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 727d1536da..82b9629274 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -720,7 +720,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl gridCache = redisUtils.hGetAll(redisKey); if (gridCache != null && gridCache.size() > 0) { // 直接取缓存中的 @@ -730,8 +730,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl