From 1b2f79835d1a2858a51f327592b2ea6954fab76c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 22 Sep 2021 10:16:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml index b9a488a03b..22c6b09520 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml @@ -36,8 +36,8 @@ AND patrol_total > 0 - - #{id} + + grid_pids like concat('%', #{id}, '%') From 0c3fefd852b04fe6b828f815dc3db97c926a0961 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 22 Sep 2021 13:54:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datastats/impl/DataStatsServiceImpl.java | 8 +++++++- .../mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 59be2dfd15..497ab52715 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2054,11 +2054,17 @@ public class DataStatsServiceImpl implements DataStatsService { int patrolDurationInteger = 0; HashSet set = new HashSet(); for (CustomerDataManageResultDTO.CustomerDataManage u : patrolEnd) { - if (org.getOrgId().equals(u.getOrgId())) { + if ("community".equals(agencyGrid.getLevel()) && org.getOrgId().equals(u.getOrgId())) { patroCount += u.getPatrolCount(); patrolDurationInteger += u.getPatrolDurationInteger(); set.add(u.getStaffId()); } + if (!"community".equals(agencyGrid.getLevel()) && u.getOrgId().contains(org.getOrgId())) { + patroCount += u.getPatrolCount(); + patrolDurationInteger += u.getPatrolDurationInteger(); + set.add(u.getStaffId()); + } + } patro = set.size(); Integer minutes = patrolDurationInteger / 60; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml index 22c6b09520..b3f6e59aa9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml @@ -24,7 +24,7 @@ date_id dateId, grid_id, staff_id staffId, patrol_total , total_time - , agency_id orgId + , grid_pids orgId , grid_id orgId From 1d7fc9c6b4688c0a38910db647b7a85e9c6c1946 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 23 Sep 2021 10:08:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=95=B0=E6=8D=AE=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/datastats/DatsStatsDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index 0850b865c5..5c25d1edee 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -887,7 +887,7 @@ , agency_id orgId - FROM fact_topic_total_agency_daily + FROM fact_topic_hotdiscuss_agency_daily WHERE del_flag = '0' #{id} @@ -895,7 +895,7 @@ , grid_id orgId - FROM fact_topic_total_grid_daily + FROM fact_topic_hotdiscuss_grid_daily WHERE del_flag = '0' #{id} From 3f6337ac9e9c732108bd928e255300f867513426 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Sep 2021 10:13:52 +0800 Subject: [PATCH 4/6] bug#3356 --- .../service/evaluationindex/screen/impl/AgencyServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 8b45ddb6ef..0c27cbc878 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -464,6 +464,8 @@ public class AgencyServiceImpl implements AgencyService { pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COLON)); }else if(customerAgencyDTO.getPids().contains(StrConstant.COMMA)){ pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COMMA)); + } else if (customerAgencyDTO.getPid().equals(customerAgencyDTO.getPids())) { + pidList.add(customerAgencyDTO.getPids()); } if(!CollectionUtils.isEmpty(pidList)){ //单客户，存在上级时查询... From 7458b4bdf7b03517d59212407ec6dc6edc00e105 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 23 Sep 2021 13:41:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E5=8F=91=E9=80=81=E9=92=89=E9=92=89?= =?UTF-8?q?=E7=8E=AF=E5=A2=83prod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- .../java/com/epmet/controller/ResiActListController.java | 4 ++-- .../main/java/com/epmet/service/ActLiveRecService.java | 2 +- .../com/epmet/service/impl/ActLiveRecServiceImpl.java | 9 ++++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 2be2091ca1..ae5b8cc73f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -235,7 +235,7 @@ --> 8111 - test + prod diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java index 73fe6adeb8..8c2e85a6a1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java @@ -212,8 +212,8 @@ public class ResiActListController { * @Date 13:39 2020-07-21 **/ @PostMapping("livereclist") - public Result liveRecList(@RequestBody Map map) { - return actLiveRecService.liveRecList(map); + public Result liveRecList(@LoginUser TokenDto tokenDto,@RequestBody Map map) { + return actLiveRecService.liveRecList(tokenDto,map); } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActLiveRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActLiveRecService.java index 9ebe84e2ff..d7c960d4f1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActLiveRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActLiveRecService.java @@ -42,7 +42,7 @@ public interface ActLiveRecService extends BaseService { * @Author zhangyong * @Date 13:39 2020-07-21 **/ - Result liveRecList(Map map); + Result liveRecList(TokenDto tokenDto,Map map); /** * 活动-添加实况 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java index 15ff440c80..c745c98192 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java @@ -36,7 +36,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.commons.tools.utils.SendMqMsgUtils; -import com.epmet.constant.ActMessageConstant; import com.epmet.dao.ActLivePicDao; import com.epmet.dao.ActLiveRecDao; import com.epmet.dto.ActInfoDTO; @@ -90,10 +89,10 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl liveRecList(Map map) { - if (map.get("actId") == null){ - logger.error("传参中没有活动ID"); - throw new RenException("传参中没有活动ID"); + public Result liveRecList(TokenDto tokenDto,Map map) { + if (!map.containsKey("actId") || StringUtils.isEmpty(map.get("actId"))) { + logger.warn("传参中没有actId,或者actId为空,userId:" + tokenDto.getUserId() + "客户id:" + tokenDto.getCustomerId()); + throw new RenException("actId不能为空"); } // 数据汇总 ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO(); From 0b03d78a9110e84159019b3acf6c59071f78ca00 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 26 Sep 2021 10:15:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...FactPartyMemberVanguardAgencyDailyDao.java | 7 ++-- .../FactPartyMemberVanguardGridDailyDao.java | 5 ++- .../StatsPartyMemberVanguardServiceImpl.java | 37 ++++++++++++++----- ...PartyMemberVanguardAgencyDailyService.java | 5 ++- ...ctPartyMemberVanguardGridDailyService.java | 5 ++- ...yMemberVanguardAgencyDailyServiceImpl.java | 7 ++-- ...rtyMemberVanguardGridDailyServiceImpl.java | 7 ++-- .../FactPartyMemberVanguardAgencyDailyDao.xml | 3 +- .../FactPartyMemberVanguardGridDailyDao.xml | 3 +- 9 files changed, 53 insertions(+), 26 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java index 812935ef6e..d26edb4af4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java @@ -37,8 +37,9 @@ public interface FactPartyMemberVanguardAgencyDailyDao extends BaseDao NumConstant.ZERO); + + //批量插入 每次100 + if (CollectionUtils.isEmpty(vanguardList)) { + log.warn("customerAgencyStats insert list is empty,customerId:{},dateId:{}", customerId, dimId.getDateId()); + } + + ListUtils.partition(vanguardList, NumConstant.ONE_HUNDRED) + .forEach(part -> factPartyMemberVanguardAgencyDailyService.insertBatch(part)); + } } /** @@ -327,10 +337,19 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang } }); } - //删除旧数据 - factPartyMemberVanguardGridDailyService.deleteDailyData(customerId, dimId.getDateId()); - //批量插入 - factPartyMemberVanguardGridDailyService.insertBatch(vanguardList); + + //删除旧数据 每次删除1000 + Integer effectRow; + do { + effectRow = factPartyMemberVanguardGridDailyService.deleteDailyData(customerId, dimId.getDateId(), NumConstant.ONE_THOUSAND); + } while (effectRow != null && effectRow > NumConstant.ZERO); + + //批量插入 每次100 + if (CollectionUtils.isEmpty(vanguardList)){ + log.warn("customerGridStats insert list is empty,customerId:{},dateId:{}", customerId, dimId.getDateId()); + } + ListUtils.partition(vanguardList, NumConstant.ONE_HUNDRED) + .forEach(part -> factPartyMemberVanguardGridDailyService.insertBatch(part)); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java index 385b615549..1ff31be7cc 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactPartyMemberVanguardAgencyDailyService.java @@ -99,7 +99,8 @@ public interface FactPartyMemberVanguardAgencyDailyService extends BaseService delete from fact_party_member_vanguard_agency_daily where customer_id = #{customerId} and DATE_ID = #{dateId} + limit #{limit} - \ No newline at end of file + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml index 311262a04f..95a527b323 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml @@ -34,7 +34,8 @@ delete from fact_party_member_vanguard_grid_daily where customer_id = #{customerId} and DATE_ID = #{dateId} + limit #{limit} - \ No newline at end of file +