From 2e2bcc55ea6eb6fd63dae451bdd26f4b9875db40 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 06 二月 2023 16:57:49 +0800
Subject: [PATCH] #add 普达大屏接口

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java |   77 ++++++++++++++++++++++++++++++++++----
 1 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
index 00931e4..a830e49 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -3,10 +3,16 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.model.vos.community.ComActPasswordVo;
+import com.panzhihua.common.model.vos.community.ComBasicDataVo;
+import com.panzhihua.common.model.vos.partybuilding.ComPbMemberTypeVO;
+import com.panzhihua.service_community.dao.ComPbMemberDAO;
+import com.panzhihua.service_community.util.MyAESUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -39,6 +45,8 @@
     private ComActDAO comActDAO;
     @Resource
     private ComStreetDAO comStreetDAO;
+    @Resource
+    private ComPbMemberDAO comPbMemberDAO;
 
     /**
      * 新增社区
@@ -223,8 +231,8 @@
      * @return 社区列表
      */
     @Override
-    public R getCommunityLists() {
-        return R.ok(this.comActDAO.getCommunityLists());
+    public R getCommunityLists(String appId) {
+        return R.ok(this.comActDAO.getCommunityLists(appId));
     }
 
     @Override
@@ -238,9 +246,9 @@
      * @return 社区列表
      */
     @Override
-    public R getCommunityAllList(String areaCode) {
+    public R getCommunityAllList(String appId) {
         // 查询街道列表
-        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(areaCode);
+        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(appId);
         streetList.forEach(street -> {
             // 查询街道下社区列表
             List<CommunitySwitchAllAppletsVO> communityList =
@@ -250,8 +258,8 @@
                 street.setCount(communityList.size());
             }
         });
-//        streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed())
-//            .collect(Collectors.toList());
+        streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed())
+            .collect(Collectors.toList());
         return R.ok(streetList);
     }
 
@@ -263,8 +271,8 @@
      * @return 社区列表
      */
     @Override
-    public R communitySwitchSearchList(String name,String areaCode) {
-        return R.ok(this.comActDAO.getCommunityListByName(name,areaCode));
+    public R communitySwitchSearchList(String name,String appId) {
+        return R.ok(this.comActDAO.getCommunityListByName(name,appId));
     }
 
     /**
@@ -281,7 +289,58 @@
 
     @Override
     public R getCommunityPassword(Long communityId){
-        return R.ok(comActDAO.getCommunityPassword(communityId));
+        ComActPasswordVo comActPasswordVo=comActDAO.getCommunityPassword(communityId);
+        try {
+            comActPasswordVo.setPassword(MyAESUtil.Decrypt(comActPasswordVo.getPassword(),"Ryo7M3n8loC5Abcd"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return R.ok(comActPasswordVo);
+    }
+    @Override
+    public R selectIds(Long id){
+        return R.ok(this.comActDAO.selectIds(id));
     }
 
+    @Override
+    public R selectBasicData(){
+        //社区数
+        Integer community = comActDAO.countCommunity();
+        //商家数
+        Integer merchants = comActDAO.countMerchants();
+        //党员数
+        Integer pbMember = comActDAO.countPbMember();
+        //报道单位
+        Integer pbUnit = comActDAO.countPbUnit();
+        //实有人口
+        Integer population = comActDAO.countPopulation();
+        //实有房屋
+        Integer populationHouse = comActDAO.countPopulationHouse();
+        //社会组织
+        Integer socialOrg = comActDAO.countSocialOrg();
+        //志愿者
+        Integer volunteer = comActDAO.countVolunteer();
+
+        ComBasicDataVo comBasicDataVo = new ComBasicDataVo();
+        comBasicDataVo.setCommunity(community);
+        comBasicDataVo.setMerchants(merchants);
+        comBasicDataVo.setPbMember(pbMember);
+        comBasicDataVo.setPbUnit(pbUnit);
+        comBasicDataVo.setPopulation(population);
+        comBasicDataVo.setPopulationHouse(populationHouse);
+        comBasicDataVo.setSocialOrg(socialOrg);
+        comBasicDataVo.setVolunteer(volunteer);
+        return R.ok(comBasicDataVo);
+    }
+
+    @Override
+    public R statisticsPbMemberType(){
+        List<ComPbMemberTypeVO> comPbMemberTypeVOS = comPbMemberDAO.statisticsPbMemberType();
+        return R.ok(comPbMemberTypeVOS);
+    }
+
+    public R selectUnitByNatureName(){
+        List<ComPbMemberTypeVO> comPbMemberTypeVOS = comPbMemberDAO.selectUnitByNatureName();
+        return R.ok(comPbMemberTypeVOS);
+    }
 }

--
Gitblit v1.7.1