From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 313 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 233 insertions(+), 80 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 52e1c71..b757dc5 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,5 +1,13 @@
package com.panzhihua.service_community.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
@@ -8,13 +16,8 @@
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;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
/**
* @description: 社区管理/基础数据
@@ -43,7 +46,6 @@
private ComMngPopulationHouseService comMngPopulationHouseService;
@Resource
private ComMngVillageService comMngVillageService;
-
/**
* 小程序用户车辆登记
@@ -103,12 +105,15 @@
/**
* 社区后台导入车辆
*
- * @param list 车辆列表
- * @param communityId 社区编号
+ * @param list
+ * 车辆列表
+ * @param communityId
+ * 社区编号
* @return
*/
@PostMapping("/car/import")
- public R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId) {
+ public R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list,
+ @RequestParam("communityId") Long communityId) {
return comMngCarService.listSaveMngCarExcelVO(list, communityId);
}
@@ -119,7 +124,7 @@
* @return
*/
@PostMapping("/car/export")
- public R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO){
+ public R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO) {
return comMngCarService.exportRealCar(exportComMngCarExcelDTO);
}
@@ -137,11 +142,12 @@
/**
* 社区后台实有单位统计
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 统计结果
*/
@PostMapping("/company/statistics")
- public R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId){
+ public R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId) {
return comMngRealCompanyService.getComMngRealCompanyTotalByAdmin(communityId);
}
@@ -180,26 +186,29 @@
/**
* 社区后台导入实有单位
*
- * @param list 车实有单位列表
- * @param communityId 社区编号
+ * @param list
+ * 车实有单位列表
+ * @param communityId
+ * 社区编号
* @return
*/
@PostMapping("/company/import")
- public R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list, @RequestParam("communityId") Long communityId) {
+ public R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
+ @RequestParam("communityId") Long communityId) {
return comMngRealCompanyService.listSaveMngRealCompanyExcelVO(list, communityId);
}
/**
* 导出实有单位
*
- * @param exportRealCompanyExcelDTO 实有单位导出查询参数
+ * @param exportRealCompanyExcelDTO
+ * 实有单位导出查询参数
* @return
*/
@PostMapping("/company/export")
public R exportRealCompanyExcel(@RequestBody ExportRealCompanyExcelDTO exportRealCompanyExcelDTO) {
return comMngRealCompanyService.exportRealCompanyExcel(exportRealCompanyExcelDTO);
}
-
/**
* 社区后台实有资产管理列表
@@ -242,19 +251,23 @@
/**
* 社区后台导入实有资产
*
- * @param list 车实有资产列表
- * @param communityId 社区编号
+ * @param list
+ * 车实有资产列表
+ * @param communityId
+ * 社区编号
* @return
*/
@PostMapping("/assets/import")
- public R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list, @RequestParam("communityId") Long communityId) {
+ public R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
+ @RequestParam("communityId") Long communityId) {
return comMngRealAssetsService.listSaveMngRealAssetsExcelVO(list, communityId);
}
/**
* 导出实有资产
*
- * @param exportRealAssetsExcelDTO 实有资产导出查询参数
+ * @param exportRealAssetsExcelDTO
+ * 实有资产导出查询参数
* @return
*/
@PostMapping("/assets/export")
@@ -308,7 +321,8 @@
/**
* 社区后台实有人口管理列表
*
- * @param comMngPopulationVO 查询参数
+ * @param comMngPopulationVO
+ * 查询参数
* @return 实有人口分页查询结果
*/
@PostMapping("/population/page")
@@ -319,111 +333,230 @@
/**
* 社区后台导入实有人口
*
- * @param list 数据
- * @param communityId 社区编号
+ * @param list
+ * 数据
+ * @param communityId
+ * 社区编号
* @return
*/
@PostMapping("/population/import")
@Transactional(rollbackFor = Exception.class)
- public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
- return comMngPopulationService.listSavePopulation(list, communityId);
+ public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSavePopulation(list, communityId, userId);
}
/**
* 批量导入吸毒人员
*
- * @param list 吸毒人员数据
- * @param communityId 社区id
+ * @param list
+ * 吸毒人员数据
+ * @param communityId
+ * 社区id
* @return 导入结果
*/
@PostMapping("population/importDrug")
@Transactional(rollbackFor = Exception.class)
- public R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId){
- return comMngPopulationService.listSaveDrugPopulation(list, communityId);
+ public R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveDrugPopulation(list, communityId, userId);
}
/**
* 批量导入社区矫正人员
*
- * @param list 社区矫正人员数据
- * @param communityId 社区id
+ * @param list
+ * 社区矫正人员数据
+ * @param communityId
+ * 社区id
* @return 导入结果
*/
@PostMapping("population/importCorrect")
@Transactional(rollbackFor = Exception.class)
- public R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId){
- return comMngPopulationService.listSaveCorrectPopulation(list, communityId);
+ public R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveCorrectPopulation(list, communityId, userId);
}
/**
* 批量导入重精人员
*
- * @param list 重精人员数据
- * @param communityId 社区id
+ * @param list
+ * 重精人员数据
+ * @param communityId
+ * 社区id
* @return 导入结果
*/
@Transactional(rollbackFor = Exception.class)
@PostMapping("population/importMajor")
- public R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId){
- return comMngPopulationService.listSaveMajorPopulation(list, communityId);
+ public R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveMajorPopulation(list, communityId, userId);
}
/**
* 批量导入邪教人员
*
- * @param list 邪教人员数据
- * @param communityId 社区id
+ * @param list
+ * 邪教人员数据
+ * @param communityId
+ * 社区id
* @return 导入结果
*/
@PostMapping("population/importCult")
@Transactional(rollbackFor = Exception.class)
- public R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId){
- return comMngPopulationService.listSaveCultPopulation(list, communityId);
+ public R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveCultPopulation(list, communityId, userId);
}
/**
* 批量导入刑释人员
*
- * @param list 刑释人员数据
- * @param communityId 社区id
+ * @param list
+ * 刑释人员数据
+ * @param communityId
+ * 社区id
* @return 导入结果
*/
@PostMapping("population/importRehabilitation")
@Transactional(rollbackFor = Exception.class)
- public R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId){
- return comMngPopulationService.listSaveRehabilitationPopulation(list, communityId);
+ public R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveRehabilitationPopulation(list, communityId, userId);
}
/**
* 批量导入重点上访人员
*
- * @param list 重点上访人员数据
- * @param communityId 社区id
+ * @param list
+ * 重点上访人员数据
+ * @param communityId
+ * 社区id
* @return 导入结果
*/
@Transactional(rollbackFor = Exception.class)
@PostMapping("population/importKey")
- public R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId){
- return comMngPopulationService.listSaveKeyPopulation(list, communityId);
+ public R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveKeyPopulation(list, communityId, userId);
+ }
+
+ /**
+ * 批量导入服刑人员
+ *
+ * @param list
+ * 服刑人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importSentence")
+ public R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveSentencePopulation(list, communityId, userId);
+ }
+
+ /**
+ * 批量导入退役军人
+ *
+ * @param list
+ * 退役军人数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importVeterans")
+ public R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveVeteransPopulation(list, communityId, userId);
+ }
+
+ /**
+ * 批量导入残疾人
+ *
+ * @param list
+ * 残疾人数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importDisability")
+ public R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveDisabilityPopulation(list, communityId, userId);
+ }
+
+ /**
+ * 批量导入低保户
+ *
+ * @param list
+ * 低保户数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importLowSecurity")
+ public R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+ return comMngPopulationService.listSaveLowSecurityPopulation(list, communityId, userId);
+ }
+
+ /**
+ * 批量导入高龄老人 listSavePopulationElderExcelVO 批量导入高龄老人
+ * @param list 高龄老人数据
+ * @param communityId 社区id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importElder")
+ public R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+ return comMngPopulationService.listSaveEdlerPopulation(list, communityId, userId);
+ }
+
+ /**
+ * 批量导入养老金人员 listSavePopulationPensionExcelVO 批量导入养老金人员
+ * @param list 养老金人员数据
+ * @param communityId 社区id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importPension")
+ R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+ return comMngPopulationService.listSavePensionPopulation(list, communityId, userId);
}
/**
* 确认导入实有人口（有则更新，无则新建）
*
- * @param list 用户信息
- * @param communityId 社区id
+ * @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) {
+ public R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId) {
return comMngPopulationService.listSavePopulationConfirm(list, communityId);
}
/**
* 根据实有人口id查询详情
*
- * @param populationId 实有人口id
+ * @param populationId
+ * 实有人口id
* @return 实有人口详情查询结果
*/
@PostMapping("/population/detail")
@@ -434,7 +567,8 @@
/**
* 查询实有人口电子档信息
*
- * @param populationId 实有人口id
+ * @param populationId
+ * 实有人口id
* @return 实有人口电子档信息
*/
@PostMapping("/population/electronicArchives")
@@ -442,11 +576,11 @@
return comMngPopulationService.electronicArchivesPopulation(populationId);
}
-
/**
* 根据实有人口id修改标签列表
*
- * @param populationTagDTO 请求参数
+ * @param populationTagDTO
+ * 请求参数
* @return 修改结果
*/
@PostMapping("/population/editTag")
@@ -457,7 +591,8 @@
/**
* 根据实有人口身份证修改标签列表
*
- * @param comMngPopulationTagCardNoDTO 请求参数
+ * @param comMngPopulationTagCardNoDTO
+ * 请求参数
* @return 修改结果
*/
@PostMapping("/cardNo/population/editTag")
@@ -468,7 +603,8 @@
/**
* 批量删除实有人口
*
- * @param Ids 删除id集合
+ * @param Ids
+ * 删除id集合
* @return 删除结果
*/
@PostMapping("/population/delete")
@@ -479,7 +615,8 @@
/**
* 根据社区id查询所有实有人口
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 查询结果
*/
@PostMapping("/population/getAll")
@@ -490,7 +627,8 @@
/**
* 根据id集合查询实有人口
*
- * @param Ids 实有人口id集合
+ * @param Ids
+ * 实有人口id集合
* @return 查询结果
*/
@PostMapping("/population/getList")
@@ -501,11 +639,12 @@
/**
* 根据小区id查询实有人口
*
- * @param villageId 小区id
+ * @param villageId
+ * 小区id
* @return 查询结果
*/
@PostMapping("/population/getListByVillageId")
- R getPopulationListByVillageId(@RequestParam(value = "villageId") Long villageId){
+ R getPopulationListByVillageId(@RequestParam(value = "villageId") Long villageId) {
return comMngPopulationService.getPopulationListByVillageId(villageId);
}
@@ -516,14 +655,16 @@
* @return
*/
@PostMapping("/population/edit")
- R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO, @RequestParam("communityId") Long communityId) throws Exception {
+ R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,
+ @RequestParam("communityId") Long communityId) throws Exception {
return comMngPopulationService.editPopulation(populationEditDTO, communityId);
}
/**
* 分页查询特殊群体
*
- * @param pageInputUserDTO 请求参数
+ * @param pageInputUserDTO
+ * 请求参数
* @return 特殊群体列表
*/
@PostMapping("/special/page")
@@ -534,7 +675,8 @@
/**
* 删除特殊群体人员
*
- * @param id 特殊群体id
+ * @param id
+ * 特殊群体id
* @return 删除结果
*/
@PostMapping("/special/delete")
@@ -544,31 +686,34 @@
/**
* 基础数据》特殊群体》分页查询标签列表
+ *
* @param comMngUserTagDTO
* @return
*/
@PostMapping("/special/tags/page")
- public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO){
+ public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO) {
return comMngPopulationService.specialInputUserTags(comMngUserTagDTO);
}
/**
* 新增或修改特殊群体标签
+ *
* @param comMngTagVO
* @return
*/
@PostMapping("/special/tags/save")
- public R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO){
+ 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){
+ public R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id) {
return comMngPopulationService.deleteSpecialInputUserTags(id);
}
@@ -586,7 +731,8 @@
/**
* 实有人口统计
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 统计结果
*/
@PostMapping("/population/statistics")
@@ -597,7 +743,8 @@
/**
* 查询房屋级联菜单
*
- * @param cascadeHouseDTO 请求参数
+ * @param cascadeHouseDTO
+ * 请求参数
* @return 菜单列表
*/
@PostMapping("/population/cascade/list")
@@ -608,7 +755,8 @@
/**
* 分页查询房屋列表
*
- * @param populationHouseAdminDTO 请求参数
+ * @param populationHouseAdminDTO
+ * 请求参数
* @return 房屋列表
*/
@PostMapping("/population/page/house")
@@ -619,7 +767,8 @@
/**
* 根据id查询实有房屋信息
*
- * @param houseId 房屋id
+ * @param houseId
+ * 房屋id
* @return 房屋信息
*/
@PostMapping("/population/house/detail")
@@ -630,7 +779,8 @@
/**
* 编辑实有房屋信息
*
- * @param houseEditAdminDTO 请求参数
+ * @param houseEditAdminDTO
+ * 请求参数
* @return 编辑结果
*/
@PostMapping("/population/house/edit")
@@ -641,7 +791,8 @@
/**
* 根据房屋id列表删除房屋信息
*
- * @param Ids 请求参数
+ * @param Ids
+ * 请求参数
* @return 删除结果
*/
@PostMapping("/population/house/delete")
@@ -652,7 +803,8 @@
/**
* 实有房屋统计
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 统计结果
*/
@PostMapping("/population/house/statistics")
@@ -663,7 +815,8 @@
/**
* 根据社区id查询社区所有省市区
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 社区所在省市区
*/
@PostMapping("/village/getRegion")
@@ -674,12 +827,12 @@
/**
* 统计社区内小区数量
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 统计小区数量
*/
@PostMapping("/village/statistics")
public R villageStatistics(@RequestParam("communityId") Long communityId) {
return comMngVillageService.villageStatistics(communityId);
}
-
}
--
Gitblit v1.7.1