Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2022-12-06 2a212f983f35e1c569dfec3a172fb5f0c9f85fac

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java

@@ -3,11 +3,15 @@
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;
@@ -41,6 +45,8 @@
    private ComActDAO comActDAO;
    @Resource
    private ComStreetDAO comStreetDAO;
    @Resource
    private ComPbMemberDAO comPbMemberDAO;

    /**
     * 新增社区
@@ -291,8 +297,50 @@
        }
        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);
    }
}