From 27c22b5912d6b5e12e021529a08d54b9c44a5372 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 19 May 2020 17:42:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=97=A5=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/IssuesToBeCountedResultDTO.java | 40 +++++++++ .../src/main/java/com/epmet/dao/IssueDao.java | 14 +++- .../dao/IssueVoteStatisticalDailyDao.java | 20 +++++ .../IssueVoteStatisticalDailyServiceImpl.java | 12 +++ .../src/main/resources/mapper/IssueDao.xml | 52 ++++++++++++ .../mapper/IssueVoteStatisticalDailyDao.xml | 81 +++++++++++++++++++ .../impl/ResiGroupMemberServiceImpl.java | 2 +- 7 files changed, 216 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssuesToBeCountedResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssuesToBeCountedResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssuesToBeCountedResultDTO.java new file mode 100644 index 0000000000..0b8f2532db --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssuesToBeCountedResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 要统计的议题信息 + * @ClassName IssuesToBeCountedResultDTO + * @Auth wangc + * @Date 2020-05-19 14:06 + */ +@Data +public class IssuesToBeCountedResultDTO implements Serializable { + private static final long serialVersionUID = -5554820175558769619L; + /** + * 议题Id + * */ + private String issueId; + + /** + * 议题状态 + * */ + private String issueStatus; + + /** + * 态度 support | opposition + * */ + private String attitude; + + /** + * 票数 - 昨日一天 + * */ + private Integer voteCount; + + /** + * 票数 - 截至当日 + * */ + private Integer voteCountUpToYesterday; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index a5eeaa6497..dddd6d4118 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -22,10 +22,7 @@ import com.epmet.dto.IssueDTO; import com.epmet.dto.form.CommonIssueListFormDTO; import com.epmet.dto.form.IssueDetailFormDTO; import com.epmet.dto.form.ShiftProjectListFromDTO; -import com.epmet.dto.result.ClosedIssueListGovResultDTO; -import com.epmet.dto.result.ClosedIssueListResultDTO; -import com.epmet.dto.result.IssueResultDTO; -import com.epmet.dto.result.VotingIssueListResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.IssueEntity; import org.apache.ibatis.annotations.Mapper; @@ -91,4 +88,13 @@ public interface IssueDao extends BaseDao { * @date 2020.05.14 13:34 **/ List selectClosedListGov(CommonIssueListFormDTO issueListFormDTO); + + /** + * @Description 生成昨日的议题日统计信息 + * @param + * @return List + * @author wangc + * @date 2020.05.19 15:00 + **/ + List getIssueVotingStatistical(); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java index 06cfea984f..7fa3df29c2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java @@ -18,9 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.IssuesToBeCountedResultDTO; import com.epmet.entity.IssueVoteStatisticalDailyEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 议题表决按天统计表 * @@ -30,4 +33,21 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface IssueVoteStatisticalDailyDao extends BaseDao { + /** + * @Description 生成昨日的议题日统计信息 + * @param + * @return List + * @author wangc + * @date 2020.05.19 15:00 + **/ + List getIssueVotingStatistical(); + + /** + * @Description 生成截止到昨日的议题日统计信息 + * @param + * @return List + * @author wangc + * @date 2020.05.19 15:00 + **/ + List getIssueVotingStatisticalUpToYesterday(); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java index 01de7abbd5..db1b43ecc0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IssueVoteStatisticalDailyDao; import com.epmet.dto.IssueVoteStatisticalDailyDTO; +import com.epmet.dto.result.IssuesToBeCountedResultDTO; import com.epmet.entity.IssueVoteStatisticalDailyEntity; import com.epmet.redis.IssueVoteStatisticalDailyRedis; import com.epmet.service.IssueVoteStatisticalDailyService; @@ -36,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 议题表决按天统计表 @@ -110,6 +112,16 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl issueStatisticalList = baseDao.getIssueVotingStatistical(); + Map> issueStatisticalMap = + issueStatisticalList.stream().collect(Collectors.groupingBy(IssuesToBeCountedResultDTO::getIssueId)); + List issueStatisticalListUpToYes = baseDao.getIssueVotingStatisticalUpToYesterday(); + Map> issueStatisticalMapUpTpYes = + issueStatisticalListUpToYes.stream().collect(Collectors.groupingBy(IssuesToBeCountedResultDTO::getIssueId)); + issueStatisticalMap.forEach((key,value) -> { + + }); + //1.获取所有表决中的议题以及在昨日表决截至的议题，将昨日新生成的议题单独拿出来 //2.对每一个表决中的议题校验有没有生成过前一天的统计数据，如果生成过则跳过次议题 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index f4cce88a94..6c3651d9a9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -245,4 +245,56 @@ #{pageSize} + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml index fc9b69d379..6eff9f400f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml @@ -22,5 +22,86 @@ + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index 80ac752e56..d72cbeeb69 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -558,7 +558,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl