From 51ee3c4db2eb49062d3236bf44f95dc22f8f6ac9 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 17:59:03 +0800
Subject: [PATCH] 商业街bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java |   83 +++++++++++++++++++++++++++++++++--------
 1 files changed, 66 insertions(+), 17 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..d513916 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) {
@@ -50,25 +53,28 @@
         BigScreenStatisticAgeGender age = bigScreenDAO.age(bigScreenStatisticAgeGenderDTO);
 
         BigScreenStatisticAgeGender ageGender = new BigScreenStatisticAgeGender();
-        BeanUtils.copyProperties(age, ageGender);
-        ageGender.setManTotal(gender.getManTotal());
-        ageGender.setWomeTotal(gender.getWomeTotal());
+        if(age!=null){
+            BeanUtils.copyProperties(age, ageGender);
+            ageGender.setManTotal(gender.getManTotal());
+            ageGender.setWomeTotal(gender.getWomeTotal());
 
-        /**
-         * 计算百分比
-         */
-        Double manPer = 1.0 * ageGender.getManTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
-        Double womenPer = 1.0 * ageGender.getWomeTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
-        ageGender.setManPer(manPer);
-        ageGender.setWomenPer(womenPer);
+            /**
+             * 计算百分比
+             */
+            Double manPer = 1.0 * ageGender.getManTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
+            Double womenPer = 1.0 * ageGender.getWomeTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
+            ageGender.setManPer(manPer);
+            ageGender.setWomenPer(womenPer);
 
-        Integer memTotal = ageGender.getThirtyTotal() + ageGender.getSixtyTotal() + ageGender.getBiggerTotal();
-        Double thrPer = 1.0 * ageGender.getThirtyTotal() / memTotal;
-        Double sixPer = 1.0 * ageGender.getSixtyTotal() / memTotal;
-        Double biggerPer = 1.0 * ageGender.getBiggerTotal() / memTotal;
-        ageGender.setThirtyPer(thrPer);
-        ageGender.setSixtyPer(sixPer);
-        ageGender.setBiggerPer(biggerPer);
+            Integer memTotal = ageGender.getThirtyTotal() + ageGender.getSixtyTotal() + ageGender.getBiggerTotal();
+            Double thrPer = 1.0 * ageGender.getThirtyTotal() / memTotal;
+            Double sixPer = 1.0 * ageGender.getSixtyTotal() / memTotal;
+            Double biggerPer = 1.0 * ageGender.getBiggerTotal() / memTotal;
+            ageGender.setThirtyPer(thrPer);
+            ageGender.setSixtyPer(sixPer);
+            ageGender.setBiggerPer(biggerPer);
+        }
+
         return R.ok(ageGender);
     }
 
@@ -108,4 +114,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