From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java |   68 +++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 21 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 2b3e526..38d8e1e 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
@@ -1,10 +1,14 @@
 package com.panzhihua.service_community.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.utlis.DateUtils;
+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;
@@ -51,25 +55,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);
     }
 
@@ -89,6 +96,11 @@
                 listRt = listRt.subList(0, 3);
             }
         }
+        listRt.forEach(partyBuildingMemberVO -> {
+            if(StringUtils.isNotEmpty(partyBuildingMemberVO.getName())){
+                partyBuildingMemberVO.setName(SensitiveUtil.replaceName(partyBuildingMemberVO.getName()));
+            }
+        });
         return R.ok(listRt);
     }
 
@@ -106,18 +118,19 @@
 
     @Override
     public R partyActivityLine(Long communityId) {
-        List<BigScreenActivityLine> bigScreenActivityLines=this.getPoints();
+        List<BigScreenActivityLine> bigScreenActivityLines=this.getPastMonth();
         bigScreenActivityLines.forEach(bigScreenActivityLine -> {
-           BigScreenActivityLine bigScreenActivityLine1=comPbMemberDAO.selectActivityCountMonth(communityId,bigScreenActivityLine.getX());
+           BigScreenActivityLine bigScreenActivityLine1=comPbMemberDAO.selectActivityCountMonth(communityId,bigScreenActivityLine.getX(),bigScreenActivityLine.getYear());
            bigScreenActivityLine.setY(bigScreenActivityLine1.getY());
            bigScreenActivityLine.setCountY(bigScreenActivityLine1.getCountY());
+           bigScreenActivityLine.setX(bigScreenActivityLine.getYear().substring(2,4)+"-"+bigScreenActivityLine.getX());
         });
         return R.ok(bigScreenActivityLines);
     }
 
     @Override
-    public R partyActivityTop(Long communityId) {
-        return R.ok(this.comPbMemberDAO.selectActivityTop(communityId));
+    public R partyActivityTop(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
+        return R.ok(this.comPbMemberDAO.selectActivityTop(new Page(pageBigScreenStatisticPartyOrg.getPageNum(),pageBigScreenStatisticPartyOrg.getPageSize()),pageBigScreenStatisticPartyOrg.getCommunityId()));
     }
 
     @Override
@@ -147,4 +160,17 @@
         return bigScreenActivityLines;
     }
 
+    public List<BigScreenActivityLine> getPastMonth(){
+        List<BigScreenActivityLine> bigScreenActivityLines=new ArrayList<>();
+        for(int i=11;i>=0;i--){
+            BigScreenActivityLine bigScreenActivityLine=new BigScreenActivityLine();
+            String date=DateUtils.getDateFormatString(DateUtils.addMonth(new Date(),-i),"MM");
+            String year=DateUtils.getDateFormatString(DateUtils.addMonth(new Date(),-i),"yyyy");
+            bigScreenActivityLine.setX(date);
+            bigScreenActivityLine.setYear(year);
+            bigScreenActivityLines.add(bigScreenActivityLine);
+        }
+        return bigScreenActivityLines;
+    }
+
 }

--
Gitblit v1.7.1