From c5bc13d3af3ead52754e972a1468c402d193f8c2 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 29 Sep 2021 16:23:59 +0800 Subject: [PATCH 1/5] =?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 Date: Wed, 29 Sep 2021 16:58:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=20?= =?UTF-8?q?=E3=80=90=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=B9=B6=E7=BC=93=E5=AD=98=E3=80=91=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=A4=E6=96=ADdel=5Fflag=3D1=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E4=B8=8D=E7=BC=93=E5=AD=98=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerGridServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 82b9629274..58faa734ac 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 @@ -733,9 +733,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 11:15:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AF=84=E5=88=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index bc905870e8..f83db7979c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -580,8 +580,8 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl Date: Thu, 30 Sep 2021 12:03:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/epmettduck/result/TDuckListResultDTO.java | 4 ++-- .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java index ee412e8ad3..5b2346cb97 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java @@ -4,8 +4,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -69,6 +67,7 @@ public class TDuckListResultDTO implements Serializable { private String client; private String createdTime; + private String updatedTime; /** * 是否填写问卷，true：是，false：否 @@ -107,6 +106,7 @@ public class TDuckListResultDTO implements Serializable { this.status = NumConstant.ONE; this.client = ""; this.createdTime = ""; + this.updatedTime = ""; this.fillStatus = false; this.isFillQuestion = true; this.orgName = ""; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml index a22d98b11d..48bd2f41bc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml @@ -92,7 +92,7 @@ #{key} ) - ORDER BY up.created_time DESC + ORDER BY up.updated_time DESC \ No newline at end of file From ce433557a24f3195b27e900648bb29d97890beaf Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Sep 2021 15:11:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PrUserProjectServiceImpl.java | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index f83db7979c..0c6894e9de 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -51,6 +51,7 @@ import com.epmet.dataaggre.dto.epmettduck.result.*; import com.epmet.dataaggre.dto.epmettduck.struct.*; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity; +import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity; import com.epmet.dataaggre.service.epmettduck.PrPublishRangeService; import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; import com.epmet.dataaggre.service.epmettduck.PrVistRecordService; @@ -70,6 +71,8 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -251,9 +254,37 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl insertPrVistRecord(TDuckListFormDTO formDTO) { + return Executors.newCachedThreadPool().submit(()->{ + PrVistRecordDTO param = new PrVistRecordDTO(); + param.setCustomerId(formDTO.getCustomerId()); + param.setUserId(formDTO.getUserId()); + param.setUserType(formDTO.getOrgType()); + param.setProjectKey(formDTO.getClient()); + PrVistRecordDTO newestRecord = prVistRecordService.getNewestRecord(formDTO.getUserId()); + PrVistRecordEntity entity = ConvertUtils.sourceToTarget(PrVistRecordDTO.class, PrVistRecordEntity.class); + if (newestRecord == null) { + prVistRecordService.insert(entity); + } else { + entity = new PrVistRecordEntity(); + entity.setId(newestRecord.getId()); + prVistRecordService.updateById(entity); + } + }); + } + /** * @Description orgIds拼接 * @Param pids @@ -808,4 +839,4 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl