From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 151 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 143 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 7620f8d..5413da6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -4,16 +4,17 @@
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.*;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.service_user.service.SysUserInputService;
import com.panzhihua.service_user.service.UserService;
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;
@@ -121,6 +122,17 @@
}
/**
+ * 微心愿搜索社区团队人员列表
+ * @param param 请求参数
+ * @param communityId 社区id
+ * @return 社区团队人员列表
+ */
+ @PostMapping("listactivitymanager2")
+ public R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId") Long communityId) {
+ return userService.listActivityManager2(param, communityId);
+ }
+
+ /**
* 分页查询人脸识别
*
* @param loginUserInfoVO 查询参数
@@ -145,12 +157,12 @@
/**
* 分页查询人口管理
*
- * @param loginUserInfoVO 查询参数
+ * @param userInfoVO 查询参数
* @return 分页数据
*/
@PostMapping("pageuser")
- public R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
- return userService.pageUser(loginUserInfoVO);
+ public R pageUser(@RequestBody AppletUserInfoVO userInfoVO) {
+ return userService.pageUser(userInfoVO);
}
/**
@@ -369,8 +381,8 @@
* @return 协议集合
*/
@PostMapping("listagreement")
- public R listAgreement() {
- return userService.listAgreement();
+ public R listAgreement(@RequestParam("communityId") Long communityId) {
+ return userService.listAgreement(communityId);
}
/**
@@ -567,6 +579,17 @@
@PostMapping("updateuserispartymember")
public R updateUserIsPartymember(@RequestParam("idCard") String idCard) {
return userService.updateUserIsPartymember(idCard);
+ }
+
+
+ /**
+ * 修改用户为非党员状态
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @PostMapping("updateusernotpartymember")
+ R updateUserNotPartymember(@RequestParam("idCard")String idCard){
+ return userService.updateUserNotPartymember(idCard);
}
/**
@@ -881,4 +904,116 @@
public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) {
return userService.updateUserArchives(userArchivesVO);
}
+
+ /**
+ * 修改app用户密码
+ * @param userInfoAppDTO 请求参数
+ * @return 修改结果
+ */
+ @PutMapping("updateUserPassByApp")
+ public R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO){
+ return userService.updateUserPassByApp(userInfoAppDTO);
+ }
+
+
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("addGridUser")
+ R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){
+ return userService.addGridUser(eventGridMemberAddDTO);
+ }
+
+ /**
+ * 网格员管理
+ * @param memberRelationDTO 请求参数
+ * @return 网格员列表
+ */
+ @PostMapping("member/list")
+ public R getGridMemberList(@RequestBody PageEventGridMemberRelationDTO memberRelationDTO){
+ return userService.getGridMemberList(memberRelationDTO);
+ }
+
+ /**
+ * 修改网格员信息
+ * @param gridMemberDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editGridUser")
+ public R gridMemberEdit(@RequestBody EventGridMemberEditAdminDTO gridMemberDTO){
+ return userService.editGridUser(gridMemberDTO);
+ }
+
+ /**
+ * 重置网格员密码
+ * @param gridMemberDTO 请求参数
+ * @return 重置结果
+ */
+ @PostMapping("passResetUser")
+ public R passResetUser(@RequestBody EventGridMemberPassResetDTO gridMemberDTO){
+ return userService.passResetUser(gridMemberDTO);
+ }
+
+ /**
+ * 批量删除网格员
+ * @param Ids 网格员id集合
+ * @return 删除结果
+ */
+ @PostMapping("deleteMembers")
+ public R deleteMembers(@RequestBody List<Long> Ids){
+ return userService.deleteMembers(Ids);
+ }
+
+ @PostMapping("gridMemberEditStatus")
+ public R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO){
+ return userService.gridMemberEditStatus(gridMemberEditDTO);
+ }
+
+ @GetMapping("big/no/tip")
+ public R noTips(@RequestParam("userId") Long userId){
+ return userService.noTips(userId);
+ }
+
+ /**
+ * 查询社区的收益说明
+ * @param communityId 社区id
+ * @return 收益说明
+ */
+ @PostMapping("listagreements")
+ public R listAgreements(@RequestParam("communityId") Long communityId) {
+ return userService.listAgreements(communityId);
+ }
+
+ @PostMapping("user/getUserGrids")
+ public R getGridIsOk(@RequestParam("userId") Long userId) {
+ return userService.getGridIsOk(userId);
+ }
+
+ @GetMapping("getGridsMemberList")
+ public R getGridsMemberList(@RequestParam("communityId") Long communityId) {
+ return userService.getGridsMemberList(communityId);
+ }
+
+ /**
+ * 根据用户id查询用户openid
+ * @param userId 用户id
+ * @return openid
+ */
+ @GetMapping("getUserOpenId")
+ public R getUserOpenId(@RequestParam("userId")Long userId) {
+ return userService.getUserOpenId(userId);
+ }
+
+ /**
+ * 查询社区后台工作人员列表
+ * @param communityId 社区id
+ * @return 社区后台工作人员列表
+ */
+ @GetMapping("getUserListByCommunityId")
+ public R getUserListByCommunityId(@RequestParam("communityId")Long communityId) {
+ return userService.getUserListByCommunityId(communityId);
+ }
+
}
--
Gitblit v1.7.1