From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期二, 28 十二月 2021 16:28:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java index c23df3c..7c93d7a 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java @@ -7,6 +7,7 @@ import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.common.utlis.StringUtils; +import com.panzhihua.service_community.dao.ComPbMemberDAO; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -34,6 +35,8 @@ public class BigScreenServiceImpl implements BigScreenService { @Resource private BigScreenDAO bigScreenDAO; + @Resource + private ComPbMemberDAO comPbMemberDAO; @Override public R partyOrgMembers(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) { @@ -108,4 +111,47 @@ return R.ok(listR); } + @Override + public R partyActivityLine(Long communityId) { + List<BigScreenActivityLine> bigScreenActivityLines=this.getPoints(); + bigScreenActivityLines.forEach(bigScreenActivityLine -> { + BigScreenActivityLine bigScreenActivityLine1=comPbMemberDAO.selectActivityCountMonth(communityId,bigScreenActivityLine.getX()); + bigScreenActivityLine.setY(bigScreenActivityLine1.getY()); + bigScreenActivityLine.setCountY(bigScreenActivityLine1.getCountY()); + }); + return R.ok(bigScreenActivityLines); + } + + @Override + public R partyActivityTop(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) { + return R.ok(this.comPbMemberDAO.selectActivityTop(new Page(pageBigScreenStatisticPartyOrg.getPageNum(),pageBigScreenStatisticPartyOrg.getPageSize()),pageBigScreenStatisticPartyOrg.getCommunityId())); + } + + @Override + public R serviceData(Long communityId) { + return R.ok(this.comPbMemberDAO.bigScreenServiceData(communityId)); + } + + @Override + public R serviceUser(Long communityId) { + return R.ok(this.comPbMemberDAO.bigScreenServiceUser(communityId)); + } + + public List<BigScreenActivityLine> getPoints(){ + List<BigScreenActivityLine> bigScreenActivityLines=new ArrayList<>(); + for(int i=1;i<=12;i++){ + String aDate=""; + if(i<10){ + aDate = "0"+i; + } + else { + aDate=i+""; + } + BigScreenActivityLine bigScreenActivityLine=new BigScreenActivityLine(); + bigScreenActivityLine.setX(aDate); + bigScreenActivityLines.add(bigScreenActivityLine); + } + return bigScreenActivityLines; + } + } -- Gitblit v1.7.1