From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 365 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 346 insertions(+), 19 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 2b01bd2..2d43789 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
@@ -1,11 +1,16 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.dtos.community.*;
+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.service.user.UserService;
+import com.panzhihua.common.model.vos.user.ComMngTagVO;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.service.*;
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;
@@ -34,10 +39,15 @@
private ComMngProvinceService comMngProvinceService;
@Resource
private ComMngPopulationService comMngPopulationService;
+ @Resource
+ private ComMngPopulationHouseService comMngPopulationHouseService;
+ @Resource
+ private ComMngVillageService comMngVillageService;
/**
* 小程序用户车辆登记
+ *
* @param comCvtBusinessDTO
* @return
*/
@@ -48,6 +58,7 @@
/**
* 小程序用户车辆列表
+ *
* @param userId
* @return
*/
@@ -58,6 +69,7 @@
/**
* 社区后台车辆管理列表
+ *
* @param pageComMngCarDTO
* @return
*/
@@ -68,16 +80,18 @@
/**
* 社区后台添加修改车辆
+ *
* @param comMngCarSaveDTO
* @return
*/
@PostMapping("/car/save")
- public R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
+ public R saveComMngCar(@Validated({AddGroup.class}) @RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
return comMngCarService.saveComMngCar(comMngCarSaveDTO);
}
/**
* 社区后台删除车辆
+ *
* @param id
* @return
*/
@@ -85,19 +99,33 @@
public R deleteComMngCar(@RequestParam(value = "id") Long id) {
return comMngCarService.deleteComMngCar(id);
}
+
/**
* 社区后台导入车辆
- * @param list 车辆列表
+ *
+ * @param list 车辆列表
* @param communityId 社区编号
* @return
*/
@PostMapping("/car/import")
- public R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId){
- return comMngCarService.listSaveMngCarExcelVO(list,communityId);
+ public R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId) {
+ return comMngCarService.listSaveMngCarExcelVO(list, communityId);
+ }
+
+ /**
+ * 车辆导出
+ *
+ * @param exportComMngCarExcelDTO
+ * @return
+ */
+ @PostMapping("/car/export")
+ public R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO){
+ return comMngCarService.exportRealCar(exportComMngCarExcelDTO);
}
/**
* 社区后台实有单位管理列表
+ *
* @param pageComMngRealCompanyDTO
* @return
*/
@@ -107,7 +135,19 @@
}
/**
+ * 社区后台实有单位统计
+ *
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/company/statistics")
+ public R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId){
+ return comMngRealCompanyService.getComMngRealCompanyTotalByAdmin(communityId);
+ }
+
+ /**
* 社区后台添加修改实有单位
+ *
* @param comMngRealCompanyVO
* @return
*/
@@ -118,6 +158,7 @@
/**
* 社区后台删除实有单位
+ *
* @param id
* @return
*/
@@ -131,30 +172,38 @@
return comMngRealCompanyService.detailComMngRealCompany(id);
}
+ @PostMapping("/company/belongs")
+ public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
+ return comMngRealCompanyService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO);
+ }
+
/**
* 社区后台导入实有单位
- * @param list 车实有单位列表
+ *
+ * @param list 车实有单位列表
* @param communityId 社区编号
* @return
*/
@PostMapping("/company/import")
- public R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list, @RequestParam("communityId") Long communityId){
- return comMngRealCompanyService.listSaveMngRealCompanyExcelVO(list,communityId);
+ public R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list, @RequestParam("communityId") Long communityId) {
+ return comMngRealCompanyService.listSaveMngRealCompanyExcelVO(list, communityId);
}
/**
* 导出实有单位
+ *
* @param exportRealCompanyExcelDTO 实有单位导出查询参数
* @return
*/
@PostMapping("/company/export")
- public R exportRealCompanyExcel(@RequestBody ExportRealCompanyExcelDTO exportRealCompanyExcelDTO ){
+ public R exportRealCompanyExcel(@RequestBody ExportRealCompanyExcelDTO exportRealCompanyExcelDTO) {
return comMngRealCompanyService.exportRealCompanyExcel(exportRealCompanyExcelDTO);
}
/**
* 社区后台实有资产管理列表
+ *
* @param pageComMngRealAssetsDTO
* @return
*/
@@ -165,6 +214,7 @@
/**
* 社区后台添加修改实有资产
+ *
* @param comMngRealAssetsVO
* @return
*/
@@ -175,6 +225,7 @@
/**
* 社区后台删除实有资产
+ *
* @param id
* @return
*/
@@ -190,27 +241,30 @@
/**
* 社区后台导入实有资产
- * @param list 车实有资产列表
+ *
+ * @param list 车实有资产列表
* @param communityId 社区编号
* @return
*/
@PostMapping("/assets/import")
- public R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list, @RequestParam("communityId") Long communityId){
- return comMngRealAssetsService.listSaveMngRealAssetsExcelVO(list,communityId);
+ public R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list, @RequestParam("communityId") Long communityId) {
+ return comMngRealAssetsService.listSaveMngRealAssetsExcelVO(list, communityId);
}
/**
* 导出实有资产
+ *
* @param exportRealAssetsExcelDTO 实有资产导出查询参数
* @return
*/
@PostMapping("/assets/export")
- public R exportRealAssetsExcel(@RequestBody ExportRealAssetsExcelDTO exportRealAssetsExcelDTO ){
+ public R exportRealAssetsExcel(@RequestBody ExportRealAssetsExcelDTO exportRealAssetsExcelDTO) {
return comMngRealAssetsService.exportRealAssetsExcel(exportRealAssetsExcelDTO);
}
/**
* 查询所有省份
+ *
* @return
*/
@GetMapping("/province")
@@ -220,38 +274,42 @@
/**
* 查询省份下所有的城市
+ *
* @param provinceAdcode
* @return
*/
@GetMapping("/city")
- public R getCityByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){
+ public R getCityByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
return comMngProvinceService.getCityByProvinceCode(provinceAdcode);
}
/**
* 查询城市下所有的区县
+ *
* @param cityAdcode
* @return
*/
@GetMapping("/district")
- R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode){
+ R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode) {
return comMngProvinceService.getDistrictByCityCode(cityAdcode);
}
/**
* 查询特定省下所有区域 tree结构
+ *
* @param provinceAdcode
* @return
*/
@GetMapping("/area/all")
- R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){
+ R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode);
}
/**
* 社区后台实有人口管理列表
+ *
* @param comMngPopulationVO 查询参数
- * @return 实有人口分页查询结果
+ * @return 实有人口分页查询结果
*/
@PostMapping("/population/page")
public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
@@ -259,9 +317,36 @@
}
/**
+ * 社区后台导入实有人口
+ *
+ * @param list 数据
+ * @param communityId 社区编号
+ * @return
+ */
+ @PostMapping("/population/import")
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId) throws Exception {
+ return comMngPopulationService.listSavePopulation(list, communityId);
+ }
+
+ /**
+ * 确认导入实有人口（有则更新，无则新建）
+ *
+ * @param list 用户信息
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/population/import/confirm")
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId) {
+ return comMngPopulationService.listSavePopulationConfirm(list, communityId);
+ }
+
+ /**
* 根据实有人口id查询详情
+ *
* @param populationId 实有人口id
- * @return 实有人口详情查询结果
+ * @return 实有人口详情查询结果
*/
@PostMapping("/population/detail")
public R detailPopulation(@RequestParam(value = "populationId") Long populationId) {
@@ -269,12 +354,254 @@
}
/**
+ * 查询实有人口电子档信息
+ *
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @PostMapping("/population/electronicArchives")
+ public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) {
+ return comMngPopulationService.electronicArchivesPopulation(populationId);
+ }
+
+
+ /**
* 根据实有人口id修改标签列表
+ *
* @param populationTagDTO 请求参数
- * @return 修改结果
+ * @return 修改结果
*/
@PostMapping("/population/editTag")
public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) {
return comMngPopulationService.editTagPopulation(populationTagDTO);
}
+
+ /**
+ * 根据实有人口身份证修改标签列表
+ *
+ * @param comMngPopulationTagCardNoDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/cardNo/population/editTag")
+ public R editTagPopulationByCardNo(@RequestBody ComMngPopulationTagCardNoDTO comMngPopulationTagCardNoDTO) {
+ return comMngPopulationService.editTagPopulationByCardNo(comMngPopulationTagCardNoDTO);
+ }
+
+ /**
+ * 批量删除实有人口
+ *
+ * @param Ids 删除id集合
+ * @return 删除结果
+ */
+ @PostMapping("/population/delete")
+ public R deletePopulations(@RequestBody List<Long> Ids) {
+ return comMngPopulationService.deletePopulations(Ids);
+ }
+
+ /**
+ * 根据社区id查询所有实有人口
+ *
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/population/getAll")
+ public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
+ return comMngPopulationService.getPopulationListByCommunityId(communityId);
+ }
+
+ /**
+ * 根据id集合查询实有人口
+ *
+ * @param Ids 实有人口id集合
+ * @return 查询结果
+ */
+ @PostMapping("/population/getList")
+ public R getPopulationLists(@RequestBody List<Long> Ids) {
+ return comMngPopulationService.getPopulationLists(Ids);
+ }
+
+ /**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId 小区id
+ * @return 查询结果
+ */
+ @PostMapping("/population/getListByVillageId")
+ R getPopulationListByVillageId(@RequestParam(value = "villageId") Long villageId){
+ return comMngPopulationService.getPopulationListByVillageId(villageId);
+ }
+
+ /**
+ * 编辑实有人口
+ *
+ * @param populationEditDTO
+ * @return
+ */
+ @PostMapping("/population/edit")
+ R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO, @RequestParam("communityId") Long communityId) throws Exception {
+ return comMngPopulationService.editPopulation(populationEditDTO, communityId);
+ }
+
+ /**
+ * 分页查询特殊群体
+ *
+ * @param pageInputUserDTO 请求参数
+ * @return 特殊群体列表
+ */
+ @PostMapping("/special/page")
+ public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
+ return comMngPopulationService.specialInputUser(pageInputUserDTO);
+ }
+
+ /**
+ * 删除特殊群体人员
+ *
+ * @param id 特殊群体id
+ * @return 删除结果
+ */
+ @PostMapping("/special/delete")
+ public R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
+ return comMngPopulationService.deleteSpecialInputUser(id);
+ }
+
+ /**
+ * 基础数据》特殊群体》分页查询标签列表
+ * @param comMngUserTagDTO
+ * @return
+ */
+ @PostMapping("/special/tags/page")
+ public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO){
+ return comMngPopulationService.specialInputUserTags(comMngUserTagDTO);
+ }
+
+ /**
+ * 新增或修改特殊群体标签
+ * @param comMngTagVO
+ * @return
+ */
+ @PostMapping("/special/tags/save")
+ public R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO){
+ return comMngPopulationService.saveSpecialInputUserTags(comMngTagVO);
+ }
+
+ /**
+ * 删除特殊群体标签
+ * @param id
+ * @return
+ */
+ @PostMapping("/special/tags/delete")
+ public R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id){
+ return comMngPopulationService.deleteSpecialInputUserTags(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