From 56851c94846dd30331067e0bdfe516a6cf25b268 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 12:06:31 +0800 Subject: [PATCH 1/3] orgId --- .../dataaggre/dao/datastats/DataStatsDao.java | 1 + .../service/datastats/DataStatsService.java | 2 +- .../datastats/impl/DataStatsServiceImpl.java | 4 ++-- .../epmetuser/impl/EpmetUserServiceImpl.java | 20 +++++++++++++++---- .../mapper/datastats/DatsStatsDao.xml | 5 ++++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index 309d5432d9..1b0562b286 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -355,6 +355,7 @@ public interface DataStatsDao { @Param("configIds") List configIds); List queryAgencyIcUserCategoryData(@Param("gridPids") String gridPids, + @Param("orgId")String orgId, @Param("dateId") String dateId, @Param("configIds") List configIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 23a33137ab..02b5f5fef5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -283,5 +283,5 @@ public interface DataStatsService { List queryGridIcUserCategoryData(String orgId, String dateId, List configIds); - List queryAgencyIcUserCategoryData(String gridPids, String dateId, List configIds); + List queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds); } 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 79465829b7..08a40f4c1e 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 @@ -2181,10 +2181,10 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } @Override - public List queryAgencyIcUserCategoryData(String gridPids, String dateId, List configIds) { + public List queryAgeb09527201c4409e19d1dbc5e3c3429a1ncyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds) { if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){ return new ArrayList<>(); } - return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,dateId,configIds); + return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,orgId,dateId,configIds); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 7000dc6f32..aac6d6df98 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -787,7 +787,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { }); } }else if(OrgInfoConstant.AGENCY.equals(formDTO.getOrgType())){ - CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId()); + /*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId()); String gridPids=""; if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){ // 当前组织是根组织 @@ -799,12 +799,24 @@ public class EpmetUserServiceImpl implements EpmetUserService { }else{ gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); } - } - List list = dataStatsService.queryAgencyIcUserCategoryData(gridPids, formDTO.getDateId(), configIds); + }*/ + List list = dataStatsService.queryAgencyIcUserCategoryData(null, formDTO.getOrgId(), formDTO.getDateId(), configIds); if(CollectionUtils.isNotEmpty(list)){ Map configMap = list.stream().collect(Collectors.toMap(FactIcuserCategoryAnalysisDailyDTO::getConfigId, m -> m, (k1, k2) -> k1)); resList.forEach(resDto->{ - if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){ + if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){/*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId()); + String gridPids=""; + if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){ + // 当前组织是根组织 + gridPids=formDTO.getOrgId(); + }else { + if("b09527201c4409e19d1dbc5e3c3429a1".equals(formDTO.getCustomerId())){ + //市北的是英文冒号隔开的 + gridPids=agencyEntity.getPids().concat(StrConstant.COMMA).concat(formDTO.getOrgId()); + }else{ + gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); + } + }*/ FactIcuserCategoryAnalysisDailyDTO dailyDTO=configMap.get(resDto.getConfigId()); resDto.setTotal(dailyDTO.getTotal()); resDto.setImmigration(dailyDTO.getQrIncr()); 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 fa315b0aa1..7e11807b3a 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 @@ -1134,7 +1134,10 @@ WHERE m.DATE_ID = #{dateId} AND m.DEL_FLAG = '0' - AND m.PIDS LIKE concat(#{gridPids},'%') + + AND m.PIDS LIKE concat(#{gridPids},'%') + + AND m.pids like concat('%',#{orgId},'%') AND M.ORG_TYPE='grid' From e8b21680690de01e5515d7637a831cf3dba4ef0f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 12:16:09 +0800 Subject: [PATCH 2/3] error --- .../dataaggre/service/datastats/impl/DataStatsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 08a40f4c1e..7427b146c7 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 @@ -2181,7 +2181,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } @Override - public List queryAgeb09527201c4409e19d1dbc5e3c3429a1ncyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds) { + public List queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds) { if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){ return new ArrayList<>(); } From 18b427adcc9e4e08a58746c39c50f44d62403814 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 12:28:49 +0800 Subject: [PATCH 3/3] orgId --- .../datastats/impl/DataStatsServiceImpl.java | 2 +- .../epmetuser/impl/EpmetUserServiceImpl.java | 15 +-------------- 2 files changed, 2 insertions(+), 15 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 7427b146c7..0f47aceaa2 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 @@ -2182,7 +2182,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve @Override public List queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List configIds) { - if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){ + if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(orgId)){ return new ArrayList<>(); } return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,orgId,dateId,configIds); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index aac6d6df98..3ed9152224 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -33,7 +33,6 @@ import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity; import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity; import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity; -import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService; @@ -804,19 +803,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { if(CollectionUtils.isNotEmpty(list)){ Map configMap = list.stream().collect(Collectors.toMap(FactIcuserCategoryAnalysisDailyDTO::getConfigId, m -> m, (k1, k2) -> k1)); resList.forEach(resDto->{ - if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){/*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId()); - String gridPids=""; - if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){ - // 当前组织是根组织 - gridPids=formDTO.getOrgId(); - }else { - if("b09527201c4409e19d1dbc5e3c3429a1".equals(formDTO.getCustomerId())){ - //市北的是英文冒号隔开的 - gridPids=agencyEntity.getPids().concat(StrConstant.COMMA).concat(formDTO.getOrgId()); - }else{ - gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); - } - }*/ + if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){ FactIcuserCategoryAnalysisDailyDTO dailyDTO=configMap.get(resDto.getConfigId()); resDto.setTotal(dailyDTO.getTotal()); resDto.setImmigration(dailyDTO.getQrIncr());