From 0a35a244f60da0d01a3a9142ed154fa9a83c4ad4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 03 六月 2021 18:25:54 +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 | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 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 eac7344..e5da780 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,7 +4,9 @@
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.EventGridMemberAddDTO;
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;
@@ -270,7 +272,7 @@
@PostMapping("listfamily")
public R listFamily(@RequestParam("userId") Long userId,
@RequestParam(value = "pageNum") Long pageNum,
- @RequestParam("pageNum") Long pageSize) {
+ @RequestParam("pageSize") Long pageSize) {
return userService.listFamily(userId, pageNum, pageSize);
}
@@ -567,6 +569,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 +894,25 @@
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);
+ }
}
--
Gitblit v1.7.1