From 50869dd1a017c3502e3d170ba7a33101c4d0a9c8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 七月 2021 09:49:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |  100 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 98 insertions(+), 2 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 243e05d..e3ab73b 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,20 @@
 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.EditUserInfoPassAppDTO;
 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.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;
@@ -369,8 +373,8 @@
      * @return 协议集合
      */
     @PostMapping("listagreement")
-    public R listAgreement() {
-        return userService.listAgreement();
+    public R listAgreement(@RequestParam("communityId") Long communityId) {
+        return userService.listAgreement(communityId);
     }
 
     /**
@@ -892,4 +896,96 @@
     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);
+    }
+
 }

--
Gitblit v1.7.1