diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index e339e39885..71880e1591 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -446,7 +446,7 @@ - epmet_data_statistical_user + epmet_data_statistical EpmEt-db-UsEr 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 d31325b4f4..fb5757da88 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 @@ -360,17 +360,17 @@ SELECT orgId, orgName, - ifnull(GROUP_COUNT,0), GROUP_COUNT - ifnull(GROUP_RATIO,0), GROUP_RATIO - ifnull(GROUP_MEMBER_COUNT,0), GROUP_MEMBER_COUNT - ifnull(GROUP_MEMBER_RATIO,0), GROUP_MEMBER_RATIO - ifnull(TOPIC_COUNT,0), TOPIC_COUNT - ifnull(TOPIC_RATIO,0), TOPIC_RATIO - ifnull(ISSUE_COUNT,0), ISSUE_COUNT - ifnull(ISSUE_RATIO,0), ISSUE_RATIO - ifnull(PROJECT_COUNT,0), PROJECT_COUNT - ifnull(PROJECT_RATIO,0), PROJECT_RATIO - ifnull(PROJECT_CLOSED_COUNT,0), PROJECT_CLOSED_COUNT + ifnull(GROUP_COUNT,0) AS GROUP_COUNT, + ifnull(GROUP_RATIO,0) AS GROUP_RATIO, + ifnull(GROUP_MEMBER_COUNT,0) AS GROUP_MEMBER_COUNT, + ifnull(GROUP_MEMBER_RATIO,0) AS GROUP_MEMBER_RATIO, + ifnull(TOPIC_COUNT,0) AS TOPIC_COUNT, + ifnull(TOPIC_RATIO,0) AS TOPIC_RATIO, + ifnull(ISSUE_COUNT,0) AS ISSUE_COUNT, + ifnull(ISSUE_RATIO,0) AS ISSUE_RATIO, + ifnull(PROJECT_COUNT,0) AS PROJECT_COUNT, + ifnull(PROJECT_RATIO,0) AS PROJECT_RATIO, + ifnull(PROJECT_CLOSED_COUNT,0) AS PROJECT_CLOSED_COUNT, ifnull(PROJECT_CLOSED_RATIO,0) PROJECT_CLOSED_RATIO FROM ( @@ -403,18 +403,18 @@ SELECT orgId, orgName, - ifnull(GROUP_COUNT,0), GROUP_COUNT - ifnull(GROUP_RATIO,0), GROUP_RATIO - ifnull(GROUP_MEMBER_COUNT,0), GROUP_MEMBER_COUNT - ifnull(GROUP_MEMBER_RATIO,0), GROUP_MEMBER_RATIO - ifnull(TOPIC_COUNT,0), TOPIC_COUNT - ifnull(TOPIC_RATIO,0), TOPIC_RATIO - ifnull(ISSUE_COUNT,0), ISSUE_COUNT - ifnull(ISSUE_RATIO,0), ISSUE_RATIO - ifnull(PROJECT_COUNT,0), PROJECT_COUNT - ifnull(PROJECT_RATIO,0), PROJECT_RATIO - ifnull(PROJECT_CLOSED_COUNT,0), PROJECT_CLOSED_COUNT - ifnull(PROJECT_CLOSED_RATIO,0) PROJECT_CLOSED_RATIO + ifnull(GROUP_COUNT,0) AS GROUP_COUNT, + ifnull(GROUP_RATIO,0) AS GROUP_RATIO, + ifnull(GROUP_MEMBER_COUNT,0) AS GROUP_MEMBER_COUNT, + ifnull(GROUP_MEMBER_RATIO,0) AS GROUP_MEMBER_RATIO, + ifnull(TOPIC_COUNT,0) AS TOPIC_COUNT, + ifnull(TOPIC_RATIO,0) AS TOPIC_RATIO, + ifnull(ISSUE_COUNT,0) AS ISSUE_COUNT, + ifnull(ISSUE_RATIO,0) AS ISSUE_RATIO, + ifnull(PROJECT_COUNT,0) AS PROJECT_COUNT, + ifnull(PROJECT_RATIO,0) AS PROJECT_RATIO, + ifnull(PROJECT_CLOSED_COUNT,0) AS PROJECT_CLOSED_COUNT, + ifnull(PROJECT_CLOSED_RATIO,0) AS PROJECT_CLOSED_RATIO FROM ( SELECT diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 84740b4271..331303957b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -112,6 +112,8 @@ public class DemoController { @Autowired private FactOriginProjectCategoryDailyService originProjectCategoryDailyService; @Autowired + private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService; + @Autowired private StatsPartyMemberVanguardService statsPartyMemberVanguardService; @Autowired private FactGroupActDailyService factGroupActDailyService; @@ -119,8 +121,6 @@ public class DemoController { private FactGridGovernDailyService factGridGovernDailyService; @Autowired private FactAgencyGovernDailyService factAgencyGovernDailyService; - @Autowired - private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService; @GetMapping("testAlarm") public void testAlarm() { @@ -899,6 +899,11 @@ public class DemoController { return new Result().ok(ndddYhjfService.difficultyDataExtract(param)); } + @PostMapping("centralZoneDataHub") + public Result Test(@RequestBody ScreenCentralZoneDataFormDTO param){ + screenCentralZoneDataAbsorptionService.centralZoneDataHub(param); + return new Result(); + } @PostMapping("vanguard") public Result partyMemberVanguard(@RequestBody StatsFormDTO formDTO) { statsPartyMemberVanguardService.agencyStats(formDTO); @@ -930,10 +935,4 @@ public class DemoController { factAgencyGovernDailyService.extractFactAgencyGovernDaily(fromDTO.getCustomerId(), fromDTO.getDateId()); return new Result(); } - - @PostMapping("centralZoneDataHub") - public Result Test(@RequestBody ScreenCentralZoneDataFormDTO param){ - screenCentralZoneDataAbsorptionService.centralZoneDataHub(param); - return new Result(); - } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java index 08a5deb1d2..fc575d3024 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java @@ -35,16 +35,6 @@ public interface StatsCustomerAgencyDao extends BaseDao { CustomerAgencyEntity getRootAgencyInfo(String customerId); - List queryAgencyListByCustomerId(String customerId); - - /** - * 查询部门所属组织信息 - * - * @param deptId - * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity - */ - CustomerAgencyEntity selectByDeptId(String deptId); - /** * 获取每个组织、每个网格下工作人员userId集合 * @@ -69,4 +59,14 @@ public interface StatsCustomerAgencyDao extends BaseDao { * @return java.lang.String */ List selectAgencyStaffIds(@Param("customerId") String customerId,@Param("agencyId")String agencyId); + + List queryAgencyListByCustomerId(String customerId); + + /** + * 查询部门所属组织信息 + * + * @param deptId + * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity + */ + CustomerAgencyEntity selectByDeptId(String deptId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java index 0ea56dcb91..d436fa8671 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java @@ -22,6 +22,14 @@ public interface CustomerAgencyService { CustomerAgencyEntity getRootAgencyInfo(String customerId); + /** + * 获取每个组织、每个网格下工作人员userId集合 + * + * @param customerId + * @return com.epmet.dto.org.result.OrgStaffResultDTO + */ + List queryOrgStaffIds(String customerId); + List queryAgencyListByCustomerId(String customerId); @@ -41,11 +49,4 @@ public interface CustomerAgencyService { */ CustomerAgencyEntity getAgencyByDeptId(String deptId); - /** - * 获取每个组织、每个网格下工作人员userId集合 - * - * @param customerId - * @return com.epmet.dto.org.result.OrgStaffResultDTO - */ - List queryOrgStaffIds(String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml index fd0aecc19a..cf3ce06acc 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml @@ -126,31 +126,6 @@ and ca.CUSTOMER_ID=#{customerId} - - - - @@ -191,4 +166,29 @@ AND ca.CUSTOMER_ID = #{customerId} and ca.pids like CONCAT(#{agencyId},'%') - \ No newline at end of file + + + + + diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index a29cfbd7ed..0f1fb12a0e 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -191,7 +191,6 @@ public interface ResiGroupOpenFeignClient { @PostMapping("resi/group/topic/sendevent") Result sendEvent(@RequestBody TopicEventFormDTO param); - @GetMapping("resi/group/topic/querytopicinfobyissueid/{issueId}") Result queryTopicInfoByIssueId(@PathVariable("issueId")String issueId); @@ -271,8 +270,6 @@ public interface ResiGroupOpenFeignClient { @PostMapping("/resi/group/topic/allmessages") Result> allMessages(@RequestBody AllMessagesFormDTO formDTO); - /** - /** * @Description 查询话题信息 * @Param issueIds diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index b49820bec8..eb8751a79a 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -223,12 +223,12 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien } @Override - public Result> getTopicInfos(List issueIds) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicInfos", issueIds); + public Result> listTopicDetailsByIds(TopicDetailBatchFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listTopicDetailsByIds", input); } @Override - public Result> listTopicDetailsByIds(TopicDetailBatchFormDTO input) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listTopicDetailsByIds", input); + public Result> getTopicInfos(List issueIds) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicInfos", issueIds); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index 6bb5d1a9f8..4f25fd2803 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -532,5 +532,4 @@ public class ResiTopicController { return new Result>().ok(topicDetails); } - } 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 7520074fdc..520f575a13 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 @@ -2825,32 +2825,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl getTopicInfos(List issueIds) { - if (CollectionUtils.isEmpty(issueIds)){ - return new ArrayList<>(); - } - List topicInfos = baseDao.getTopicInfos(issueIds); - Result> gridNames = govOrgOpenFeignClient.getGridListByGridIds(topicInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList())); - if (!gridNames.success()){ - throw new RenException("查询网格Name失败"); - } - topicInfos.forEach(t -> { - gridNames.getData().forEach(g -> { - if (t.getGridId().equals(g.getGridId())){ - t.setGridName(g.getGridName()); - } - }); - }); - return topicInfos; - } - @Override public List listTopicDetailsByIds(List topicIdList) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); @@ -2885,6 +2859,32 @@ public class ResiTopicServiceImpl extends BaseServiceImpl a.getAttachmentUrl()).collect(Collectors.toList()); } + /** + * @Description 查询话题信息 + * @Param issueIds + * @author zxc + * @date 2021/5/17 4:19 下午 + */ + @Override + public List getTopicInfos(List issueIds) { + if (CollectionUtils.isEmpty(issueIds)){ + return new ArrayList<>(); + } + List topicInfos = baseDao.getTopicInfos(issueIds); + Result> gridNames = govOrgOpenFeignClient.getGridListByGridIds(topicInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList())); + if (!gridNames.success()){ + throw new RenException("查询网格Name失败"); + } + topicInfos.forEach(t -> { + gridNames.getData().forEach(g -> { + if (t.getGridId().equals(g.getGridId())){ + t.setGridName(g.getGridName()); + } + }); + }); + return topicInfos; + } + }