From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 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 641d135..5da4a61 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
@@ -5,6 +5,9 @@
import javax.annotation.Resource;
+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;
@@ -32,6 +35,8 @@
public class BigScreenServiceImpl implements BigScreenService {
@Resource
private BigScreenDAO bigScreenDAO;
+ @Resource
+ private ComPbMemberDAO comPbMemberDAO;
@Override
public R partyOrgMembers(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
@@ -86,6 +91,11 @@
listRt = listRt.subList(0, 3);
}
}
+ listRt.forEach(partyBuildingMemberVO -> {
+ if(StringUtils.isNotEmpty(partyBuildingMemberVO.getName())){
+ partyBuildingMemberVO.setName(SensitiveUtil.replaceName(partyBuildingMemberVO.getName()));
+ }
+ });
return R.ok(listRt);
}
@@ -101,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(Long communityId) {
+ return R.ok(this.comPbMemberDAO.selectActivityTop(communityId));
+ }
+
+ @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