lidongdong
2023-02-27 c225d391b090bf72a7406fbb74484b5509508d24
Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
4个文件已修改
30 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComScreenDao.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComScreenMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComScreenDao.java
@@ -54,5 +54,10 @@
    BuildingListHeaderStatisticsAdminVo buildingListHeaderStatisticsAdmin(Long communityId);
    /**
     * 建筑数量统计
     * */
    int assetAnalysis(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
@@ -398,8 +398,10 @@
    public R basicData(Long communityId) {
        BuildingListHeaderStatisticsAdminVo buildingListHeaderStatisticsAdminVo=comScreenDao.buildingListHeaderStatisticsAdmin(communityId);
        BasicDataVO vo=new BasicDataVO();
        vo.setVillage(buildingListHeaderStatisticsAdminVo.getBuildNum());
        vo.setPeople(buildingListHeaderStatisticsAdminVo.getPopulationNum());
        vo.setBuildings(buildingListHeaderStatisticsAdminVo.getBuildNum());
        vo.setBuildings(buildingListHeaderStatisticsAdminVo.getHouseNum());
//        vo.setBuildings(comScreenDao.assetAnalysis(communityId));
        return R.ok(vo);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComScreenMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.panzhihua.service_community.dao.ComScreenDao">
    <select id="autonomyDynamic" resultType="com.panzhihua.common.model.vos.puda.DynamicVO">
        select community_id,
        (select count(id) from com_act_micro_wish where status=6 and  community_id=#{communityId}) as microWish,
        (select count(id) from com_act_micro_wish where community_id=#{communityId}) as microWish,
        (select count(id) from com_act_easy_photo where del_tag=0 and status=5 and  community_id=#{communityId}) as easyPhoto,
        (select count(id) from com_act_announcement where community_id=#{communityId}) as announcement,
        (select count(id) from com_act_activity where community_id=#{communityId}) as communityInfo,
@@ -16,10 +16,9 @@
        where community_id=#{communityId}
    </select>
    <select id="propertyData" resultType="com.panzhihua.common.model.vos.puda.PropertyVO">
         select cp.name as propertyName,
        (select count(cpm.id) from com_pb_member as cpm where cpm.community_id=#{communityId} and cpm.check_unit_id=cp.id) as partyMembers
        from com_property as cp
        where cp.community_id=#{communityId}
        select cp.name as propertyName,(select count(id) from com_pb_service_team cpst where cp.id=cpst.property_id)  as partyMembers
        from com_property cp
        where cp.community_id=#{communityId}
    </select>
    <select id="partyData" resultType="com.panzhihua.common.model.vos.puda.PartyDataVO">
        select id,
@@ -97,4 +96,9 @@
        WHERE
            cmb.act_id = #{communityId}
    </select>
    <select id="assetAnalysis" resultType="java.lang.Integer">
        select count(id)
        from com_mng_real_assets
        where community_id=#{communityId}
    </select>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -291,6 +291,13 @@
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/comprehensive/partydyn");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/comprehensive/pagedynamic");
                noLoginUrl.add("/api/huacheng-communitybackstage/screen/get/community/password");
                noLoginUrl.add("/api/huacheng-communitybackstage/pudaScreen/autonomyDynamic");
                noLoginUrl.add("/api/huacheng-communitybackstage/pudaScreen/propertyDynamic");
                noLoginUrl.add("/api/huacheng-communitybackstage/pudaScreen/partyData");
                noLoginUrl.add("/api/huacheng-communitybackstage/pudaScreen/peopleInfo");
                noLoginUrl.add("/api/huacheng-communitybackstage/pudaScreen/countryard");
                noLoginUrl.add("/api/huacheng-communitybackstage/pudaScreen/basicData");
                noLoginUrl.add("/api/huacheng-communitybackstage/pudaScreen/specialPeople");
                noLoginUrl.add("/api/shopbackstage/microcommercialstreet/verifyCode");
                noLoginUrl.add("/api/shopbackstage/mcsOrder/wxNotify");
                noLoginUrl.add("/api/shopbackstage/microcommercialstreet/bindPhone");