From f02c8dd8f055e9dd113cf91b33b18e930fe7ffb4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 6 Jul 2021 18:00:18 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=8A=A0=E5=A4=A7=E5=86=85=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 670c9b1d5c..6e0f1082aa 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -9,10 +9,10 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./data-stats.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./data-stats.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 1100M + memory: 1600M From 70183f041a7c09473b92682bcc2a8135f40431be Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 6 Jul 2021 18:28:10 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8F=98=E5=8A=A8=E7=9A=84=E6=B6=88=E8=B4=B9=E9=A2=91=E7=8E=87?= =?UTF-8?q?=20=E6=9C=80=E5=B0=8F=E9=97=B4=E9=9A=94=20=E4=B8=BA30s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/mq/ProjectChangedCustomListener.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java index ecc2d38a9b..a9f266edf4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java @@ -2,6 +2,7 @@ package com.epmet.mq; import com.alibaba.fastjson.JSON; import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.SpringContextUtils; @@ -9,6 +10,8 @@ import com.epmet.dto.extract.form.ExtractOriginFormDTO; import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService; import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService; import com.epmet.util.DimIdGenerator; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; @@ -38,13 +41,25 @@ import java.util.stream.Collectors; public class ProjectChangedCustomListener implements MessageListenerConcurrently { private Logger logger = LoggerFactory.getLogger(getClass()); + /** + * 控制通知类型消息的消费频率 + */ + private static final Cache customerIdCache = CacheBuilder.newBuilder().maximumSize(NumConstant.ONE_HUNDRED) + .expireAfterWrite(NumConstant.THIRTY,TimeUnit.SECONDS).build(); @Override public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { long start = System.currentTimeMillis(); try { List customerIds = msgs.stream().map(messageExt -> new String(messageExt.getBody())).distinct().collect(Collectors.toList()); - customerIds.forEach(this::consumeMessage); + for (String customerId : customerIds) { + //获取缓存 如果不存在缓存中 则执行消费 并放入缓存中 + String ifPresent = customerIdCache.getIfPresent(customerId); + if (StringUtils.isBlank(ifPresent)){ + consumeMessage(customerId); + customerIdCache.put(customerId,customerId); + } + } } catch (Exception e) { //失败不重发 logger.error("consumeMessage fail,msg:{}",e.getMessage()); From b99c322ef830978a079d1afcabcbb066148fa24e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 7 Jul 2021 10:33:36 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=89=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiTopicServiceImpl.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 773eeda261..a53442897c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1757,7 +1757,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl 议题服务) Date now = new Date(); //2.调用gov-org获取数据权限 - ResiTopicAndGroupResultDTO group = baseDao.getGroupInfoByTopicId(topicTurnIssueFromDTO.getTopicId()); - if(null == group) { - throw new RenException(ModuleConstant.FAILURE_TO_TURN_ISSUE); - } - TopicInfoFormDTO topicId = new TopicInfoFormDTO(); - topicId.setTopicId(topicTurnIssueFromDTO.getTopicId()); - Integer issueCount = govIssueFeignClient.checkTopicShiftIssue(topicId).getData(); - if (issueCount != NumConstant.ZERO){ - throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE); - } CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO(); dataFilterParam.setUserId(topicTurnIssueFromDTO.getUserId()); dataFilterParam.setGridId(group.getGridId()); From a2ca761a1bb9601c45db5ec03972b36b85193e68 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 7 Jul 2021 17:28:30 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B0=86=E7=B3=BB=E7=BB=9F=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9A=84=E6=9D=83=E9=99=90=E6=9E=9A=E4=B8=BE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/enums/RequirePermissionEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java index 92d29521e2..8c8fd0dab3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java @@ -170,7 +170,7 @@ public enum RequirePermissionEnum { * 更多-日志记录 */ MORE_PATROL_RECORD_LIST("more_patrol_record_list","更多:日志记录:巡查记录:列表","巡查记录列表"), - MORE_SYSTEM_LOG_LIST("MORE_SYSTEM_LOG_LIST","更多:日志记录:系统日志:列表","系统日志列表"), + MORE_SYSTEM_LOG_LIST("more_system_log_list","更多:日志记录:系统日志:列表","系统日志列表"), MORE_GRID_MEMBER_STATS_ANALYSIS("more_grid_member_stats_analysis", "更多:网格员数据分析", "更多:网格员数据分析"), From 48e50752139000967ceb99d6c62390f60a0c666a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 7 Jul 2021 17:49:23 +0800 Subject: [PATCH 05/10] =?UTF-8?q?submitProjectRelationData=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/todata/impl/FactOriginExtractServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java index 2ec8212d21..7f20601afa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java @@ -303,9 +303,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { @Override public Future submitProjectRelationData(ExtractOriginFormDTO param, List finalDaysBetween) { Future submit = threadPool.submit(() -> { - ExtractOriginFormDTO paramNew = null; + ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); if (CollectionUtils.isEmpty(finalDaysBetween)) { - paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class); try { projectExtractService.saveOriginProjectDaily(paramNew); } catch (Exception e) { From 32ec19b0272f8303413dbf007a6a16a465ac2c26 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 7 Jul 2021 19:06:50 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=94=AF=E9=83=A8?= =?UTF-8?q?=E6=8C=89=E5=85=9A=E5=91=98=E6=95=B0=E9=99=8D=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenOrgRankDataDao.xml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml index 6c176721d5..6908b80953 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml @@ -25,13 +25,7 @@ AND rankData.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%') AND rankData.MONTH_ID = #{monthId} ORDER BY - (rankData.PARTY_TOTAL + rankData.GROUP_TOTAL + rankData.ISSUE_TOTAL + rankData.PROJECT_TOTAL + rankData.CLOSE_PROJECT_RATIO + rankData.SATISFACTION_RATIO) DESC, - rankData.PARTY_TOTAL DESC, - rankData.GROUP_TOTAL DESC, - rankData.ISSUE_TOTAL DESC, - rankData.PROJECT_TOTAL DESC, - rankData.CLOSE_PROJECT_RATIO DESC, - rankData.SATISFACTION_RATIO DESC + rankData.PARTY_TOTAL DESC @@ -60,12 +54,6 @@ and scg.AREA_CODE like CONCAT('%',#{areaCode},'%') AND rankData.MONTH_ID = #{monthId} ORDER BY - (rankData.PARTY_TOTAL + rankData.GROUP_TOTAL + rankData.ISSUE_TOTAL + rankData.PROJECT_TOTAL + rankData.CLOSE_PROJECT_RATIO + rankData.SATISFACTION_RATIO) DESC, - rankData.PARTY_TOTAL DESC, - rankData.GROUP_TOTAL DESC, - rankData.ISSUE_TOTAL DESC, - rankData.PROJECT_TOTAL DESC, - rankData.CLOSE_PROJECT_RATIO DESC, - rankData.SATISFACTION_RATIO DESC + rankData.PARTY_TOTAL DESC \ No newline at end of file From e53dc0f9e0f3005cc8e0c032dc2f6e1ba29d85c2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 7 Jul 2021 19:18:16 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86--?= =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E2=80=9C=E5=93=8D=E5=BA=94=E7=8E=87=E9=99=8D?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/ScreenGovernRankDataDao.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml index dd04bb5130..26d9ac136c 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml @@ -23,7 +23,7 @@ AND rankData.PARENT_ID = #{agencyId} AND rankData.MONTH_ID = #{monthId} ORDER BY - (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC,rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC + rankData.RESPONSE_RATIO DESC @@ -77,10 +77,7 @@ AND rankData.MONTH_ID =#{monthId} ) ORDER BY - RESPONSE_RATIO DESC, - RESOLVED_RATIO DESC, - GOVERN_RATIO DESC, - SATISFACTION_RATIO DESC + RESPONSE_RATIO DESC \ No newline at end of file From 5d405d3ac93d52701cdf39e4f1618f7e8253c865 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 8 Jul 2021 10:16:08 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=94=9F=E4=BA=A7bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=E6=98=AF=E5=90=A6=E5=9C=A8=E5=B7=A1=E6=9F=A5=E4=B8=AD?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/epmetuser/StaffPatrolRecordDao.xml | 70 +++++++++++-------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml index 08a1699368..ce078c21f3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml @@ -53,48 +53,56 @@