From 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 23:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 6e4d83e..c4157b8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -4,6 +4,7 @@
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.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -708,4 +709,52 @@
*/
@PutMapping("updateUserPassByApp")
R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO);
+
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("addGridUser")
+ R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
+
+ /**
+ * 分页查询网格员
+ * @param memberRelationDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("member/list")
+ R getGridMemberList(@RequestBody PageEventGridMemberRelationDTO memberRelationDTO);
+
+ /**
+ * 修改网格员信息
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editGridUser")
+ R editGridUser(@RequestBody EventGridMemberEditAdminDTO eventGridMemberAddDTO);
+
+ /**
+ * 重置网格员密码
+ * @param gridMemberDTO 请求参数
+ * @return 重置结果
+ */
+ @PostMapping("passResetUser")
+ R gridMemberPassReset(@RequestBody EventGridMemberPassResetDTO gridMemberDTO);
+
+ /**
+ * 批量删除网格员
+ * @param Ids 网格员id集合
+ * @return 删除结果
+ */
+ @PostMapping("deleteMembers")
+ R deleteMembers(@RequestBody List<Long> Ids);
+
+ /**
+ * 批量修改网格员状态
+ * @param gridMemberEditDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("gridMemberEditStatus")
+ R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);
}
--
Gitblit v1.7.1