Merge branch 'master' into test

puhanshu

2021-12-24 6496d6a229ba8e0acd0777863fb34bee0f5ce717

Merge branch 'master' into test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserveSub.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
#	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
#	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java
#	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java

@@ -227,4 +227,16 @@
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
        return R.ok(loginReturnVO);
    }

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
        return R.ok(loginReturnVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java

@@ -122,4 +122,12 @@
     * @return 登录结果
     */
    LoginReturnVO loginMerchantBackStage(String account, String password);

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    LoginReturnVO loginXQDP(String account, String password);
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java

@@ -256,4 +256,22 @@
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @Override
    public LoginReturnVO loginXQDP(String account, String password){
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15", password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }
}

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

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

import lombok.Data;

/**
 * @author zzj
 */
@Data
public class Base64File {
    private String file;
}

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

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

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

/**
 * @author lyq
 * 社区账号密码返回参数
 */
@Data
@ApiModel("社区账号密码返回参数")
public class ComActPasswordVo {

    @ApiModelProperty("账号")
    private String account;

    @ApiModelProperty("密码")
    private String password;
}

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

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

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

import java.math.BigDecimal;
import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("安全防控")
public class BigScreenStaticsReserve {
    @ApiModelProperty("总数")
    private Integer count;
    @ApiModelProperty("防疫管控")
    private Integer epidemicCount;
    @ApiModelProperty("燃气登记")
    private Integer gasCount;
    @ApiModelProperty("防火登记")
    private Integer fireCount;
    @ApiModelProperty("返攀登记")
    private Integer reserveCount;
    @ApiModelProperty("居家隔离登记")
    private Integer homeCount;
    @ApiModelProperty("返攀登记百分比")
    private BigDecimal reservePercent;
    @ApiModelProperty("居家隔离百分比")
    private BigDecimal homePercent;
    @ApiModelProperty("燃气登记百分比")
    private BigDecimal gasPercent;
    @ApiModelProperty("防火登记百分比")
    private BigDecimal firePercent;
    @ApiModelProperty("折线图数据")
    private List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList;
}

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

New file
@@ -0,0 +1,25 @@
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 BigScreenStaticsReserveMonth {
    @ApiModelProperty("x轴")
    private String x;
    @ApiModelProperty("燃气登记")
    private Integer gasCount;
    @ApiModelProperty("防火登记")
    private Integer fireCount;
    @ApiModelProperty("返攀登记")
    private Integer reserveCount;
    @ApiModelProperty("居家隔离登记")
    private Integer homeCount;
    @ApiModelProperty("总量")
    private Integer count;
}

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

@@ -18,8 +18,4 @@
    private Integer allCount;
    @ApiModelProperty("占比")
    private Integer percent;

    public Integer getPercent() {
        return  this.percent = num*100/allCount;
    }
}

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

New file
@@ -0,0 +1,37 @@
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;
    @ApiModelProperty("邻里圈")
    private Integer neighbor;
    @ApiModelProperty("一起议")
    private Integer discuss;
    @ApiModelProperty("日活跃")
    private Integer dayUser;
    @ApiModelProperty("累计用户")
    private Integer countUser;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilConvenienceStatisticsVO.java

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

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

@Data
@ApiModel("民生统计便民服务返回参数")
public class CivilConvenienceStatisticsVO {

    @ApiModelProperty("办事指南")
    private Integer guideNum;

    @ApiModelProperty("疫情防控")
    private Integer situationNum;

    @ApiModelProperty("房屋租赁")
    private Integer leaseNum;

    @ApiModelProperty("报事报修")
    private Integer repairNum;

    @ApiModelProperty("养老认证")
    private Integer pensionNum;

    @ApiModelProperty("高龄认证")
    private Integer eldersNum;

    @ApiModelProperty("低保认证")
    private Integer subsistenceNum;

    @ApiModelProperty("高龄补贴")
    private Integer allowanceNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGovernmentStatisticsVO.java

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

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

@Data
@ApiModel("民生统计社区治理返回参数")
public class CivilGovernmentStatisticsVO {

    @ApiModelProperty("通知公告")
    private Integer noticeNum;

    @ApiModelProperty("议事投票")
    private Integer discussNum;

    @ApiModelProperty("随手拍")
    private Integer easyNum;

    @ApiModelProperty("邻里圈")
    private Integer neighborNum;

    @ApiModelProperty("居民活动")
    private Integer activityNum;

    @ApiModelProperty("社区动态")
    private Integer dynNum;

    @ApiModelProperty("爱心义仓")
    private Integer loveNum;

    @ApiModelProperty("居民留言板")
    private Integer messageNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGridStatisticsVO.java

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

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

@Data
@ApiModel("民生统计社区治理返回参数")
public class CivilGridStatisticsVO {

    @ApiModelProperty("今日突发事件")
    private Integer tfTodayNum;

    @ApiModelProperty("今日治安防控")
    private Integer zaTodayNum;

    @ApiModelProperty("今日民生服务")
    private Integer msTodayNum;

    @ApiModelProperty("今日矛盾劝解")
    private Integer mdTodayNum;

    @ApiModelProperty("今日特殊人群服务")
    private Integer tsTodayNum;

    @ApiModelProperty("累计事件")
    private Integer eventNum;

    @ApiModelProperty("电子巡查统计")
    private Integer xcNum;

    @ApiModelProperty("安全巡查")
    private Integer securityNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPartyStatisticsVO.java

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

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

@Data
@ApiModel("民生统计党建返回参数")
public class CivilPartyStatisticsVO {

    @ApiModelProperty("社区两委")
    private Integer committeeNum;

    @ApiModelProperty("党建动态")
    private Integer dynNum;

    @ApiModelProperty("党建活动")
    private Integer activityNum;

    @ApiModelProperty("微心愿")
    private Integer wishNum;

    @ApiModelProperty("双报道党员")
    private Integer partyNum;

    @ApiModelProperty("党组织")
    private Integer organizationNum;

    @ApiModelProperty("志愿者团队")
    private Integer volunteerNum;

    @ApiModelProperty("问卷调查")
    private Integer questionnaireNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java

@@ -29,4 +29,16 @@
    @ApiModelProperty("环比上月增长率")
    private BigDecimal rate;

    @ApiModelProperty("党建引领数据")
    private CivilPartyStatisticsVO civilPartyStatisticsVO;

    @ApiModelProperty("社区治理数据")
    private CivilGovernmentStatisticsVO civilGovernmentStatisticsVO;

    @ApiModelProperty("网格管理数据")
    private CivilGridStatisticsVO civilGridStatisticsVO;

    @ApiModelProperty("便民服务数据")
    private CivilConvenienceStatisticsVO civilConvenienceStatisticsVO;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java

@@ -3,9 +3,12 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import com.panzhihua.common.model.vos.community.screen.index.IndexSpecialStatisticsVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("民生统计小区列表返回参数")
@@ -66,4 +69,7 @@
    @ApiModelProperty("其他人员")
    private Integer otherPeopleNum;

    @ApiModelProperty("特殊人群统计模块数据")
    private List<IndexSpecialStatisticsVO> specialStatisticsList;

}

 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,60 @@
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(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/auth/TokenService.java

@@ -133,4 +133,13 @@
     */
    @PostMapping("/loginMerchantBackStage")
    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password);

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password);
}

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

@@ -7208,6 +7208,14 @@
    R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 居家隔离导出
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/homeQuarantine/export")
    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
@@ -7272,14 +7280,6 @@
     */
    @GetMapping("/property/publicity/incr-view")
    R incrPropertyPublicityView(@RequestParam("id") Long id);

    /**
     * 居家隔离导出
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/homeQuarantine/export")
    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 获取预设图片
@@ -7494,6 +7494,33 @@
    void updateAllHouseUnionAppCode();

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

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

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

    /**
     * 通过社区id查询社区账号密码
     * @param communityId   社区id
     * @return  查询社区账号密码
     */
    @GetMapping("/screen/getCommunityPassword")
    R getCommunityPassword(@RequestParam("communityId") Long communityId);

    @GetMapping("/reserve/bigScreenStaticsReserve")
    R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);

    /**
     * 党员活动折线图
     * @param communityId
     * @return

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

@@ -1363,6 +1363,13 @@
    R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);

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

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

@@ -848,6 +848,21 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        return sdf.format(calendar.getTime()) + " 23:59:59";
    }
    /**
     * 获取当前月最后一天
     *
     * @return
     */
    public static Date getLastDayOfMonth() {
        Calendar calendar = Calendar.getInstance();

        calendar.add(Calendar.MONTH, 1);

        calendar.set(Calendar.DAY_OF_MONTH, 0);
        // 格式化日期

        return calendar.getTime();
    }

    /**
     * 获取当前时间（年月日）

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SensitiveUtil.java

@@ -1,5 +1,8 @@
package com.panzhihua.common.utlis;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
 * @description: 身份证手机号脱敏处理
 * @author: Null
@@ -38,4 +41,16 @@
        return idNumber;
    }


    public static String replaceName(String str) {
        if(StringUtils.isNotEmpty(str)){
            if(str.length()==2){
                str=str.replace(str.substring(1),"*");
            }
            if(str.length()>2) {
                str=str.replace(str.substring(1,str.length()-1),"*");
            }
        }
        return str;
    }
}

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

@@ -11,6 +11,11 @@
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyOrg;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
@@ -53,6 +58,8 @@
    private GridService gridService;
    @Resource
    private UserService userService;
    @Resource
    private PartyBuildingService partyBuildingService;

    @ApiOperation(value = "大屏测试接口")
    @GetMapping("/test/noToken")
@@ -194,6 +201,27 @@
    }

    /**
     * 西区大屏治理数据
     */
    @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 = IndexInfo.class)
@@ -287,6 +315,11 @@
        return communityService.indexNeighbor(this.getCommunityId());
    }

    @ApiOperation(value = "西区大数据分析平台-西区街道列表", response = EventPopulationStreetVO.class)
    @GetMapping("/comprehensive/street/list")
    public R getComprehensiveStreetList() {
        return communityService.getComprehensiveStreetList();
    }
    /**
     * 首页二级页面-邻里圈展示列表
     */
@@ -297,6 +330,12 @@
        return communityService.indexNeighborList(pageBaseDTO);
    }

    @ApiOperation(value = "分页获取党建动态", response = BigScreenStatisticPartyOrg.class)
    @PostMapping("/comprehensive/partydyn")
    public R<BigScreenStatisticPartyOrg> partydyn(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        partyBuildingComPbDynVO.setType(1);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
    }
    /**
     * 首页二级页面-便民商家
     */
@@ -306,6 +345,22 @@
        return communityService.indexMerchant(this.getCommunityId());
    }

    @ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
    @PostMapping("/comprehensive/pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        comActDynVO.setIsTopping(null);
        comActDynVO.setStatus(1);
        return communityService.pageDynamic(comActDynVO);
    }

    @ApiOperation(value = "通过社区id查询社区账号密码")
    @PostMapping("/get/community/password")
    public R getCommunityPassword(@RequestParam("communityId") Long communityId) {
        if(communityId == null){
            return R.fail("参数错误");
        }
        return communityService.getCommunityPassword(communityId);
    }
    /**
     * 首页二级页面-商家展示列表
     */

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

@@ -18,6 +18,7 @@
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComActPictureLibraryVO;
import com.panzhihua.common.model.vos.community.ComPropertyPublicityVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;

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

@@ -11,6 +11,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.util.BaseUtils;
import lombok.Data;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
@@ -40,11 +46,6 @@
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
import com.panzhihua.common.model.vos.community.convenient.ExportMerchantVO;
@@ -216,14 +217,16 @@
    }

    @ApiOperation(value = "上传文件")
    @PostMapping(value = "/upload/file/noToken", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImageNoToken(@RequestParam MultipartFile file, HttpServletRequest request) {
        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
        String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
    @PostMapping(value = "/upload/file/noToken")
    public R uploadImageNoToken(@RequestBody Base64File file, HttpServletRequest request) {
        if(StringUtils.isEmpty(file.getFile())){
            return R.fail("文件不能为Null");
        }
        String name = UUID.randomUUID().toString().replaceAll("-", "")+".jpg";
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = file.getInputStream();
            InputStream is = BaseUtils.base64StrToInputStream(file.getFile().replace("data:image/png;base64,","").replace("data:image/jpg;base64,","").replace("data:image/jpeg;base64,",""));
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();
            return R.ok(url + "/idcard/" + name);

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

@@ -88,4 +88,18 @@
        return r;
    }

    @ApiOperation(value = "西区大屏登录", response = LoginReturnVO.class)
    @PostMapping("xq/login")
    public R xqdpLogin(@RequestBody LoginBody loginBody) {
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        boolean empty = ObjectUtils.isEmpty(account);
        boolean empty1 = ObjectUtils.isEmpty(password);
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginXQDP(account, password);
        return r;
    }

}

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

@@ -2,6 +2,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.controller.BaseController;
@@ -284,4 +285,9 @@
        return communityService.detailDynamic(id);
    }

    @ApiOperation(value = "安全防控",response = BigScreenStaticsReserve.class)
    @GetMapping("/reserve")
    public R reserve(){
        return communityService.bigScreenStaticsReserve(this.getCommunityId());
    }
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/BaseUtils.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.community_backstage.util;


import org.bouncycastle.util.encoders.Base64;

import java.io.*;

/**
 * @author zzj
 */
public class BaseUtils {


    public static InputStream base64StrToInputStream(String base64string) {
        ByteArrayInputStream stream = null;
        try {
            byte[] bytes = Base64.decode(base64string);
            stream = new ByteArrayInputStream(bytes);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return stream;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java

@@ -2,6 +2,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -80,7 +81,16 @@
        commonEventAddDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventAddDTO.setUserName(loginUserInfoVO.getNickName());
        commonEventAddDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.addCommon(commonEventAddDTO);
        R r = gridService.addCommon(commonEventAddDTO);
        if(R.isOk(r)){
            GridMemberPositionDTO memberPositionDTO = new GridMemberPositionDTO();
            memberPositionDTO.setGridMemberId(loginUserInfoVO.getUserId());
            memberPositionDTO.setPositionAddress(commonEventAddDTO.getHappenAddress());
            String []lngLatString = commonEventAddDTO.getHappentLatLng().split(",");
            memberPositionDTO.setLngLat(lngLatString[1] + "," + lngLatString[0]);
            gridService.gridReportPosition(memberPositionDTO);
        }
        return r;
    }

    /**

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

@@ -2,6 +2,7 @@

import javax.annotation.Resource;

import com.panzhihua.service_community.service.ComActService;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;
@@ -22,6 +23,8 @@

    @Resource
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComActService comActService;
    @Resource
    private BigScreenService bigScreenService;
    @Resource
@@ -88,6 +91,29 @@
    }

    /**
     * 西区大屏治理数据
     */
    @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();
    }


    @GetMapping("/getCommunityPassword")
    public R getCommunityPassword(@RequestParam("communityId") Long communityId){
        return comActService.getCommunityPassword(communityId);
    }
    /**
     * 新版大屏首页接口
     */
    @GetMapping("/indexInfo")

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

@@ -348,4 +348,9 @@
    public R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        return comActReserveAnswerContentService.exportHomeQuarantine(detailedAdminDTO);
    }

    @GetMapping("/bigScreenStaticsReserve")
    public R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId){
        return comActReserveAnswerContentService.bigScreenStaticsReserve(communityId);
    }
}

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

@@ -2,6 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -93,4 +94,7 @@

    @Select("select community_id,name,lng,lat from com_act  where state = 0 and area_code = '510423' ")
    List<EventGridCommunityAdminVO> getWestCommunityLists();

    @Select("select account,plaintext_password as password from com_act where community_id = #{communityId}")
    ComActPasswordVo getCommunityPassword(@Param("communityId") Long communityId);
}

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

@@ -26,10 +26,10 @@
 **/
@Mapper
public interface ComActDynDAO extends BaseMapper<ComActDynDO> {
    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "COUNT(u.id)readNum, " + "d.`status`, "
    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "IFNULL(u.readNum,0) readNum, " + "d.`status`, "
        + "d.`content`, " + "d.`cover`, " + "d.`type`, " + "d.`cover_mode`, d.jump_url,d.jump_type, " + "d.is_topping, " + "d.publish_at, "
        + "d.create_at, " + "cadt.`name` as typeName, " + "cadt.color as typeColor, " + "ca.name as communityName  "
        + "FROM " + "com_act_dyn d " + "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  "
        + "FROM " + "com_act_dyn d " + "LEFT JOIN ( select dyn_id,count(id) as readNum from com_act_dyn_user GROUP BY dyn_id  )  u ON d.id = u.dyn_id  "
        + "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  "
        + "LEFT JOIN com_act ca ON d.community_id = ca.community_id  " + "WHERE 1=1  "
        + "<if test='comActDynVO.choice == 0 '>" + "and d.community_id=#{comActDynVO.communityId} " + " </if> "

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

@@ -7,6 +7,8 @@
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -105,4 +107,19 @@
     * @return
     */
    List<ComOperationListVO> queryAll(OperationDetailDTO operationDetailDTO);

    /**
     * 大屏数据统计
     * @param communityId
     * @return
     */
    BigScreenStaticsReserve biggestScreen(@Param("communityId") Long communityId);

    /**
     * 大屏折线图
     * @param communityId
     * @param date
     * @return
     */
    BigScreenStaticsReserveMonth biggestScreenMonth(@Param("communityId")Long communityId,@Param("date")String date);
}

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

@@ -7,6 +7,8 @@
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.common.model.vos.community.bigscreen.BaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.IndexDynamic;
import com.panzhihua.service_community.model.dos.ComMngPopulationCommunityTagsDO;
@@ -27,8 +29,6 @@
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.index.*;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -341,7 +341,7 @@
        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = #{communityId}")
    List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);

    @Select("<script> " + "SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng  "
    @Select("<script> " + "(SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng,e.create_at as createAt  "
        + "FROM " + " `event` AS e " + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
        + " e.event_category = 1  " + " AND e.event_type IN ( 1, 2, 3, 4, 5, 6 )  " + " AND e.event_status = 2  "
        + " AND egd.grid_community_id = #{screenEventDTO.communityId}  "
@@ -353,14 +353,14 @@
        + " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " + " </if> "
        + "<if test='screenEventDTO.redCard != null'>" + " AND e.red_card = #{screenEventDTO.redCard} " + " </if> "
        + "<if test='screenEventDTO.yellowCard != null'>" + " AND e.yellow_card = #{screenEventDTO.yellowCard} "
        + " </if> " + "UNION ALL SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng  "
        + " </if> )" + "UNION ALL (SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng,create_at as createAt  "
        + "FROM " + " com_act_easy_photo  " + "WHERE " + " community_id = #{screenEventDTO.communityId}  "
        + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>"
        + " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
        + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
        + " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> "
        + "<if test='screenEventDTO.eventProcessStatus != null'>"
        + " AND handle_status = #{screenEventDTO.eventProcessStatus} " + " </if> " + " </script>")
        + " AND handle_status = #{screenEventDTO.eventProcessStatus} " + " </if> )" + "order by createAt desc </script>")
    List<EventGridIncidentStatisticsVO>
        getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

@@ -371,7 +371,7 @@
    CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId,
        @Param("lastMonth") Date lastMonth);

    @Select("SELECT `NAME`, " + " user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
    @Select("SELECT `NAME`, " + "user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
        + " com_mng_village AS cmv  " + "WHERE " + " community_id = #{communityId}")
    List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);

@@ -621,6 +621,38 @@
    void updatePopulationUnit(@Param("villageId") Long villageId, @Param("floor") String floor,@Param("oldUnitNo") String oldUnitNo,@Param("newUnitNo") String newUnitNo);

    /**
     * 根据villageId查询特殊人群数
     * @param villageId
     * @param label
     * @return
     */
    Integer selectCountByVillageId(@Param("villageId") Long villageId,@Param("label")String label);

    CivilPartyStatisticsVO getCivilParty(@Param("communityId") Long communityId);

    CivilGovernmentStatisticsVO getCivilGovernment(@Param("communityId") Long communityId);

    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, @Param("age") Integer age);

    List<EventPopulationStreetVO> getComprehensiveStreetList();

    /**
     * 基础数据统计
     * @param communityId
     * @return

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java

@@ -110,4 +110,9 @@
     */
    private Long streetId;

    /**
     * 明文密码
     */
    private String plaintextPassword;

}

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

@@ -39,4 +39,11 @@
     * @return
     */
    R exportHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 大屏数据统计
     * @param communityId
     * @return
     */
    R bigScreenStaticsReserve(Long communityId);
}

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

@@ -111,4 +111,6 @@
     * @return 社区列表
     */
    R communitySwitchSearchDistanceList(SearchCommunityDTO communityDTO);

    R getCommunityPassword(Long communityId);
}

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

@@ -523,6 +523,16 @@
    R specialInputUserExport(PageInputUserDTO PageInputUserDTO);

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

    R getComprehensivePopulationStatics(Long streetId);

    R getComprehensiveStreetList();

    /**
     * 新版大屏首页
     * @param communityId
     * @return

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

@@ -5,6 +5,8 @@

import javax.annotation.Resource;

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;
@@ -89,6 +91,11 @@
                listRt = listRt.subList(0, 3);
            }
        }
        listRt.forEach(partyBuildingMemberVO -> {
            if(StringUtils.isNotEmpty(partyBuildingMemberVO.getName())){
                partyBuildingMemberVO.setName(SensitiveUtil.replaceName(partyBuildingMemberVO.getName()));
            }
        });
        return R.ok(listRt);
    }


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

@@ -1,15 +1,20 @@
package com.panzhihua.service_community.service.impl;

import java.math.BigDecimal;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;

import javax.annotation.Resource;
import javax.xml.bind.DatatypeConverter;

import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth;
import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterExportVO;
import com.panzhihua.service_community.dao.ComActReserveRecordMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -46,6 +51,8 @@

    @Resource
    private ComActReserveSubMapper comActReserveSubMapper;
    @Resource
    private ComActReserveRecordMapper comActReserveRecordMapper;

    /**
     * 导出登记明细数据
@@ -277,6 +284,26 @@
        return R.ok(exportVO);
    }

    @Override
    public R bigScreenStaticsReserve(Long communityId) {
        BigScreenStaticsReserve bigScreenStaticsReserve=comActReserveRecordMapper.biggestScreen(communityId);
        bigScreenStaticsReserve.setReservePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getReserveCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setFirePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getFireCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setHomePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getHomeCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setGasPercent(BigDecimal.valueOf(bigScreenStaticsReserve.getGasCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList=this.getPoints();
        bigScreenStaticsReserveMonthList.forEach(bigScreenStaticsReserveMonth -> {
            BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX());
            bigScreenStaticsReserveMonth.setCount(bigScreenStaticsReserveMonth1.getCount());
            bigScreenStaticsReserveMonth.setReserveCount(bigScreenStaticsReserveMonth1.getReserveCount());
            bigScreenStaticsReserveMonth.setFireCount(bigScreenStaticsReserveMonth1.getFireCount());
            bigScreenStaticsReserveMonth.setGasCount(bigScreenStaticsReserveMonth1.getGasCount());
            bigScreenStaticsReserveMonth.setHomeCount(bigScreenStaticsReserveMonth1.getHomeCount());
        });
        bigScreenStaticsReserve.setBigScreenStaticsReserveMonthList(bigScreenStaticsReserveMonthList);
        return R.ok(bigScreenStaticsReserve);
    }

    private List<ComActQuestnaireSubVO> retrieveQuestnaireSub(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        //查询题目
        List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
@@ -291,4 +318,44 @@
        });
        return listSubVo;
    }

    public List<BigScreenStaticsReserveMonth> getPoints(){
        List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonths=new ArrayList<>();
        String nowMonth=DateUtils.getDateFormatString(new Date(),"MM");
        String nowYear=DateUtils.getDateFormatString(new Date(),"yyyy");
        String nowYearMonth=DateUtils.getDateFormatString(new Date(),"yyyyMM");
        if(Integer.parseInt(nowYearMonth)<202212){
            for(int i=9;i<=12;i++){
                String aDate="";
                if(i<10){
                    aDate = "0"+i;
                }
                else {
                    aDate=i+"";
                }
                BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
                bigScreenStaticsReserveMonth.setX(aDate);
                bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
            }
        }
        if(Integer.parseInt(nowYear)>2021){
            for(int i=1;i<=Integer.parseInt(nowMonth);i++){
                if(bigScreenStaticsReserveMonths.size()>=12){
                    bigScreenStaticsReserveMonths.remove(0);
                }
                String aDate="";
                if(i<10){
                    aDate = "0"+i;
                }
                else {
                    aDate=i+"";
                }
                BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
                bigScreenStaticsReserveMonth.setX(aDate);
                bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
            }
        }
        return bigScreenStaticsReserveMonths;
    }

}

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

@@ -63,6 +63,7 @@
            return R.fail("社区已经存在");
        }
        BeanUtils.copyProperties(comActVO, comActDO);
        comActDO.setPlaintextPassword(password);
        int insert = comActDAO.insert(comActDO);
        if (insert > 0) {
            ComActDO comActDO1 =
@@ -91,6 +92,7 @@
        if (!ObjectUtils.isEmpty(password)) {
            String encode = new BCryptPasswordEncoder().encode(password);
            comActVO.setPassword(encode);
            comActDO.setPlaintextPassword(password);
            a = 1;
        }
        ComStreetDO comStreetDO = comStreetDAO.selectById(comActVO.getStreetId());
@@ -101,7 +103,6 @@
        // a=1;
        // }
        BeanUtils.copyProperties(comActVO, comActDO);

//        ComActDO selectOne = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAccount, account));
//        if (null != selectOne && selectOne.getAccount().equals(comActVO.getAccount())) {
//            return R.fail("该登录账号重复，请重新修改");
@@ -271,4 +272,9 @@
        return R.ok(this.comActDAO.getCommunityListByNearby(communityDTO));
    }

    @Override
    public R getCommunityPassword(Long communityId){
        return R.ok(comActDAO.getCommunityPassword(communityId));
    }

}

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

@@ -9,8 +9,11 @@

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.screen.civil.*;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.util.WxDataUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -41,6 +44,7 @@
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
@@ -7057,7 +7061,7 @@
        // 查询特殊人群统计
        List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();

        // 查询特殊人群标签列表
        //查询特殊人群标签列表
        List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
        IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
        otherSpecialVO.setTitle("其他");
@@ -7141,8 +7145,49 @@

        // 查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
//        villageStatisticsList.forEach(civilVillageStatisticsVO -> {
//            civilVillageStatisticsVO.setUserSum(comMngPopulationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getVillageId,civilVillageStatisticsVO.getVillageId())));
//            List<IndexSpecialStatisticsVO> specialStatisticsVOS = new ArrayList<>();
//            IndexSpecialStatisticsVO otherSpecial = new IndexSpecialStatisticsVO();
//            otherSpecial.setTitle("其他");
//            otherSpecial.setSum(0);
//            // 查询特殊人群标签列表
//            List<ComMngUserTagVO> userTagVOS = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
//
//            userTagVOS.forEach(comMngUserTagVO -> {
//              Integer count=comMngPopulationDAO.selectCountByVillageId(civilVillageStatisticsVO.getVillageId(),comMngUserTagVO.getTagName());
//              IndexSpecialStatisticsVO indexSpecialStatisticsVO=new IndexSpecialStatisticsVO();
//              indexSpecialStatisticsVO.setTitle(comMngUserTagVO.getTagName());
//              indexSpecialStatisticsVO.setSum(count);
//              otherSpecial.setSum(otherSpecial.getSum()+count);
//              specialStatisticsVOS.add(indexSpecialStatisticsVO);
//            });
//            otherSpecial.setSum(civilVillageStatisticsVO.getUserSum()-otherSpecial.getSum());
//            specialStatisticsVOS.add(otherSpecial);
//            civilVillageStatisticsVO.setSpecialStatisticsList(specialStatisticsVOS);
//        });
        civilStatisticsVO.setVillageStatisticsList(villageStatisticsList);

        //查询党建引领数据
        CivilPartyStatisticsVO civilParty = this.baseMapper.getCivilParty(communityId);
        if(civilParty != null){
            civilStatisticsVO.setCivilPartyStatisticsVO(civilParty);
        }
        //查询社区治理数据
        CivilGovernmentStatisticsVO civilGovernment = this.baseMapper.getCivilGovernment(communityId);
        if(civilGovernment != null){
            civilStatisticsVO.setCivilGovernmentStatisticsVO(civilGovernment);
        }
        //查询网格管理数据
        CivilGridStatisticsVO civilGrid = this.baseMapper.getCivilGrid(communityId);
        if(civilGrid != null){
            civilStatisticsVO.setCivilGridStatisticsVO(civilGrid);
        }
        //查询便民服务数据
        CivilConvenienceStatisticsVO civilConvenience = this.baseMapper.getCivilConvenience(communityId);
        if(civilConvenience != null){
            civilStatisticsVO.setCivilConvenienceStatisticsVO(civilConvenience);
        }
        return R.ok(civilStatisticsVO);
    }

@@ -7715,6 +7760,46 @@
    }

    @Override
    public R westScreenStatics() {
        WestScreenStatics westScreenStatics=this.comMngPopulationDAO.westScreenStatics();
        WxDataUtil wxDataUtil=new WxDataUtil();
        westScreenStatics.setDayUser(wxDataUtil.getDayUser());
        westScreenStatics.setCountUser(wxDataUtil.getMonthUser());
        return R.ok(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,60));
            populationSpecial.setGlTotal(comMngPopulationDAO.getPopulationAge(streetId,80));
            statisticsVo.setSpecialStatisticsVo(populationSpecial);
        }
        return R.ok(statisticsVo);
    }

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

    @Override
    public R indexInfo(Long communityId) {
        IndexInfo indexInfo=new IndexInfo();
        //基础数据
@@ -7748,36 +7833,18 @@
                        otherSpecialVO.setPercent(otherSpecialVO.getSum()*100/countAll);
                    } else {
                        if (StringUtils.isNotEmpty(userTag.getTagName())) {
                            if (userTag.getTagName().equals("特扶家庭")) {
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(22);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            } else if (userTag.getTagName().equals("低保户")) {
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(94);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            } else if (userTag.getTagName().equals("低收入人群")) {
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(2);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            } else if (userTag.getTagName().equals("退役军人")) {
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(264);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            } else if (userTag.getTagName().equals("高龄老人")) {
                            if (userTag.getTagName().equals("高龄老人")) {
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
                                specialStatisticsVO.setPercent(specialStatisticsVO.getSum()*100/countAll);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            } else {
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
                                specialStatisticsVO.setSum(count);
                                specialStatisticsVO.setPercent(specialStatisticsVO.getSum()*100/countAll);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }
                        }
@@ -7825,13 +7892,28 @@
        IndexBackReserve indexBackReserve=new IndexBackReserve();
        indexBackReserve.setCount(comActReserveMapper.indexBackReserve(communityId));
        indexBackReserve.setIndexReserveSubList(comActReserveMapper.indexBackReserveSub(communityId));
        indexBackReserve.getIndexReserveSubList().forEach(indexReserveSub -> {
            if(indexReserveSub.getAllCount()!=0){
                indexReserveSub.setPercent(indexReserveSub.getNum()*100/indexReserveSub.getAllCount());
            }
            else {
                indexReserveSub.setPercent(0);
            }
        });
        IndexHomeQuarantine indexHomeQuarantine=new IndexHomeQuarantine();
        indexHomeQuarantine.setCount(comActReserveMapper.indexHomeQuarantine(communityId));
        indexHomeQuarantine.setIndexReserveSubList(comActReserveMapper.IndexHomeQuarantineSub(communityId));
        indexHomeQuarantine.getIndexReserveSubList().forEach(indexReserveSub -> {
            if(indexReserveSub.getAllCount()!=0){
                indexReserveSub.setPercent(indexReserveSub.getNum()*100/indexReserveSub.getAllCount());
            }
            else {
                indexReserveSub.setPercent(0);
            }
        });
        indexReserve.setIndexBackReserve(indexBackReserve);
        indexReserve.setIndexHomeQuarantine(indexHomeQuarantine);
        indexInfo.setIndexReserve(indexReserve);

        BigscreenGridsGovernanceStatisticsVO bigscreenGridsGovernanceStatisticsVO=comActEasyPhotoDAO.selectBigscreenGridsGovern(communityId);
        indexInfo.setBigScreenGridStaticsReturn(setData(bigscreenGridsGovernanceStatisticsVO));


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/ResultEntity.java

New file
@@ -0,0 +1,12 @@
package com.panzhihua.service_community.util;

import lombok.Data;

/**
 * @author zzj
 */
@Data
public class ResultEntity {
    private Integer key;
    private Integer value;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxDataUtil.java

New file
@@ -0,0 +1,62 @@
package com.panzhihua.service_community.util;

import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.utlis.*;

import java.util.Date;

/**
 * 微信活跃用户工具类
 * @author zzj
 */
public class WxDataUtil {
    WxXCXTempSend wxXCXTempSend=new WxXCXTempSend();
    String accessToken;
    {
        try {
            accessToken = wxXCXTempSend.getAccessToken();
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

    public Integer getDayUser(){
       try {
           String dayUrl="https://api.weixin.qq.com/datacube/getweanalysisappiddailyretaininfo?access_token="+accessToken;
           WxRequestEntity wxRequestEntity=new WxRequestEntity();
           wxRequestEntity.setAccess_token(accessToken);
           String date=DateUtil.format(DateUtil.offsetDay(new Date(),-1),"yyyyMMdd");
           wxRequestEntity.setBegin_date(date);
           wxRequestEntity.setEnd_date(date);
           String result=HttpClientUtil.httpPost(dayUrl, JSONObject.toJSONString(wxRequestEntity));
           if(StringUtils.isNotEmpty(result)&result.contains("visit_uv")){
               JSONArray jsonArray=(JSONArray) JSONObject.parseObject(result).get("visit_uv");
               JSONObject jsonObject=(JSONObject)jsonArray.get(0);
               return  jsonObject.getInteger("value");
           }
       } catch (Exception e) {
           e.printStackTrace();
       }
       return null;
   }
   public Integer getMonthUser(){
       try {
           String dayUrl="https://api.weixin.qq.com/datacube/getweanalysisappidmonthlyvisittrend?access_token="+accessToken;
           WxRequestEntity wxRequestEntity=new WxRequestEntity();
           wxRequestEntity.setAccess_token(accessToken);
           wxRequestEntity.setBegin_date(DateUtil.format(DateUtil.offsetMonth(DateUtils.getFirstDayOfMonth(),-1),"yyyyMMdd"));
           wxRequestEntity.setEnd_date(DateUtil.format(DateUtil.offsetMonth(DateUtils.getLastDayOfMonth(),-1),"yyyyMMdd"));
           String result=HttpClientUtil.httpPost(dayUrl, JSONObject.toJSONString(wxRequestEntity));
           if(StringUtils.isNotEmpty(result)&result.contains("session_cnt")){
               JSONArray resultEntity= (JSONArray) JSONObject.parseObject(result).get("list");
               JSONObject resultObject= (JSONObject) resultEntity.get(0);
               return  resultObject.getInteger("session_cnt");
           }
       } catch (Exception e) {
           e.printStackTrace();
       }
       return null;
   }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxRequestEntity.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.util;

import lombok.Data;

/**
 * @author zzj
 */
@Data
public class WxRequestEntity {
    private String access_token;
    private String begin_date;
    private String end_date;
}

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

@@ -267,7 +267,6 @@
    <select id="getTitles" resultType="java.lang.String">
        SELECT discuss_subject FROM com_act_discuss WHERE community_id = #{communityId} AND `type` = #{type} AND is_del = 2 ORDER BY release_at DESC limit #{pageSize}
    </select>

    <select id="countByCommunityId" resultType="Map">
        SELECT
            COUNT( id ) AS totalNum,

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

@@ -318,4 +318,21 @@
        </where>
        order by create_at desc
    </select>

    <select id="biggestScreen" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve">
        select   (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' or t1.title like '%返攀%' or t1.title like '%来攀%' or t1.title like '%燃气%' or t1.title like '%防火%') and t1.community_id =#{communityId}) count,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' or t1.title like '%返攀%' or t1.title like '%来攀%' ) and t1.community_id =#{communityId}) epidemicCount,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%燃气%' ) and t1.community_id =#{communityId}) gasCount,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%防火%' ) and t1.community_id =#{communityId}) fireCount,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' ) and t1.community_id =#{communityId}) homeCount,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%返攀%' or t1.title like '%来攀%' ) and t1.community_id =#{communityId}) reserveCount
    </select>

    <select id="biggestScreenMonth" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth">
        select   (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' or t1.title like '%返攀%' or t1.title like '%来攀%' or t1.title like '%燃气%' or t1.title like '%防火%') and t1.community_id =#{communityId} and t.create_at >= DATE_FORMAT(  CONCAT(year(now()),'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(year(now()),'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at ) count,
                 (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%燃气%' ) and t1.community_id =#{communityId} and t.create_at >= DATE_FORMAT(  CONCAT(year(now()),'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(year(now()),'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at) gasCount,
                 (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%防火%' ) and t1.community_id =#{communityId} and t.create_at >= DATE_FORMAT(  CONCAT(year(now()),'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(year(now()),'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at) fireCount,
                 (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' ) and t1.community_id =#{communityId} and t.create_at >= DATE_FORMAT(  CONCAT(year(now()),'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(year(now()),'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at) homeCount,
                 (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%返攀%' or t1.title like '%来攀%' ) and t1.community_id =#{communityId} and t.create_at >= DATE_FORMAT(  CONCAT(year(now()),'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(year(now()),'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at) reserveCount
    </select>
</mapper>

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

@@ -639,6 +639,419 @@
        update com_mng_population set unit_no = #{newUnitNo} where village_id = #{villageId} and floor = #{floor} and unit_no = #{oldUnitNo}
    </update>

    <select id="selectCountByVillageId" resultType="Integer">
        select count(*) from com_mng_population t LEFT JOIN com_mng_population_community_tags t1 on t.id= t1.population_id
        where t.village_id=#{villageId} and t1.label like concat('%',#{label},'%')
    </select>

    <select id="getCivilParty" resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilPartyStatisticsVO">
        SELECT
            count( id ) as committeeNum,
            (select count(id) from com_pb_dyn where community_id = #{communityId} and `type` = 1) as dynNum,
            (select count(id) from com_pb_activity where community_id = #{communityId}) as activityNum,
            (select count(id) from com_act_micro_wish where community_id = #{communityId}) as wishNum,
            (select count(id) from com_pb_member where community_id = #{communityId} and audit_result = 1) as partyNum,
            (select count(id) from com_pb_org where community_id = #{communityId} and parent_id = 0) as organizationNum,
            (select count(id) from com_mng_volunteer_mng where community_id = #{communityId} and state = 2) as volunteerNum,
            (select count(id) from com_act_questnaire where community_id = #{communityId}) as questionnaireNum
        FROM
            com_pb_member_role
        WHERE
            community_id = #{communityId}
    </select>

    <select id="getCivilGovernment" resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilGovernmentStatisticsVO">
        SELECT
            count( id ) as noticeNum,
            (select count(id) from com_act_discuss where community_id = #{communityId} and is_del = 2) as discussNum,
            (select count(id) from com_act_easy_photo where community_id = #{communityId} and del_tag = 0) as easyNum,
            (select count(id) from com_act_neighbor_circle where community_id = #{communityId} and is_del = 2) as neighborNum,
            (select count(id) from com_act_activity where community_id = #{communityId}) as activityNum,
            (select count(id) from com_act_dyn where community_id = #{communityId}) as dynNum,
            (select count(id) from com_act_warehouse_donates where community_id = #{communityId}) as loveNum,
            (select count(id) from com_act_message where community_id = #{communityId}) as messageNum
        FROM
            com_act_announcement
        WHERE
            community_id = #{communityId}
    </select>

    <select id="getCivilGrid" resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilGridStatisticsVO">
        SELECT
            count( e.id ) AS tfTodayNum,
            (
            SELECT
                count( e1.id )
            FROM
                `event` AS e1
                LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id
            WHERE
                egd1.grid_community_id = #{communityId}
                AND e1.event_status = 2
                AND e1.event_type = 1
                AND e1.event_category = 1
                AND e1.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT( NOW(), '%Y-%m-%d 23:59:59' )) AS zaTodayNum,
            (
            SELECT
                count( e2.id )
            FROM
                `event` AS e2
                LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id
            WHERE
                egd2.grid_community_id = #{communityId}
                AND e2.event_status = 2
                AND e2.event_type = 2
                AND e2.event_category = 1
                AND e2.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT( NOW(), '%Y-%m-%d 23:59:59' )) AS msTodayNum,
            (
            SELECT
                count( e3.id )
            FROM
                `event` AS e3
                LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id
            WHERE
                egd3.grid_community_id = #{communityId}
                AND e3.event_status = 2
                AND e3.event_type = 3
                AND e3.event_category = 1
                AND e3.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT( NOW(), '%Y-%m-%d 23:59:59' )) AS mdTodayNum,
            (
            SELECT
                count( e4.id )
            FROM
                `event` AS e4
                LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id
            WHERE
                egd4.grid_community_id = #{communityId}
                AND e4.event_status = 2
                AND e4.event_type = 6
                AND e4.event_category = 1
                AND e4.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT( NOW(), '%Y-%m-%d 23:59:59' )) AS tsTodayNum,
            (
            SELECT
                count( e5.id )
            FROM
                `event` AS e5
                LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id
            WHERE
                egd5.grid_community_id = #{communityId}
                AND e5.event_status = 2
            ) AS eventNum,
            (
            SELECT
                count( user_id )
            FROM
                sys_user AS su
                INNER JOIN event_grid_member_relation egmr ON egmr.grid_member_id = su.user_id
            WHERE
                egmr.grid_community_id = #{communityId}
            ) AS xcNum,
            ( SELECT count( id ) FROM com_sw_patrol_record WHERE community_id = #{communityId} ) AS securityNum
        FROM
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE
            egd.grid_community_id = #{communityId}
            AND e.event_status = 2
            AND e.event_type = 5
            AND e.event_category = 1
            AND e.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT(
            NOW(),
            '%Y-%m-%d 23:59:59')
    </select>

    <select id="getCivilConvenience" resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilConvenienceStatisticsVO">
        SELECT
            count( id ) AS guideNum,
            (
            SELECT
                count( carr.id )
            FROM
                com_act_reserve_record AS carr
                LEFT JOIN com_act_reserve AS car ON car.id = carr.reserve_id
            WHERE
                car.title IN ( '返攀登记', '居家隔离', '11月24日之前居家隔离', '2021-11-4之前来攀登记' )
                AND carr.community_id = #{communityId}
            ) AS situationNum,
            ( SELECT count( id ) FROM renting_hourse_register WHERE community_id = #{communityId} ) AS leaseNum,
            (
            SELECT
                count( cpr.id )
            FROM
                com_property_repair AS cpr
                LEFT JOIN com_property AS cp ON cp.id = cpr.property_id
            WHERE
                cp.community_id = #{communityId}
            ) AS repairNum,
            ( SELECT count( id ) FROM com_pension_auth_records WHERE community_id = #{communityId} ) AS pensionNum,
            ( SELECT count( id ) FROM com_elder_auth_records WHERE community_id = #{communityId} ) AS eldersNum,
            (
            SELECT
                count( cmpct.id )
            FROM
                com_mng_population_community_tags AS cmpct
                INNER JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            WHERE
                cmpct.label LIKE '%低保户%'
                AND cmpct.community_id = #{communityId}
            ) AS subsistenceNum,
            (
            SELECT
                count( cmpct.id )
            FROM
                com_mng_population_community_tags AS cmpct
                INNER JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            WHERE
                cmpct.community_id = #{communityId}
                AND cmp.death = 0
                AND cmpct.label LIKE '%高龄老人%'
            ) AS allowanceNum
        FROM
            com_act_work_guide
    </select>


    <select id="westScreenStatics" resultType="com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics">
        select  ( SELECT    count(*) FROM    com_act_micro_wish AS camw  LEFT JOIN com_act t1 on camw.community_id = t1.community_id
                  where t1.area_code ='510423'  and    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 t LEFT JOIN com_act t1 on t.community_id = t1.community_id where parent_id = 0 and t1.area_code ='510423') partyOrg,
                (select count(id) from com_pb_member t LEFT JOIN com_act t1 on t.community_id = t1.community_id where audit_result = 1 and t1.area_code ='510423') partyMember,
                (select count(id) from com_mng_volunteer_mng t LEFT JOIN com_act t1 on t.community_id = t1.community_id where  t.state = 2 and t1.area_code ='510423')  volunteer,
                (select count(id) from com_sw_patrol_record t LEFT JOIN com_act t1 on t.community_id = t1.community_id where   t1.area_code ='510423') safety,
                (select count(*) from com_act_reserve t LEFT JOIN com_act_reserve_record t1 on t.id = t1.reserve_id LEFT JOIN com_act t2 on t.community_id = t2.community_id       where (title like '%居家隔离%' or title like  '%返攀登记%' or title like  '%来攀登记%') and t2.area_code ='510423' and t1.status = 2  )  reserve,
                (select (select count(*) from com_act_activity t LEFT JOIN com_act t1 on t.community_id = t1.community_id  where status !=6 and status !=1 and  t1.area_code ='510423')+(select count(id) from com_pb_activity t LEFT JOIN com_act t1 on t.community_id = t1.community_id  where status !=6 and status !=1 and  t1.area_code ='510423')) activity,
                (select count(*) from com_act_neighbor_circle t LEFT JOIN com_act t1 on t.community_id = t1.community_id
                where     is_del =2 and status=2 and t1.area_code ='510423') neighbor,
                (select count(*) from com_act_discuss t LEFT JOIN com_act t1 on t.community_id = t1.community_id
                where     is_del =2  and t1.area_code ='510423') discuss
        </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>
                and ca.area_code = '510423' and ca.is_screen_statistics = 1
                <if test="streetId != null and streetId != 0">
                    and cs.street_id = #{streetId}
                </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 '%低保户%' and ca1.area_code = '510423' and ca1.is_screen_statistics = 1
            <if test="streetId != null and streetId != 0">
                and cs1.street_id = #{streetId}
            </if>
            ) as dbTotal ,
            (
            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 '%特殊情况（重大病史/孕）%' and ca3.area_code = '510423' and ca3.is_screen_statistics = 1
        <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 '%特扶家庭%' and ca4.area_code = '510423' and ca4.is_screen_statistics = 1
        <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 '%退役军人%' and ca5.area_code = '510423' and ca5.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs5.street_id = #{streetId}
        </if>
            ) as tyTotal,
            (
            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 '%吸毒人员%' and ca7.area_code = '510423' and ca7.is_screen_statistics = 1
        <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 '%社区矫正%' and ca8.area_code = '510423' and ca8.is_screen_statistics = 1
        <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 '%邪教人员%' and ca9.area_code = '510423' and ca9.is_screen_statistics = 1
        <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 '%刑释人员%' and ca10.area_code = '510423' and ca10.is_screen_statistics = 1
        <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 '%上访人员%' and ca11.area_code = '510423' and ca11.is_screen_statistics = 1
        <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 '%精神障碍患者%' and ca12.area_code = '510423' and ca12.is_screen_statistics = 1
        <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 '%残疾人%' and ca.area_code = '510423' and ca.is_screen_statistics = 1
        <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>
            and ca.area_code = '510423' and ca.is_screen_statistics = 1
            <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>
            and ca.area_code = '510423' and ca.is_screen_statistics = 1
            <if test="streetId != null and streetId != 0">
                and cs.street_id = #{streetId}
            </if>
        </where>
            having age >= #{age}
        ) 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>

    <select id="baseInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BaseInfo">
        select count(id) as population,
               IFNULL((select count(id) from com_mng_population_house where community_id = cmpct.community_id),0) as house,

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

@@ -12,7 +12,7 @@
    </select>

    <select id="selectActivityTop" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityTop">
        select t.name,t.photo_path as url,t1.name as orgName,t2.integral_available_party as score from com_pb_member t LEFT JOIN com_pb_org t1 on t.org_id= t1.id LEFT JOIN com_act_integral_user t2 on t.user_id = t2.user_id where t.community_id =#{communityId} and t2.status = 1  order by integral_available_party desc limit 3
        select t.name,t.photo_path as url,t1.name as orgName,t2.integral_available_party as score from com_pb_member t LEFT JOIN com_pb_org t1 on t.org_id= t1.id LEFT JOIN com_act_integral_user t2 on t.user_id = t2.user_id where t.community_id =#{communityId} and t2.status = 1  order by integral_available_party desc limit 100
    </select>

    <select id="bigScreenServiceData" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceData">

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

@@ -62,22 +62,22 @@

    <select id="patrolRecordStatistics" resultType="com.panzhihua.common.model.vos.community.ComSwPatrolRecordStatisticsVO">
        select count(id) as patrolRecordTotal
             ,(select count(id) from com_sw_patrol_record where 1=1 <if test="communityId !=null and communityId !=0"> and  community_id = #{communityId} </if> and patrol_type LIKE concat('%','1','%')) as huoTotal
             ,(select count(id) from com_sw_patrol_record where 1=1 <if test="communityId !=null and communityId !=0"> and  community_id = #{communityId} </if> and patrol_type LIKE concat('%','2','%')) as xunTotal
             ,(select count(id) from com_sw_patrol_record where 1=1 <if test="communityId !=null and communityId !=0"> and  community_id = #{communityId} </if> and patrol_type LIKE concat('%','3','%')) as yiTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_safety_work_record t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if>) as safetyWorkTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if>) as dangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and status = '3') as handledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','1','%')) as huoDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','2','%')) as xunDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','3','%')) as yiDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','1','%') and status = '3' ) as huoHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','1','%') and status in ('1','2')) as huoHandlingDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','2','%') and status = '3' ) as xunHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','2','%') and status in ('1','2')) as xunHandlingDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','3','%') and status = '3' ) as yiHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','3','%') and status in ('1','2')) as yiHandlingDangerTotal
        from com_sw_patrol_record as cmp where 1=1 <if test="communityId !=null and communityId !=0"> and  community_id = #{communityId} </if>
             ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type LIKE concat('%','1','%')) as huoTotal
             ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type LIKE concat('%','2','%')) as xunTotal
             ,(select count(id) from com_sw_patrol_record where community_id = #{communityId} and patrol_type LIKE concat('%','3','%')) as yiTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_safety_work_record t2 on t1.report_id = t2.id where t.community_id = #{communityId}) as safetyWorkTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId}) as dangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and status = '3') as handledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','1','%')) as huoDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','2','%')) as xunDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','3','%')) as yiDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','1','%') and status = '3' ) as huoHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','1','%') and status in ('1','2')) as huoHandlingDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','2','%') and status = '3' ) as xunHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','2','%') and status in ('1','2')) as xunHandlingDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','3','%') and status = '3' ) as yiHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = #{communityId} and danger_type like CONCAT('%','3','%') and status in ('1','2')) as yiHandlingDangerTotal
        from com_sw_patrol_record as cmp where community_id = #{communityId}
    </select>

</mapper>

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

@@ -100,6 +100,15 @@
    }

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

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId

 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 com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -166,6 +167,12 @@

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

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

    List<EventGridIncidentStatisticsVO> getGridsGovernanceEventList(@Param("communityId") Long communityId);

    ScreenDrawEventPopulationTotalVO getVillagePopulationTotalNew(@Param("villageId") Long villageId);

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

@@ -362,6 +362,12 @@
    R gridMemberStatisticsAll(MemberStatisticsAdminDTO statisticsAdminDTO);

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

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
import org.springframework.beans.BeanUtils;
@@ -2835,4 +2836,15 @@
        statisticsVO.setDrawEventPopulationTotalVO(populationTotalVO);
        return R.ok(statisticsVO);
    }

    /**
     * 西区大数据分析平台-综合治理栏
     * @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

@@ -1353,8 +1353,8 @@
        SELECT
            count( id ) as populationTotal,
            (select count(id) from com_mng_population where village_id = #{villageId} and out_or_local = 1) as localTotal,
            (select count(id) from com_mng_population where village_id = #{villageId} and out_or_local = 2) as localTotal,
            (select count(id) from com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id where cmp.village_id = #{villageId} and cmpct.label is not null) as specialTotal,
            (select count(id) from com_mng_population where village_id = #{villageId} and out_or_local = 2) as outTotal,
            (select count(cmp.id) from com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id where cmp.village_id = #{villageId} and cmpct.label is not null) as specialTotal,
            (select count(id) from com_mng_building where village_id = #{villageId}) as buildTotal
        FROM
            com_mng_population AS cmp
@@ -1377,6 +1377,38 @@
              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>
    <select id="getGridsGovernanceEventList"
            resultType="com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO">
        SELECT event_type AS type, IFNULL( NULL, 1 ) AS eventType, e.id AS eventId, happent_lat_lng AS latLng, event_des AS content,

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java

@@ -31,8 +31,8 @@
    // "</script>")

    @Select("<script> " + "SELECT\n" + "d.id,\n" + "d.title, d.jump_url, d.jump_type,\n" + "COUNT( u.id ) readingVolume,\n" + "d.`status`,\n"
        + "d.publish_at,\n" + "d.content,\n" + "d.cover,\n" + "d.cover_mode,\n" + "d.dyn_type,\n" + "d.create_at \n"
        + "FROM\n" + "com_pb_dyn d\n" + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id \n"
        + "d.publish_at,\n" + "d.content,\n" + "d.cover,\n" + "d.cover_mode,\n" + "d.dyn_type,\n" + "d.create_at,t.name as communityName \n"
        + "FROM\n" + "com_pb_dyn d\n" + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id  left join com_act t on d.community_id = t.community_id\n"
        + "where d.type=#{partyBuildingComPbDynVO.type}  \n"
        + "<if test='partyBuildingComPbDynVO.communityId != null and partyBuildingComPbDynVO.communityId != 0'>"
        + "and d.community_id = #{partyBuildingComPbDynVO.communityId} \n" + " </if> "

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

@@ -271,6 +271,13 @@
                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");
                noLoginUrl.add("/api/communitybackstage/screen/getWestScreenStatics");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/governance");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/partydyn");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/pagedynamic");
                noLoginUrl.add("/api/communitybackstage/screen/get/community/password");
                if (noLoginUrl.contains(requestURI)) {
                    List<SimpleGrantedAuthority> authorities = new ArrayList<>();
                    authorities.add(new SimpleGrantedAuthority(SecurityConstants.ROLE_APPLETS));