From e05a23efb37cb1aa5f6a8187ab1f45bc8d3dc426 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 七月 2021 18:21:51 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
index 4050c0a..a19ae79 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -3,6 +3,9 @@
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
@@ -66,6 +69,18 @@
@PostMapping("listvillage")
public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) {
R r = comMngVillageService.listComActVillage(comMngVillageVO);
+ return R.ok(r);
+ }
+
+ /**
+ * 根据房屋id查询实有房屋
+ *
+ * @param villageId 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("getVillageById")
+ public R getVillageById(@RequestParam(value = "villageId")Long villageId){
+ R r = comMngVillageService.getVillageById(villageId);
return R.ok(r);
}
@@ -156,20 +171,60 @@
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);
}
+ @PostMapping("/village/admin/del")
+ public R delGridVillage(@RequestBody List<Long> villageIds) {
+ return comMngVillageService.delGridVillage(villageIds);
+ }
+
+ @PostMapping("/village/admin/population/list")
+ public R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO) {
+ return comMngPopulationService.getVillagePopulationAdmin(villagePopulationDTO);
+ }
+
+ @PostMapping("/village/admin/population/house/list")
+ public R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO) {
+ return comMngPopulationHouseUserService.getVillagePopulationHouseAdmin(villagePopulationHouseDTO);
+ }
+
+ @GetMapping("/village/admin/statistics")
+ public R getGridVillageStatistics() {
+ return comMngVillageService.getGridVillageStatistics();
+ }
+
+ @PostMapping("/village/admin/export")
+ public R getGridPopulationAdminListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO) {
+ return comMngVillageService.getGridVillageListExport(villageListAppDTO);
+ }
+
}
--
Gitblit v1.7.1