修改bug

huanghongfa

2021-07-01 0455d60146f6a988904f8a8a07d8250b227c8a5c

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationExportDTO.java

New file
@@ -0,0 +1,49 @@
package com.panzhihua.common.model.dtos.grid.admin;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import java.util.List;

/**
 * 居民列表-请求参数
 *
 * @author lyq
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("居民列表-请求参数")
public class ComMngPopulationExportDTO {

    @ApiModelProperty(value = "走访状态（1待走访2已走访3待验证5已撤销）")
    private Integer eventStatus;

    @Length(max=100)
    @ApiModelProperty(value = "人员标签", hidden = false, example = "")
    private String label;

    @Max(127)
    @ApiModelProperty(value = "性别 1.男 2.女", hidden = false, example = "1")
    private Integer sex;

    @Max(10)
    @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
    private Integer politicalOutlook;

    @Max(2)
    @ApiModelProperty("关联实有房屋（1.是 2.否）")
    private Integer isHouse;

    @Length(max=100)
    @ApiModelProperty(value = "关键词", hidden = false, example = "")
    private String keyWord;

    @ApiModelProperty(value = "人口id集合")
    private List<Long> populationIds;

}

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

@@ -19,6 +19,7 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.shop.*;
@@ -3257,7 +3258,7 @@
    R getConf(@RequestParam("code") String code);

    /**
     * 根据社区id获取社区下人口数据信息
     * 获取人口数据信息
     *
     * @param populationListDTO 请求参数
     * @return 人口数据
@@ -3268,8 +3269,8 @@
    /**
     * 根据人口id获取人口详情
     *
     * @param populationId
     * @return
     * @param populationId  人口id
     * @return  人口详情
     */
    @GetMapping("/population/detail/app")
    R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
@@ -3404,4 +3405,12 @@
     */
    @GetMapping("/population/grid/statistics")
    R getGridPopulationStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 综治后台-居民导出
     * @param populationExportDTO   请求参数
     * @return  导出结果
     */
    @PostMapping("/population/grid/export")
    R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PopulationApi.java

@@ -1,6 +1,7 @@
package com.panzhihua.grid_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
@@ -52,4 +53,10 @@
    public R statistics(){
        return communityService.getGridPopulationStatistics(0L);
    }

    @ApiOperation(value = "居民导出@lyq",response = PopulationStatisticsVO.class)
    @GetMapping("/export")
    public R export(@RequestBody ComMngPopulationExportDTO populationExportDTO){
        return communityService.getGridPopulationExport(populationExportDTO);
    }
}

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

@@ -46,11 +46,23 @@
        return R.ok(comMngPopulationService.getScreenCivil(communityId));
    }

    /**
     * 获取社区网格
     *
     * @param communityId 社区id
     * @return 网格数据
     */
    @GetMapping("/getScreenGirds")
    public R grids(@RequestParam("communityId") Long communityId) {
        return R.ok(comMngPopulationService.getScreenGirds(communityId));
    }

    /**
     * 事件大屏查询事件详情
     *
     * @param eventDetailDTO 请求参数
     * @return 事件详情
     */
    @PostMapping("/getScreenEventDetail")
    public R eventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO) {
        return R.ok(comMngPopulationService.getScreenEventDetail(eventDetailDTO));

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

@@ -156,16 +156,31 @@
        return comMngPopulationHouseService.getGridVillageBuildingHouseDetail(houseId);
    }

    /**
     * 查询平台人口列表
     * @param populationDTO 请求参数
     * @return  人口列表
     */
    @PostMapping("/village/grid/building/house/population/list")
    public R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO) {
        return comMngPopulationService.getBuildingHousePopulationList(populationDTO);
    }

    /**
     * 批量向房屋新增人员
     * @param housePopulationDTO    请求参数
     * @return  添加结果
     */
    @PostMapping("/village/grid/building/house/add/population")
    public R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO) {
        return comMngPopulationHouseUserService.addBuildingHousePopulation(housePopulationDTO);
    }

    /**
     * 批量删除房屋内人员
     * @param housePopulationDTO    请求参数
     * @return  删除结果
     */
    @PostMapping("/village/grid/building/house/del/population")
    public R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO) {
        return comMngPopulationHouseUserService.delBuildingHousePopulation(housePopulationDTO);

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

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
@@ -19,16 +20,33 @@
    @Resource
    private ComMngPopulationService comMngPopulationService;

    /**
     * 获取人口数据信息
     *
     * @param populationListDTO 请求参数
     * @return 人口数据
     */
    @PostMapping("/list/app")
    public R pagePopulationList(@RequestBody PagePopulationListDTO populationListDTO) {
        return comMngPopulationService.pagePopulationListApp(populationListDTO);
    }

    /**
     * 根据人口id获取人口详情
     *
     * @param populationId  人口id
     * @return  人口详情
     */
    @GetMapping("/detail/app")
    public R getPopulationDetail(@RequestParam("populationId") Long populationId) {
        return comMngPopulationService.getPopulationDetailApp(populationId);
    }

    /**
     * 修复人口加密问题
     *
     * @return 修复结果
     */
    @GetMapping("/repair")
    public R repair() {
        return comMngPopulationService.getPopulationRepairByApp();
@@ -69,10 +87,24 @@
        return comMngPopulationService.binding();
    }

    /**
     * 综治后台-居民标签栏统计
     * @return  居民统计
     */
    @GetMapping("/grid/statistics")
    public R getGridPopulationStatistics(@RequestParam("communityId") Long communityId) {
        return comMngPopulationService.getGridPopulationStatistics(communityId);
    }

    /**
     * 综治后台-居民导出
     * @param populationExportDTO   请求参数
     * @return  导出结果
     */
    @PostMapping("/grid/export")
    public R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO) {
        return comMngPopulationService.getGridPopulationExport(populationExportDTO);
    }


}

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

@@ -13,8 +13,18 @@
 */
public interface ComMngPopulationHouseUserService extends IService<ComMngPopulationHouseUserDO> {

    /**
     * 批量向房屋新增人员
     * @param housePopulationDTO    请求参数
     * @return  添加结果
     */
    R addBuildingHousePopulation(AddComMngHousePopulationDTO housePopulationDTO);

    /**
     * 批量删除房屋内人员
     * @param housePopulationDTO    请求参数
     * @return  删除结果
     */
    R delBuildingHousePopulation(DelComMngHousePopulationDTO housePopulationDTO);

}

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

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
@@ -208,23 +209,78 @@
     */
    R screenStatistic(Long communityId);

    /**
     * 获取社区网格
     *
     * @param communityId 社区id
     * @return 网格数据
     */
    R getScreenGirds(Long communityId);

    /**
     * 事件大屏查询事件详情
     *
     * @param eventDetailDTO 请求参数
     * @return 事件详情
     */
    R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);

    /**
     * 获取人口数据信息
     *
     * @param populationListDTO 请求参数
     * @return 人口数据
     */
    R pagePopulationListApp(PagePopulationListDTO populationListDTO);

    /**
     * 根据人口id获取人口详情
     *
     * @param populationId  人口id
     * @return  人口详情
     */
    R getPopulationDetailApp(Long populationId);

    /**
     * 修复人口加密问题
     *
     * @return 修复结果
     */
    R getPopulationRepairByApp();

    /**
     * 综治后台-居民列表
     * @param populationListDTO 请求参数
     * @return  居民列表
     */
    R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO);

    /**
     * 综治后台-删除居民
     * @param ids   居民id集合
     * @return  删除结果
     */
    R delGridPopulationAdmin(List<Long> ids);

    /**
     * 查询平台人口列表
     * @param populationDTO 请求参数
     * @return  人口列表
     */
    R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO);

    R binding();

    /**
     * 综治后台-居民标签栏统计
     * @return  居民统计
     */
    R getGridPopulationStatistics(Long communityId);

    /**
     * 综治后台-居民导出
     * @param populationExportDTO   请求参数
     * @return  导出结果
     */
    R getGridPopulationExport(ComMngPopulationExportDTO populationExportDTO);
}

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

@@ -26,6 +26,11 @@
@Service
public class ComMngPopulationHouseUserServiceImpl extends ServiceImpl<ComMngPopulationHouseUserDAO, ComMngPopulationHouseUserDO> implements ComMngPopulationHouseUserService {

    /**
     * 批量向房屋新增人员
     * @param housePopulationDTO    请求参数
     * @return  添加结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addBuildingHousePopulation(AddComMngHousePopulationDTO housePopulationDTO){
@@ -61,6 +66,11 @@
        return R.ok();
    }

    /**
     * 批量删除房屋内人员
     * @param housePopulationDTO    请求参数
     * @return  删除结果
     */
    @Override
    public R delBuildingHousePopulation(DelComMngHousePopulationDTO housePopulationDTO){


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

@@ -19,6 +19,7 @@
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.helper.AESUtil;
@@ -1388,11 +1389,23 @@
        comActPopulationScreenVO.setAgeGroup(ageList);
    }

    /**
     * 获取社区网格
     *
     * @param communityId 社区id
     * @return 网格数据
     */
    @Override
    public R getScreenGirds(Long communityId) {
        return R.ok(this.baseMapper.getEventScreenGridData(communityId));
    }

    /**
     * 事件大屏查询事件详情
     *
     * @param eventDetailDTO 请求参数
     * @return 事件详情
     */
    @Override
    public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO) {
        EventNewStatisticsVO statisticsVO = new EventNewStatisticsVO();
@@ -1475,6 +1488,12 @@
        return R.ok(statisticsVO);
    }

    /**
     * 获取人口数据信息
     *
     * @param populationListDTO 请求参数
     * @return 人口数据
     */
    @Override
    public R pagePopulationListApp(PagePopulationListDTO populationListDTO){
        IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
@@ -1486,6 +1505,12 @@
        return R.ok(pagePopulationList);
    }

    /**
     * 根据人口id获取人口详情
     *
     * @param populationId  人口id
     * @return  人口详情
     */
    @Override
    public R getPopulationDetailApp(Long populationId){
        PopulationDetailVO detail = this.baseMapper.getPopulationDetailApp(populationId);
@@ -1501,6 +1526,11 @@
        return R.ok(detail);
    }

    /**
     * 修复人口加密问题
     *
     * @return 修复结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R getPopulationRepairByApp(){
@@ -1518,6 +1548,11 @@
        return R.ok();
    }

    /**
     * 综治后台-居民列表
     * @param populationListDTO 请求参数
     * @return  居民列表
     */
    @Override
    public R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO){
        IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
@@ -1541,6 +1576,11 @@
        return R.ok(populationListIPage);
    }

    /**
     * 综治后台-删除居民
     * @param ids   居民id集合
     * @return  删除结果
     */
    @Override
    public R delGridPopulationAdmin(List<Long> ids){
        Integer count = this.baseMapper.getPopulationVisitingCount(ids);
@@ -1575,6 +1615,11 @@
        return R.ok();
    }

    /**
     * 查询平台人口列表
     * @param populationDTO 请求参数
     * @return  人口列表
     */
    @Override
    public R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO){

@@ -1592,9 +1637,24 @@
        return R.ok(populationVOIPage);
    }

    /**
     * 综治后台-居民标签栏统计
     * @return  居民统计
     */
    @Override
    public R getGridPopulationStatistics(Long communityId){
        return R.ok(this.baseMapper.getGridPopulationStatistics(communityId));
    }

    /**
     * 综治后台-居民导出
     * @param populationExportDTO   请求参数
     * @return  导出结果
     */
    @Override
    public R getGridPopulationExport(ComMngPopulationExportDTO populationExportDTO){

        return R.ok();
    }

}

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

@@ -236,6 +236,12 @@
            if(jsonObject != null && jsonObject.get("check") != null){
                eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
            }

            //查询资源文件
            eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1));
            eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2));
            eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3));

            return R.ok(eventVisitingTasksDetailsVO);
        }
        return R.fail();