Merge remote-tracking branch 'origin/test' into test

manailin

2021-06-30 cf2e6ce54f82c61606a01f816f7cac8b3a967809

 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.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngPopulationService;
@@ -8,6 +9,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

@Slf4j
@RestController
@@ -32,6 +34,25 @@
        return comMngPopulationService.getPopulationRepairByApp();
    }

    /**
     * 综治后台-居民列表
     * @param populationListDTO 请求参数
     * @return  居民列表
     */
    @PostMapping("/grid/list")
    public R getGridPopulationAdminList(@RequestBody ComMngPopulationListDTO populationListDTO) {
        return comMngPopulationService.getGridPopulationAdminList(populationListDTO);
    }

    @PostMapping("/grid/del")
    public R delGridPopulationAdmin(@RequestBody List<Long> ids) {
        return comMngPopulationService.delGridPopulationAdmin(ids);
    }

    @GetMapping("/grid/get")
    public R getGridPopulationAdminDetail(@RequestParam("populationId")Long populationId) {
        return comMngPopulationService.getPopulationDetailApp(populationId);
    }


}