From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 121 +++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index e134633..267b642 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -4,10 +4,13 @@
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.service.*;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -36,6 +39,10 @@
private ComMngProvinceService comMngProvinceService;
@Resource
private ComMngPopulationService comMngPopulationService;
+ @Resource
+ private ComMngPopulationHouseService comMngPopulationHouseService;
+ @Resource
+ private ComMngVillageService comMngVillageService;
/**
@@ -74,7 +81,7 @@
* @return
*/
@PostMapping("/car/save")
- public R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
+ public R saveComMngCar(@Validated({AddGroup.class}) @RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
return comMngCarService.saveComMngCar(comMngCarSaveDTO);
}
@@ -272,7 +279,7 @@
*/
@PostMapping("/population/import")
@Transactional(rollbackFor = Exception.class)
- public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId) throws Exception{
return comMngPopulationService.listSavePopulation(list,communityId);
}
@@ -324,7 +331,6 @@
* @param Ids 删除id集合
* @return 删除结果
*/
- @ApiOperation(value = "批量删除实有人口")
@PostMapping("/population/delete")
public R deletePopulations(@RequestBody List<Long> Ids) {
return comMngPopulationService.deletePopulations(Ids);
@@ -335,7 +341,6 @@
* @param communityId 社区id
* @return 查询结果
*/
- @ApiOperation(value = "根据社区id查询所有实有人口")
@PostMapping("/population/getAll")
public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
return comMngPopulationService.getPopulationListByCommunityId(communityId);
@@ -346,7 +351,6 @@
* @param Ids 实有人口id集合
* @return 查询结果
*/
- @ApiOperation(value = "批量删除实有人口")
@PostMapping("/population/getList")
public R getPopulationLists(@RequestBody List<Long> Ids) {
return comMngPopulationService.getPopulationLists(Ids);
@@ -354,12 +358,12 @@
/**
* 编辑实有人口
- * @param editComMngPopulationVO
+ * @param populationEditDTO
* @return
*/
@PostMapping("/population/edit")
- R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){
- return comMngPopulationService.editPopulation(editComMngPopulationVO, communityId);
+ R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,@RequestParam("communityId") Long communityId) throws Exception{
+ return comMngPopulationService.editPopulation(populationEditDTO, communityId);
}
/**
@@ -381,4 +385,105 @@
public R deleteSpecialInputUser(@RequestParam(value = "id") Long id){
return comMngPopulationService.deleteSpecialInputUser(id);
}
+
+ /**
+ * 编辑实有人口_电子档案
+ * @param userElectronicFileVO
+ * @return
+ */
+ @PostMapping("/population/edit/electronicArchives")
+ R editPopulation(@RequestBody UserElectronicFileVO userElectronicFileVO){
+ return comMngPopulationService.editUserElectronicFile(userElectronicFileVO);
+ }
+
+ /**
+ * 实有人口统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/population/statistics")
+ public R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId) {
+ return comMngPopulationService.getPopulationTotalByAdmin(communityId);
+ }
+
+ /**
+ * 查询房屋级联菜单
+ * @param cascadeHouseDTO 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/population/cascade/list")
+ public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO){
+ return comMngPopulationHouseService.getCascadeHouseAddress(cascadeHouseDTO);
+ }
+
+ /**
+ * 分页查询房屋列表
+ * @param populationHouseAdminDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/population/page/house")
+ public R getPageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO){
+ return comMngPopulationHouseService.getPageHouse(populationHouseAdminDTO);
+ }
+
+ /**
+ * 根据id查询实有房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/population/house/detail")
+ public R getHouseDetail(@RequestParam(value = "houseId") Long houseId) {
+ return comMngPopulationHouseService.getHouseDetail(houseId);
+ }
+
+ /**
+ * 编辑实有房屋信息
+ * @param houseEditAdminDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/population/house/edit")
+ public R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO) {
+ return comMngPopulationHouseService.editHouse(houseEditAdminDTO);
+ }
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ * @param Ids 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/population/house/delete")
+ public R deleteHouses(@RequestBody List<Long> Ids){
+ return comMngPopulationHouseService.deleteHouses(Ids);
+ }
+
+ /**
+ * 实有房屋统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/population/house/statistics")
+ public R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId) {
+ return comMngPopulationHouseService.getHouseTotalByAdmin(communityId);
+ }
+
+ /**
+ * 根据社区id查询社区所有省市区
+ * @param communityId 社区id
+ * @return 社区所在省市区
+ */
+ @PostMapping("/village/getRegion")
+ public R getRegion(@RequestParam("communityId") Long communityId) {
+ return comMngPopulationHouseService.getRegion(communityId);
+ }
+
+ /**
+ * 统计社区内小区数量
+ * @param communityId 社区id
+ * @return 统计小区数量
+ */
+ @PostMapping("/village/statistics")
+ public R villageStatistics(@RequestParam("communityId") Long communityId) {
+ return comMngVillageService.villageStatistics(communityId);
+ }
+
}
--
Gitblit v1.7.1