Merge branch 'west_bigscreen_dev' into 'master'

罗元桥

2021-12-14 ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e

Merge branch 'west_bigscreen_dev' into 'master'

West bigscreen dev

See merge request root/zhihuishequ!250

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.common.model.vos.community.bigscreen;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zzj
 */
@Data
@ApiModel("西区大屏治理数据")
public class WestScreenStatics {
    @ApiModelProperty("注册人数")
    private Integer user;
    @ApiModelProperty("党组织")
    private Integer partyOrg;
    @ApiModelProperty("党员")
    private Integer partyMember;
    @ApiModelProperty("志愿者")
    private Integer volunteer;
    @ApiModelProperty("微心愿")
    private Integer microWish;
    @ApiModelProperty("安全巡查")
    private Integer safety;
    @ApiModelProperty("社区活动")
    private Integer activity;
    @ApiModelProperty("疫情防控")
    private Integer reserve;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java

New file
@@ -0,0 +1,43 @@
package com.panzhihua.common.model.vos.community.screen.event;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: hans
 * @date: 2021/12/14 9:16
 */
@Data
@ApiModel("西区大数据分析平台-综合治理信息")
public class EventComprehensiveGovernanceStatisticsVO {

    @ApiModelProperty("综合治理总数")
    private Integer governanceTotal = 0;

    @ApiModelProperty("突发事件报告总数")
    private Integer eventTFTotal = 0;

    @ApiModelProperty("治安防控总数")
    private Integer eventZATotal = 0;

    @ApiModelProperty("矛盾劝解总数")
    private Integer eventMDTotal = 0;

    @ApiModelProperty("特殊人群服务总数")
    private Integer eventTSTotal = 0;

    @ApiModelProperty("民生服务总数")
    private Integer eventMSTotal = 0;

    @ApiModelProperty("居民随手拍总数")
    private Integer eventSSPTotal = 0;

    public void generateGovernanceTotal() {
        this.governanceTotal = this.eventTFTotal + this.eventZATotal + this.eventMDTotal +
                this.eventTSTotal + this.eventMSTotal + this.eventSSPTotal;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationBasicsStatisticsVO.java

New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.vos.community.screen.event;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实基础信息")
public class EventPopulationBasicsStatisticsVO {

    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("社区名称")
    private String communityName;

    @ApiModelProperty("人口数量")
    private Integer populationNum = 0;

    @ApiModelProperty("小区数量")
    private Integer villageNum = 0;

    @ApiModelProperty("房屋数量")
    private Integer houseNum = 0;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java

New file
@@ -0,0 +1,63 @@
package com.panzhihua.common.model.vos.community.screen.event;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实特殊人群信息")
public class EventPopulationSpecialStatisticsVO {

    @ApiModelProperty("残疾人")
    private Integer cjTotal = 0;

    @ApiModelProperty("低保户")
    private Integer dbTotal = 0;

    @ApiModelProperty("高龄老人")
    private Integer glTotal = 0;

    @ApiModelProperty("特殊情况")
    private Integer tsTotal = 0;

    @ApiModelProperty("特扶家庭")
    private Integer tfTotal = 0;

    @ApiModelProperty("退役军人")
    private Integer tyTotal = 0;

    @ApiModelProperty("退休人员")
    private Integer txTotal = 0;

    @ApiModelProperty(value = "吸毒人员",hidden = true)
    private Integer xdTotal = 0;

    @ApiModelProperty(value = "社区矫正人员",hidden = true)
    private Integer jzTotal = 0;

    @ApiModelProperty(value = "邪教人员",hidden = true)
    private Integer xjTotal = 0;

    @ApiModelProperty(value = "刑释人员",hidden = true)
    private Integer xsTotal = 0;

    @ApiModelProperty(value = "上访人员",hidden = true)
    private Integer sfTotal = 0;

    @ApiModelProperty(value = "重精人员",hidden = true)
    private Integer zjTotal = 0;

    @ApiModelProperty("老年人（》=60）")
    private Integer lnTotal = 0;

    @ApiModelProperty("其他")
    private Integer otherTotal = 0;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStatisticsVO.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.vos.community.screen.event;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实信息")
public class EventPopulationStatisticsVO {

    @ApiModelProperty("人口数据")
    private List<EventPopulationBasicsStatisticsVO> basicsList;

    @ApiModelProperty("特殊人口数据")
    private EventPopulationSpecialStatisticsVO specialStatisticsVo;

    @ApiModelProperty("人口数量")
    private Integer populationNum = 0;

    @ApiModelProperty("小区数量")
    private Integer villageNum = 0;

    @ApiModelProperty("房屋数量")
    private Integer houseNum = 0;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStreetVO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.vos.community.screen.event;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-街道列表信息")
public class EventPopulationStreetVO {

    @ApiModelProperty("街道id")
    private Long streetId;

    @ApiModelProperty("街道名称")
    private String name;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -7422,4 +7422,20 @@
    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();

    /**
     * 西区大屏治理数据
     */
    @GetMapping("/screen/getWestScreenStatics")
    R westScreenStatics();

    /**
     * 西区大屏一标三实数据
     * @return  西区大屏一标三实数据
     */
    @GetMapping("/screen/getComprehensivePopulationStatics")
    R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);

    @GetMapping("/screen/getComprehensiveStreetList")
    R getComprehensiveStreetList();
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1353,4 +1353,11 @@
     */
    @GetMapping("/screen/member/trajectory")
    R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @GetMapping("/screen/comprehensive/governance")
    R getComprehensiveGovernanceStatics();
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java

@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.HttpConstant;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.utlis.HttpClientUtil;
import com.panzhihua.common.utlis.HttpUtils;
import org.springframework.web.bind.annotation.*;
@@ -182,7 +183,31 @@
        return gridService.getGridsMemberTrajectory(communityId);
    }

    /**
     * 西区大屏治理数据
     */
    @ApiOperation(value = "西区大屏治理数据@lyq", response = WestScreenStatics.class)
    @GetMapping("/getWestScreenStatics")
    public R westScreenStatics(){
        return communityService.westScreenStatics();
    }


    @ApiOperation(value = "西区大数据分析平台-综合治理栏", response = EventComprehensiveGovernanceStatisticsVO.class)
    @GetMapping("/comprehensive/governance")
    public R getComprehensiveGovernanceStatics() {
        return gridService.getComprehensiveGovernanceStatics();
    }

    @ApiOperation(value = "西区大数据分析平台-一标三实栏", response = EventPopulationStatisticsVO.class)
    @GetMapping("/comprehensive/population")
    public R getComprehensivePopulationStatics(@RequestParam(value = "streetId",required = false,defaultValue = "0") Long streetId) {
        return communityService.getComprehensivePopulationStatics(streetId);
    }

    @ApiOperation(value = "西区大数据分析平台-西区街道列表", response = EventPopulationStreetVO.class)
    @GetMapping("/comprehensive/street/list")
    public R getComprehensiveStreetList() {
        return communityService.getComprehensiveStreetList();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java

@@ -79,4 +79,22 @@
        return R.ok(comMngPopulationService.getScreenEventDetail(eventDetailDTO));
    }

    /**
     * 西区大屏治理数据
     */
    @GetMapping("/getWestScreenStatics")
    public R westScreenStatics(){
        return comMngPopulationService.westScreenStatics();
    }

    @GetMapping("/getComprehensivePopulationStatics")
    public R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId){
        return comMngPopulationService.getComprehensivePopulationStatics(streetId);
    }

    @GetMapping("/getComprehensiveStreetList")
    public R getComprehensiveStreetList(){
        return comMngPopulationService.getComprehensiveStreetList();
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.screen.civil.*;
import com.panzhihua.service_community.model.dos.ComMngPopulationCommunityTagsDO;
import org.apache.ibatis.annotations.Insert;
@@ -630,4 +631,20 @@
    CivilGridStatisticsVO getCivilGrid(@Param("communityId") Long communityId);

    CivilConvenienceStatisticsVO getCivilConvenience(@Param("communityId") Long communityId);

    /**
     * 西区治理数据统计
     * @return
     */
    WestScreenStatics westScreenStatics();

    List<EventPopulationBasicsStatisticsVO> getBasicsList(@Param("streetId") Long streetId);

    EventPopulationSpecialStatisticsVO getPopulationSpecial(@Param("streetId") Long streetId);

    List<String> getPopulationListCardNo(@Param("streetId") Long streetId);

    Integer getPopulationAge(@Param("streetId") Long streetId);

    List<EventPopulationStreetVO> getComprehensiveStreetList();
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -521,4 +521,14 @@
     * @return
     */
    R specialInputUserExport(PageInputUserDTO PageInputUserDTO);

    /**
     * 西区大屏治理数据
     * @return
     */
    R westScreenStatics();

    R getComprehensivePopulationStatics(Long streetId);

    R getComprehensiveStreetList();
}

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

@@ -7738,6 +7738,41 @@
        return R.ok(this.comMngPopulationDAO.specialInputUserExport(pageInputUserDTO));
    }

    @Override
    public R westScreenStatics() {
        return R.ok(this.comMngPopulationDAO.westScreenStatics());
    }

    @Override
    public R getComprehensivePopulationStatics(Long streetId){
        EventPopulationStatisticsVO statisticsVo = new EventPopulationStatisticsVO();
        //查询人口数据
        List<EventPopulationBasicsStatisticsVO> basicsList = comMngPopulationDAO.getBasicsList(streetId);
        if(basicsList != null){
            for (EventPopulationBasicsStatisticsVO basics : basicsList) {
                statisticsVo.setPopulationNum(statisticsVo.getPopulationNum() + basics.getPopulationNum());
                statisticsVo.setVillageNum(statisticsVo.getVillageNum() + basics.getVillageNum());
                statisticsVo.setHouseNum(statisticsVo.getHouseNum() + basics.getHouseNum());
            }
            statisticsVo.setBasicsList(basicsList);
        }
        //查询特殊人群数据
        EventPopulationSpecialStatisticsVO populationSpecial = comMngPopulationDAO.getPopulationSpecial(streetId);
        if(populationSpecial != null){
            populationSpecial.setOtherTotal(populationSpecial.getZjTotal() + populationSpecial.getSfTotal()
                    + populationSpecial.getXsTotal() + populationSpecial.getXjTotal()
                    + populationSpecial.getJzTotal() + populationSpecial.getXdTotal());
            populationSpecial.setLnTotal(comMngPopulationDAO.getPopulationAge(streetId));
            statisticsVo.setSpecialStatisticsVo(populationSpecial);
        }
        return R.ok(statisticsVo);
    }

    @Override
    public R getComprehensiveStreetList(){
        return R.ok(comMngPopulationDAO.getComprehensiveStreetList());
    }

    private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
        mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
        mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -813,4 +813,261 @@
        FROM
            com_act_work_guide
    </select>


    <select id="westScreenStatics" resultType="com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics">
        select  ( SELECT    count( id ) FROM    com_act_micro_wish AS camw    WHERE    camw.STATUS = 6 ) microWish ,
                (select count(user_id) from sys_user t LEFT JOIN com_act t1 on t.community_id = t1.community_id
                 where t.type=1 and t.community_id is not null and t1.area_code ='510423') user,
                (select count(id) from com_pb_org where parent_id = 0) partyOrg,
                (select count(id) from com_pb_member where audit_result = 1) partyMember,
                (select count(id) from com_mng_volunteer_mng where  state = 2)  volunteer,
                (select count(id) from com_sw_patrol_record) safety,
                (select count(*) from com_act_reserve t LEFT JOIN com_act_reserve_record t1 on t.id = t1.reserve_id where title like '%居家隔离%' or title like  '%返攀登记%' and t1.status = 2 )  reserve,
                (select count(*) from com_act_activity where status !=6) activity
        </select>

    <select id="getBasicsList" resultType="com.panzhihua.common.model.vos.community.screen.event.EventPopulationBasicsStatisticsVO">
        SELECT
            ca.community_id,
            ca.`name` AS communityName,
            (
            SELECT
                count( cmpct.id )
            FROM
                com_mng_population_community_tags AS cmpct
                LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            WHERE
                cmpct.community_id = ca.community_id
            ) AS populationNum,
            ( SELECT count( village_id ) FROM com_mng_village AS cmv WHERE cmv.community_id = ca.community_id ) AS villageNum,
            (select count(id) from com_mng_population_house as cmph where cmph.community_id = ca.community_id) as houseNum
        FROM
            com_act AS ca
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
            <where>
                <if test="streetId != null and streetId != 0">
                    and cs.street_id = 19
                </if>
            </where>
        order by cs.street_id desc,populationNum desc
    </select>

    <select id="getPopulationSpecial" resultType="com.panzhihua.common.model.vos.community.screen.event.EventPopulationSpecialStatisticsVO">
        SELECT
            count( cmpct.id ) AS cjTotal,
            (
            SELECT
            count( cmpct1.id )
        FROM
            com_mng_population_community_tags AS cmpct1
            LEFT JOIN com_act AS ca1 ON ca1.community_id = cmpct1.community_id
            LEFT JOIN com_street AS cs1 ON cs1.street_id = ca1.street_id
        WHERE
             cmpct1.label LIKE '%低保户%'
            <if test="streetId != null and streetId != 0">
                and cs1.street_id = #{streetId}
            </if>
            ) as dbTotal ,
            (
            SELECT
            count( cmpct2.id )
        FROM
            com_mng_population_community_tags AS cmpct2
            LEFT JOIN com_act AS ca2 ON ca2.community_id = cmpct2.community_id
            LEFT JOIN com_street AS cs2 ON cs2.street_id = ca2.street_id
        WHERE
            cmpct2.label LIKE '%高龄老人%'
        <if test="streetId != null and streetId != 0">
            and cs2.street_id = #{streetId}
        </if>
            ) as glTotal ,
            (
            SELECT
            count( cmpct3.id )
        FROM
            com_mng_population_community_tags AS cmpct3
            LEFT JOIN com_act AS ca3 ON ca3.community_id = cmpct3.community_id
            LEFT JOIN com_street AS cs3 ON cs3.street_id = ca3.street_id
        WHERE
             cmpct3.label LIKE '%特殊情况（重大病史/孕）%'
        <if test="streetId != null and streetId != 0">
            and cs3.street_id = #{streetId}
        </if>
            ) as tsTotal ,
            (
            SELECT
            count( cmpct4.id )
        FROM
            com_mng_population_community_tags AS cmpct4
            LEFT JOIN com_act AS ca4 ON ca4.community_id = cmpct4.community_id
            LEFT JOIN com_street AS cs4 ON cs4.street_id = ca4.street_id
        WHERE
            cmpct4.label LIKE '%特扶家庭%'
        <if test="streetId != null and streetId != 0">
            and cs4.street_id = #{streetId}
        </if>
            ) as tfTotal,
            (
            SELECT
            count( cmpct5.id )
        FROM
            com_mng_population_community_tags AS cmpct5
            LEFT JOIN com_act AS ca5 ON ca5.community_id = cmpct5.community_id
            LEFT JOIN com_street AS cs5 ON cs5.street_id = ca5.street_id
        WHERE
            cmpct5.label LIKE '%退役军人%'
        <if test="streetId != null and streetId != 0">
            and cs5.street_id = #{streetId}
        </if>
            ) as tyTotal,
            (
            SELECT
            count( cmpct6.id )
        FROM
            com_mng_population_community_tags AS cmpct6
            LEFT JOIN com_act AS ca6 ON ca6.community_id = cmpct6.community_id
            LEFT JOIN com_street AS cs6 ON cs6.street_id = ca6.street_id
            left join com_mng_population as cmp6 on cmp6.id = cmpct6.population_id
        WHERE
            cmpct6.label LIKE '%养老金人员%'
        <if test="streetId != null and streetId != 0">
            and cs6.street_id = #{streetId}
        </if>
            AND cmp6.death = 0
            ) as txTotal,
            (
            SELECT
            count( cmpct7.id )
        FROM
            com_mng_population_community_tags AS cmpct7
            LEFT JOIN com_act AS ca7 ON ca7.community_id = cmpct7.community_id
            LEFT JOIN com_street AS cs7 ON cs7.street_id = ca7.street_id
        WHERE
            cmpct7.label LIKE '%吸毒人员%'
        <if test="streetId != null and streetId != 0">
            and cs7.street_id = #{streetId}
        </if>
            ) as xdTotal,
            (
            SELECT
            count( cmpct8.id )
        FROM
            com_mng_population_community_tags AS cmpct8
            LEFT JOIN com_act AS ca8 ON ca8.community_id = cmpct8.community_id
            LEFT JOIN com_street AS cs8 ON cs8.street_id = ca8.street_id
        WHERE
            cmpct8.label LIKE '%社区矫正%'
        <if test="streetId != null and streetId != 0">
            and cs8.street_id = #{streetId}
        </if>
            ) as jzTotal,
            (
            SELECT
            count( cmpct9.id )
        FROM
            com_mng_population_community_tags AS cmpct9
            LEFT JOIN com_act AS ca9 ON ca9.community_id = cmpct9.community_id
            LEFT JOIN com_street AS cs9 ON cs9.street_id = ca9.street_id
        WHERE
            cmpct9.label LIKE '%邪教人员%'
        <if test="streetId != null and streetId != 0">
            and cs9.street_id = #{streetId}
        </if>
            ) as xjTotal,
            (
            SELECT
            count( cmpct10.id )
        FROM
            com_mng_population_community_tags AS cmpct10
            LEFT JOIN com_act AS ca10 ON ca10.community_id = cmpct10.community_id
            LEFT JOIN com_street AS cs10 ON cs10.street_id = ca10.street_id
        WHERE
            cmpct10.label LIKE '%刑释人员%'
        <if test="streetId != null and streetId != 0">
            and cs10.street_id = #{streetId}
        </if>
            ) as xsTotal,
            (
            SELECT
            count( cmpct11.id )
        FROM
            com_mng_population_community_tags AS cmpct11
            LEFT JOIN com_act AS ca11 ON ca11.community_id = cmpct11.community_id
            LEFT JOIN com_street AS cs11 ON cs11.street_id = ca11.street_id
        WHERE
            cmpct11.label LIKE '%上访人员%'
        <if test="streetId != null and streetId != 0">
            and cs11.street_id = #{streetId}
        </if>
            ) as sfTotal,
            (
            SELECT
            count( cmpct12.id )
        FROM
            com_mng_population_community_tags AS cmpct12
            LEFT JOIN com_act AS ca12 ON ca12.community_id = cmpct12.community_id
            LEFT JOIN com_street AS cs12 ON cs12.street_id = ca12.street_id
        WHERE
            cmpct12.label LIKE '%精神障碍患者%'
        <if test="streetId != null and streetId != 0">
            and cs12.street_id = #{streetId}
        </if>
            ) as zjTotal
        FROM
            com_mng_population_community_tags AS cmpct
            LEFT JOIN com_act AS ca ON ca.community_id = cmpct.community_id
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
        WHERE
            cmpct.label LIKE '%残疾人%'
        <if test="streetId != null and streetId != 0">
            and cs.street_id = #{streetId}
        </if>
    </select>

    <select id="getPopulationListCardNo" resultType="string">
        SELECT
            cmp.card_no
        FROM
            com_mng_population_community_tags AS cmpct
            LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            LEFT JOIN com_act AS ca ON ca.community_id = cmpct.community_id
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
        <where>
            <if test="streetId != null and streetId != 0">
                and cs.street_id = #{streetId}
            </if>
        </where>
    </select>

    <select id="getPopulationAge" resultType="integer">
        select count(age) from (
            SELECT
            YEAR (now()) - YEAR (substring(cmp.card_no_str, 7, 8)) age
        FROM
            com_mng_population_community_tags AS cmpct
            LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            LEFT JOIN com_act AS ca ON ca.community_id = cmpct.community_id
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id

        <where>
            <if test="streetId != null and streetId != 0">
                and cs.street_id = #{streetId}
            </if>
        </where>
            having age >= 60
        ) as ageDual
    </select>

    <select id="getComprehensiveStreetList" resultType="com.panzhihua.common.model.vos.community.screen.event.EventPopulationStreetVO">
        SELECT
            street_id,
            `name`
        FROM
            com_street
        WHERE
            area_code = '510423'
        ORDER BY
            create_at DESC
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java

@@ -89,4 +89,13 @@
        return eventGridMemberRelationService.getGridsMemberTrajectory(communityId);
    }

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @GetMapping("/comprehensive/governance")
    public R getComprehensiveGovernanceStatics() {
        return eventService.getComprehensiveGovernanceStatics();
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java

@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -164,4 +165,10 @@
    List<Map<String, Object>> getMemberBuildName(@Param("userId") Long userId);

    Integer getPopulationByLabelCount(@Param("floor") String floor, @Param("villageId") Long villageId);

    /**
     * 西区大数据分析平台-综合治理栏数据
     * @return
     */
    EventComprehensiveGovernanceStatisticsVO selectComprehensiveGovernanceStatics();
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java

@@ -351,4 +351,10 @@
     * @return 网格员工作汇总数据
     */
    R gridMemberStatisticsAll(MemberStatisticsAdminDTO statisticsAdminDTO);

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    R getComprehensiveGovernanceStatics();
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -5,6 +5,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -2641,4 +2642,15 @@
    public R gridMemberStatisticsAll(MemberStatisticsAdminDTO statisticsAdminDTO) {
        return R.ok(eventGridMemberRelationMapper.gridMemberStatisticsAll(statisticsAdminDTO));
    }

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @Override
    public R getComprehensiveGovernanceStatics() {
        EventComprehensiveGovernanceStatisticsVO governanceStatisticsVO = this.baseMapper.selectComprehensiveGovernanceStatics();
        governanceStatisticsVO.generateGovernanceTotal();
        return R.ok(governanceStatisticsVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -1376,5 +1376,37 @@
              left join com_mng_population AS cmp on cmp.id = cmpct.population_id
        where cmtct.label is not null and cmp.village_id = #{villageId} and floor = #{floor}
    </select>
    <select id="selectComprehensiveGovernanceStatics"
            resultType="com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO">
        SELECT
        (SELECT COUNT( e.id ) FROM `event` AS e
        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        LEFT JOIN com_act AS a ON egd.grid_community_id = a.community_id
        WHERE e.event_category = 1 AND e.event_type = 5 AND e.event_deal_status = 4 AND a.area_code = 510423) AS eventTFTotal,

        (SELECT COUNT( e1.id ) FROM `event` AS e1
        LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id
        LEFT JOIN com_act AS a1 ON egd1.grid_community_id = a1.community_id
        WHERE event_category = 1 AND event_type = 1 AND e1.event_deal_status = 4 AND a1.area_code = 510423) AS eventZATotal,

        (SELECT COUNT( e2.id ) FROM `event` AS e2
        LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id
        LEFT JOIN com_act AS a2 ON egd2.grid_community_id = a2.community_id
        WHERE event_category = 1 AND event_type = 3 AND e2.event_deal_status = 4 AND a2.area_code = 510423) AS eventMDTotal,

        (SELECT COUNT( e3.id ) FROM `event` AS e3
        LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id
        LEFT JOIN com_act AS a3 ON egd3.grid_community_id = a3.community_id
        WHERE event_category = 1 AND event_type = 6 AND e3.event_deal_status = 4 AND a3.area_code = 510423) AS eventTSTotal,

        (SELECT COUNT( e5.id ) FROM `event` AS e5
        LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id
        LEFT JOIN com_act AS a5 ON egd5.grid_community_id = a5.community_id
        WHERE event_category = 1 AND event_type = 2 AND e5.event_deal_status = 4 AND a5.area_code = 510423) AS eventMSTotal,

        (SELECT COUNT(p.id) FROM com_act_easy_photo p
        LEFT JOIN com_act AS a ON p.community_id = a.community_id
        WHERE p.`status` = 4 AND p.del_tag = 0 AND a.area_code = 510423) AS eventSSPTotal
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -271,6 +271,8 @@
                noLoginUrl.add("/api/applets/renting/houses/nearby");
                noLoginUrl.add("/api/applets/renting/houses/houseList");
                noLoginUrl.add("/api/applets/renting/houses/getConfig");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/street/list");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/population");
                if (noLoginUrl.contains(requestURI)) {
                    List<SimpleGrantedAuthority> authorities = new ArrayList<>();
                    authorities.add(new SimpleGrantedAuthority(SecurityConstants.ROLE_APPLETS));