From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 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 19aa975..32ea945 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,9 +3,13 @@
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;
+import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngPopulationHouseService;
import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
import com.panzhihua.service_community.service.ComMngPopulationService;
@@ -67,6 +71,21 @@
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){
+ ComMngVillageDO comMngVillageDO = comMngVillageService.getVillageById(villageId);
+ if (comMngVillageDO != null) {
+ return R.ok(comMngVillageDO);
+ }
+ return R.fail();
}
/**
@@ -186,5 +205,30 @@
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