From d4ff86377dc230f9fa618d5a6c525f94ae223477 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 08 五月 2021 14:24:07 +0800
Subject: [PATCH] bugfixed: 店铺修改密码失败
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 2 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 a15412e..e134633 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,10 +1,11 @@
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.service_community.service.*;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -132,7 +133,7 @@
return comMngRealCompanyService.detailComMngRealCompany(id);
}
- @GetMapping("/company/belongs")
+ @PostMapping("/company/belongs")
public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
return comMngRealCompanyService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO);
}
@@ -276,6 +277,18 @@
}
/**
+ * 确认导入实有人口（有则更新，无则新建）
+ * @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 实有人口详情查询结果
@@ -286,6 +299,17 @@
}
/**
+ * 查询实有人口电子档信息
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @PostMapping("/population/electronicArchives")
+ public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) {
+ return comMngPopulationService.electronicArchivesPopulation(populationId);
+ }
+
+
+ /**
* 根据实有人口id修改标签列表
* @param populationTagDTO 请求参数
* @return 修改结果
@@ -294,4 +318,67 @@
public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) {
return comMngPopulationService.editTagPopulation(populationTagDTO);
}
+
+ /**
+ * 批量删除实有人口
+ * @param Ids 删除id集合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "批量删除实有人口")
+ @PostMapping("/population/delete")
+ public R deletePopulations(@RequestBody List<Long> Ids) {
+ return comMngPopulationService.deletePopulations(Ids);
+ }
+
+ /**
+ * 根据社区id查询所有实有人口
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据社区id查询所有实有人口")
+ @PostMapping("/population/getAll")
+ public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
+ return comMngPopulationService.getPopulationListByCommunityId(communityId);
+ }
+
+ /**
+ * 根据id集合查询实有人口
+ * @param Ids 实有人口id集合
+ * @return 查询结果
+ */
+ @ApiOperation(value = "批量删除实有人口")
+ @PostMapping("/population/getList")
+ public R getPopulationLists(@RequestBody List<Long> Ids) {
+ return comMngPopulationService.getPopulationLists(Ids);
+ }
+
+ /**
+ * 编辑实有人口
+ * @param editComMngPopulationVO
+ * @return
+ */
+ @PostMapping("/population/edit")
+ R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){
+ return comMngPopulationService.editPopulation(editComMngPopulationVO, 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);
+ }
}
--
Gitblit v1.7.1