From 9334e4a42c99e547d8b8f51b718f9e697554c25b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Sep 2020 15:41:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3-=E5=85=9A?= =?UTF-8?q?=E5=BB=BA=E8=83=BD=E5=8A=9B=E8=AE=A1=E7=AE=97V0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FactOriginController.java | 2 - .../extract/FactOriginIssueMainDailyDao.java | 20 ++ .../extract/FactOriginTopicLogDailyDao.java | 21 +++ .../extract/FactOriginTopicMainDailyDao.java | 10 + .../FactOriginTopicLogDailyService.java | 19 ++ .../FactOriginTopicMainDailyService.java | 15 +- .../extract/IssueExtractService.java | 23 +++ .../extract/impl/CalCpcIndexServiceImpl.java | 171 ++++++++++++++++-- .../FactOriginTopicLogDailyServiceImpl.java | 31 ++++ .../FactOriginTopicMainDailyServiceImpl.java | 18 +- .../extract/impl/IssueExtractServiceImpl.java | 30 +++ .../extract/FactOriginIssueMainDailyDao.xml | 33 ++++ .../extract/FactOriginTopicLogDailyDao.xml | 35 ++++ .../extract/FactOriginTopicMainDailyDao.xml | 16 ++ 14 files changed, 425 insertions(+), 19 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java index 70d74cc121..8ddfc6a872 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java @@ -59,8 +59,6 @@ public class FactOriginController { } /** - * @param customerId yyyyMMdd - * @param dateId yyyyMMdd * @return com.epmet.commons.tools.utils.Result * @author yinzuomei * @description 话题 (fact_origin_topic_main_daily 话题主表_日统计 fact_origin_topic_log_daily 话题明细_日统计) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java index 1866a593a5..5c5764dd82 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java @@ -24,6 +24,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 议题主表 @@ -50,4 +51,23 @@ public interface FactOriginIssueMainDailyDao extends BaseDao> + * @param customerId + * @param monthId + * @author yinzuomei + * @description 党员提出的话题转议题数 + * @Date 2020/9/18 13:58 + **/ + List> selectShiftIssueCount(@Param("customerId") String customerId,@Param("monthId") String monthId); + + /** + * @return java.util.List> + * @param customerId + * @param monthId + * @author yinzuomei + * @description 党员提出的议题转项目数 + * @Date 2020/9/18 14:11 + **/ + List> selectShiftProjectCount(@Param("customerId") String customerId,@Param("monthId") String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicLogDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicLogDailyDao.java index ef66cc0c73..2694c66397 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicLogDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicLogDailyDao.java @@ -23,6 +23,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 话题明细_日统计 @@ -52,4 +53,24 @@ public interface FactOriginTopicLogDailyDao extends BaseDao list); + + /** + * @return java.util.List> + * @param customerId + * @param monthId + * @author yinzuomei + * @description 查询客户下，这个月内，每个党员评论话题的次数 + * @Date 2020/9/18 13:36 + **/ + List> selectJoinTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId); + + /** + * @return java.util.List> + * @param customerId + * @param monthId + * @author yinzuomei + * @description 党员自建群活跃度——话题数 + * @Date 2020/9/18 15:05 + **/ + List> selectGroupTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java index 26738dc2b3..a91508e59f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java @@ -23,6 +23,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 话题主表_日统计 @@ -54,4 +55,13 @@ public interface FactOriginTopicMainDailyDao extends BaseDao list); + + /** + * @param customerId + * @param monthId + * @author yinzuomei + * @description 党员提出话题数：返回每个党员这个月内，提出的话题数 + * @Date 2020/9/18 11:05 + **/ + List> selectPartyCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicLogDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicLogDailyService.java index 76c118972b..18971cf15a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicLogDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicLogDailyService.java @@ -32,4 +32,23 @@ import java.util.Map; */ public interface FactOriginTopicLogDailyService extends BaseService { + /** + * @return java.util.List> + * @param customerId + * @param monthId + * @author yinzuomei + * @description 查询客户下，这个月内，每个党员评论话题的次数 + * @Date 2020/9/18 13:35 + **/ + List> selectJoinTopicCount(String customerId, String monthId); + + /** + * @return java.util.List> + * @param customerId + * @param monthId + * @author yinzuomei + * @description 党员自建群活跃度——话题数 + * @Date 2020/9/18 14:33 + **/ + List> selectGroupTopicCount(String customerId, String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java index 6b2414be05..cb30aa46e7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java @@ -21,6 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.extract.form.ExtractFormDTO; import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity; +import java.util.List; +import java.util.Map; + /** * 话题主表_日统计 @@ -31,8 +34,6 @@ import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity; public interface FactOriginTopicMainDailyService extends BaseService { /** - * @param customerId 客户id - * @param dateId yyyyMMdd * @return void * @author yinzuomei 数据采集：话题本身 * @description fact_origin_topic_log_daily 话题明细_日统计 fact_origin_topic_main_daily 话题主表_日统计 @@ -40,5 +41,13 @@ public interface FactOriginTopicMainDailyService extends BaseService> + * @param customerId + * @param monthId yyyyMM + * @author yinzuomei + * @description 党员提出话题数：返回每个党员这个月内，提出的话题数 + * @Date 2020/9/18 11:03 + **/ + List> selectPartyCreateTopicCount(String customerId, String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java index 4d05ba19d7..8dd0db2db3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java @@ -2,6 +2,9 @@ package com.epmet.service.evaluationindex.extract; import com.epmet.dto.extract.form.ExtractFormDTO; +import java.util.List; +import java.util.Map; + /** * @Author zxc * @DateTime 2020/9/14 5:07 下午 @@ -23,4 +26,24 @@ public interface IssueExtractService { * @date 2020/9/16 9:41 上午 */ Boolean issueExtractLog(ExtractFormDTO extractFormDTO); + + /** + * @return java.util.List> + * @param customerId + * @param monthId + * @author yinzuomei + * @description 党员提出的话题转议题数 + * @Date 2020/9/18 13:57 + **/ + List> selectShiftIssueCount(String customerId, String monthId); + + /** + * @return java.util.List> + * @param customerId + * @param monthId + * @author yinzuomei + * @description 党员提出的议题转项目数 + * @Date 2020/9/18 14:11 + **/ + List> selectShiftProjectCount(String customerId, String monthId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalCpcIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalCpcIndexServiceImpl.java index 758ff8d51e..8559025963 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalCpcIndexServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalCpcIndexServiceImpl.java @@ -5,16 +5,20 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.constant.DataSourceConstant; import com.epmet.constant.IndexCalConstant; import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyDao; -import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity; import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyEntity; import com.epmet.service.evaluationindex.extract.CalCpcIndexService; +import com.epmet.service.evaluationindex.extract.FactOriginTopicLogDailyService; +import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService; +import com.epmet.service.evaluationindex.extract.IssueExtractService; import com.epmet.service.stats.DimCustomerPartymemberService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 党员相关 @@ -29,6 +33,12 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService { private DimCustomerPartymemberService dimCustomerPartymemberService; @Autowired private FactIndexPartyAblityCpcMonthlyDao factIndexPartyAblityCpcMonthlyDao; + @Autowired + private FactOriginTopicMainDailyService factOriginTopicMainDailyService; + @Autowired + private FactOriginTopicLogDailyService factOriginTopicLogDailyService; + @Autowired + private IssueExtractService issueExtractService; /** * @param customerId 客户id @@ -44,18 +54,48 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService { List indexPartyAblityCpcList = dimCustomerPartymemberService.selectPartyMemberList(customerId); //2、删除之前统计过的 deleteFactIndexPartyAblityCpcMonthly(customerId, monthId); + //1、党员提出话题数 + Map createTopicCountMap = calCreateTopicCount(customerId, monthId); + //2、党员参与话题数（支持、反对、评论、浏览）---目前只统计 党员评论话题次数之和 + Map joinTopicCountMap=calJoinTopicCount(customerId,monthId); + //3、党员提出的话题转议题数 + Map shiftIssueCountMap=calShiftIssueCount(customerId,monthId); + //4、党员提出的议题转项目数 + Map shiftProjectCountMap=calShiftProjectCount(customerId,monthId); + //6、党员自建群群众人数 + Map groupUserCountMap=calgroupUserCount(customerId,monthId); + //8、党员自建群活跃度——话题数 + Map groupTopicCountMap=calGroupTopicCountMap(customerId,monthId); //3、计算实际值，更新 for (FactIndexPartyAblityCpcMonthlyEntity indexPartyAblityCpcEntity : indexPartyAblityCpcList) { - //TODO - //党员提出话题数 - //党员参与话题数（支持、反对、评论、浏览） - //党员提出的话题转议题数 - //党员提出的议题转项目数 - //参加“三会一课”次数 - //党员自建群群众人数 - //党员自建群活跃群众人数 - //党员自建群活跃度——话题数 - //自建群活跃度——议题转项目率 + //1、党员提出话题数 + if (createTopicCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())) { + indexPartyAblityCpcEntity.setCreateTopicCount(createTopicCountMap.get(indexPartyAblityCpcEntity.getUserId())); + } + //2、党员参与话题数（支持、反对、评论、浏览）---目前只统计 党员评论话题次数之和 + if(joinTopicCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){ + indexPartyAblityCpcEntity.setJoinTopicCount(joinTopicCountMap.get(indexPartyAblityCpcEntity.getUserId())); + } + //3、党员提出的话题转议题数 + if(shiftIssueCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){ + indexPartyAblityCpcEntity.setShiftIssueCount(shiftIssueCountMap.get(indexPartyAblityCpcEntity.getUserId())); + } + //4、党员提出的议题转项目数 + if(shiftProjectCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){ + indexPartyAblityCpcEntity.setShiftProjectCount(shiftProjectCountMap.get(indexPartyAblityCpcEntity.getUserId())); + } + //5、参加“三会一课”次数 目前没有此业务，默认0 + //6、党员自建群群众人数 TODO + if(groupUserCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){ + indexPartyAblityCpcEntity.setGroupUserCount(groupUserCountMap.get(indexPartyAblityCpcEntity.getUserId())); + } + //7、党员自建群活跃群众人数 TODO + //8、党员自建群活跃度——话题数 + if(groupTopicCountMap.containsKey(indexPartyAblityCpcEntity.getUserId())){ + indexPartyAblityCpcEntity.setGroupTopicCount(groupTopicCountMap.get(indexPartyAblityCpcEntity.getUserId())); + } + //9、自建群活跃度——议题转项目率 TODO + } //4、分批插入 //批量插入 @@ -63,8 +103,117 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService { partition.forEach(list -> { this.FactIndexPartyAblityCpcMonthlyEntity(list); }); + + } + + /** + * @param customerId + * @param monthId + * @return java.lang.Integer + * @author yinzuomei + * @description 1、查询出客户下所有党员对应的-党员提出话题数 + * @Date 2020/9/18 10:59 + **/ + private Map calCreateTopicCount(String customerId, String monthId) { + List> mapList = factOriginTopicMainDailyService.selectPartyCreateTopicCount(customerId, monthId); + Map resultMap = new HashMap<>(); + for (Map map : mapList) { + for (Map.Entry m : map.entrySet()) { + resultMap.put(m.getKey(), m.getValue()); + } + } + return resultMap; + } + + /** + * @return java.util.Map + * @param customerId + * @param monthId + * @author yinzuomei + * @description 2、查询客户下，这个月内，每个党员评论话题的次数 + * @Date 2020/9/18 13:33 + **/ + private Map calJoinTopicCount(String customerId, String monthId) { + List> mapList = factOriginTopicLogDailyService.selectJoinTopicCount(customerId, monthId); + Map resultMap = new HashMap<>(); + for (Map map : mapList) { + for (Map.Entry m : map.entrySet()) { + resultMap.put(m.getKey(), m.getValue()); + } + } + return resultMap; + } + + + /** + * @return java.util.Map + * @param customerId + * @param monthId + * @author yinzuomei + * @description 3、党员提出的话题转议题数 + * @Date 2020/9/18 13:53 + **/ + private Map calShiftIssueCount(String customerId, String monthId) { + List> mapList = issueExtractService.selectShiftIssueCount(customerId, monthId); + Map resultMap = new HashMap<>(); + for (Map map : mapList) { + for (Map.Entry m : map.entrySet()) { + resultMap.put(m.getKey(), m.getValue()); + } + } + return resultMap; + } + + /** + * @return java.util.Map + * @param customerId + * @param monthId + * @author yinzuomei + * @description 4、党员提出的议题转项目数 + * @Date 2020/9/18 14:10 + **/ + private Map calShiftProjectCount(String customerId, String monthId) { + List> mapList = issueExtractService.selectShiftProjectCount(customerId, monthId); + Map resultMap = new HashMap<>(); + for (Map map : mapList) { + for (Map.Entry m : map.entrySet()) { + resultMap.put(m.getKey(), m.getValue()); + } + } + return resultMap; + } + + /** + * @return java.util.Map + * @param customerId + * @param monthId + * @author yinzuomei + * @description 6、党员自建群群众人数 + * @Date 2020/9/18 15:38 + **/ + private Map calgroupUserCount(String customerId, String monthId) { + // TODO + return null; } + /** + * @param customerId + * @param monthId + * @return java.util.Map + * @author yinzuomei + * @description 8、党员自建群活跃度——话题数 + * @Date 2020/9/18 14:31 + **/ + private Map calGroupTopicCountMap(String customerId, String monthId) { + List> mapList = factOriginTopicLogDailyService.selectGroupTopicCount(customerId, monthId); + Map resultMap = new HashMap<>(); + for (Map map : mapList) { + for (Map.Entry m : map.entrySet()) { + resultMap.put(m.getKey(), m.getValue()); + } + } + return resultMap; + } /** * @param customerId diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicLogDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicLogDailyServiceImpl.java index b95bc36cb7..07a220fa44 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicLogDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicLogDailyServiceImpl.java @@ -17,20 +17,51 @@ package com.epmet.service.evaluationindex.extract.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao; import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity; import com.epmet.service.evaluationindex.extract.FactOriginTopicLogDailyService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** * 话题明细_日统计 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-09-15 */ +@DataSource(DataSourceConstant.STATS) @Service public class FactOriginTopicLogDailyServiceImpl extends BaseServiceImpl implements FactOriginTopicLogDailyService { + /** + * @param customerId + * @param monthId + * @return java.util.List> + * @author yinzuomei + * @description 查询客户下，这个月内，每个党员评论话题的次数 + * @Date 2020/9/18 13:35 + **/ + @Override + public List> selectJoinTopicCount(String customerId, String monthId) { + return baseDao.selectJoinTopicCount(customerId,monthId); + } + + /** + * @param customerId + * @param monthId + * @return java.util.List> + * @author yinzuomei + * @description 党员自建群活跃度——话题数 + * @Date 2020/9/18 14:33 + **/ + @Override + public List> selectGroupTopicCount(String customerId, String monthId) { + return baseDao.selectGroupTopicCount(customerId,monthId); + } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java index 6915bb6777..6925b94644 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java @@ -17,11 +17,13 @@ package com.epmet.service.evaluationindex.extract.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.constant.DimObjectActionConstant; import com.epmet.constant.IndexCalConstant; import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao; @@ -54,6 +56,7 @@ import java.util.stream.Collectors; * @author generator generator@elink-cn.com * @since v1.0.0 2020-09-15 */ +@DataSource(value = DataSourceConstant.STATS) @Slf4j @Service public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl implements FactOriginTopicMainDailyService { @@ -67,8 +70,6 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl getGridInfoMap(String customerId) { Map map=new HashMap<>(); List list=customerGridService.queryGridInfoList(customerId); @@ -226,5 +228,15 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl> selectPartyCreateTopicCount(String customerId, String monthId) { + return baseDao.selectPartyCreateTopicCount(customerId,monthId); + } } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java index d277675b03..9a45fece6e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java @@ -1,9 +1,11 @@ package com.epmet.service.evaluationindex.extract.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.dto.form.TimeListResultDTO; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.constant.ExtractConstant; import com.epmet.dao.evaluationindex.extract.FactOriginIssueLogDailyDao; import com.epmet.dao.evaluationindex.extract.FactOriginIssueMainDailyDao; @@ -240,4 +242,32 @@ public class IssueExtractServiceImpl implements IssueExtractService { issueLogDailyDao.insertIssueLogList(result); } + + + /** + * @param customerId + * @param monthId + * @return java.util.List> + * @author yinzuomei + * @description 党员提出的话题转议题数 + * @Date 2020/9/18 13:57 + **/ + @DataSource(DataSourceConstant.STATS) + @Override + public List> selectShiftIssueCount(String customerId, String monthId) { + return issueMainDailyDao.selectShiftIssueCount(customerId,monthId); + } + + /** + * @param customerId + * @param monthId + * @return java.util.List> + * @author yinzuomei + * @description 党员提出的议题转项目数 + * @Date 2020/9/18 14:11 + **/ + @Override + public List> selectShiftProjectCount(String customerId, String monthId) { + return issueMainDailyDao.selectShiftProjectCount(customerId,monthId); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml index 9d3ad44198..9ae5aed568 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml @@ -66,4 +66,37 @@ CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId} + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicLogDailyDao.xml index 3efebcd69f..3fcd8fba28 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicLogDailyDao.xml @@ -65,4 +65,39 @@ ) + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml index 377f09bd45..453ba483b2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml @@ -62,4 +62,20 @@ ) + + + \ No newline at end of file