1109修改

101captain

2021-11-09 e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d

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

@@ -1,16 +1,23 @@
package com.panzhihua.service_community.api;

import java.util.List;

import javax.annotation.Resource;

import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
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.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComExServicemanService;
import com.panzhihua.service_community.service.ComMngPopulationHouseService;
import com.panzhihua.service_community.service.ComMngPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@RestController
@@ -19,11 +26,16 @@

    @Resource
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComMngPopulationHouseService comMngPopulationHouseService;
    @Resource
    private ComExServicemanService comExServicemanService;

    /**
     * 获取人口数据信息
     *
     * @param populationListDTO 请求参数
     * @param populationListDTO
     *            请求参数
     * @return 人口数据
     */
    @PostMapping("/list/app")
@@ -34,8 +46,9 @@
    /**
     * 根据人口id获取人口详情
     *
     * @param populationId  人口id
     * @return  人口详情
     * @param populationId
     *            人口id
     * @return 人口详情
     */
    @GetMapping("/detail/app")
    public R getPopulationDetail(@RequestParam("populationId") Long populationId) {
@@ -54,8 +67,10 @@

    /**
     * 综治后台-居民列表
     * @param populationListDTO 请求参数
     * @return  居民列表
     * 
     * @param populationListDTO
     *            请求参数
     * @return 居民列表
     */
    @PostMapping("/grid/list")
    public R getGridPopulationAdminList(@RequestBody ComMngPopulationListDTO populationListDTO) {
@@ -64,8 +79,10 @@

    /**
     * 综治后台-删除居民
     * @param ids   居民id集合
     * @return  删除结果
     * 
     * @param ids
     *            居民id集合
     * @return 删除结果
     */
    @PostMapping("/grid/del")
    public R delGridPopulationAdmin(@RequestBody List<Long> ids) {
@@ -74,11 +91,13 @@

    /**
     * 综治后台-居民详情
     * @param populationId  居民id
     * @return  居民详情
     * 
     * @param populationId
     *            居民id
     * @return 居民详情
     */
    @GetMapping("/grid/get")
    public R getGridPopulationAdminDetail(@RequestParam("populationId")Long populationId) {
    public R getGridPopulationAdminDetail(@RequestParam("populationId") Long populationId) {
        return comMngPopulationService.getPopulationDetailApp(populationId);
    }

@@ -89,7 +108,8 @@

    /**
     * 综治后台-居民标签栏统计
     * @return  居民统计
     * 
     * @return 居民统计
     */
    @GetMapping("/grid/statistics")
    public R getGridPopulationStatistics(@RequestParam("communityId") Long communityId) {
@@ -97,14 +117,58 @@
    }

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

    /**
     * 综治后台-居民管理小区列表
     * 
     * @param name
     *            小区名字
     * @return 小区列表
     */
    @GetMapping("/village/relation")
    public R relationVillage(@RequestParam("name") String name) {
        return comMngPopulationService.relationVillage(name);
    }

    @PostMapping("/subordinate")
    public R subordinate(@RequestBody ComMngPopulationSubordinateDTO subordinateDTO) {
        return comMngPopulationHouseService.subordinate(subordinateDTO);
    }

    @PostMapping("/relation/house")
    public R populationRelationHouse(@RequestBody ComMngPopulationRelationHouseDTO relationHouseDTO) {
        return comMngPopulationHouseService.populationRelationHouse(relationHouseDTO);
    }

    /**
     * 分页查询退役军人列表
     *
     * @param comExServicemanDTO
     *            请求参数
     * @return 退役军人列表
     */
    @PostMapping("/page/exServiceman")
    public R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO) {
        return comExServicemanService.getPageExServiceman(comExServicemanDTO);
    }

    /**
     * 实有房屋数据修复定时任务
     * @return  实有房屋数据修复定时任务
     */
    @GetMapping("/house/status/task")
    public R timedTaskHouseJobHandler() {
        return comMngPopulationHouseService.timedTaskHouseJobHandler();
    }

}