From 36ee894df717bb53775ddad19dc15c89bb5ff7ef Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:43:16 +0800
Subject: [PATCH] 下载安全工作记录报告
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 158 insertions(+), 11 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 fbafe58..5ac5d5b 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,11 +4,10 @@
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.MenuVO;
-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 org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -112,6 +111,15 @@
R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);
/**
+ * 微心愿搜索社区团队人员列表
+ * @param param 请求参数
+ * @param communityId 社区id
+ * @return 社区团队人员列表
+ */
+ @PostMapping("listactivitymanager2")
+ R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);
+
+ /**
*分页查询人脸识别
* @param loginUserInfoVO 查询参数
* @return 分页集合
@@ -129,11 +137,11 @@
/**
*分页查询人口管理
- * @param loginUserInfoVO 查询参数
+ * @param userInfoVO 查询参数
* @return 分页数据
*/
@PostMapping("pageuser")
- R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO);
+ R pageUser(@RequestBody AppletUserInfoVO userInfoVO);
/**
* 查询所有人员标签
@@ -165,6 +173,15 @@
*/
@PostMapping("putuserisvolunteer")
R putUserIsVolunteer(@RequestParam("phone") String phone,@RequestParam("type")int type);
+
+
+ /**
+ * 修改用户志愿者状态
+ * @param userId 用户ID
+ * @param type 1 支援者 0不是志愿者
+ */
+ @PostMapping("putuserisvolunteerbyid")
+ R putUserIsVolunteerById(@RequestParam("userId") Long userId,@RequestParam("type")int type);
/**
* 用户绑定社区、小区
@@ -204,7 +221,9 @@
* @return 成员集合
*/
@PostMapping("listfamily")
- R listFamily(@RequestParam("userId")Long userId);
+ R listFamily(@RequestParam("userId")Long userId,
+ @RequestParam(value = "pageNum") Long pageNum,
+ @RequestParam("pageSize") Long pageSize);
/**
* 新增家庭成员
@@ -315,7 +334,7 @@
* @return 协议集合
*/
@PostMapping("listagreement")
- R listAgreement();
+ R listAgreement(@RequestParam("communityId")Long communityId);
/**
* 编辑用户协议
@@ -466,6 +485,13 @@
*/
@PostMapping("updateuserispartymember")
R updateUserIsPartymember(@RequestParam("idCard")String idCard);
+ /**
+ * 修改用户的为非党员状态
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @PostMapping("updateusernotpartymember")
+ R updateUserNotPartymember(@RequestParam("idCard")String idCard);
/**
* 获取角色的权限配置列表
@@ -546,7 +572,7 @@
* @return
*/
@GetMapping("getUserByAccount")
- R getSysUserVOByAccount(@RequestParam(value = "account") String account);
+ R getSysUserVOByAccountAndType(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type);
/**
@@ -603,7 +629,7 @@
* @param id
* @return
*/
- @DeleteMapping("common/data/special/delete")
+ @DeleteMapping("common/data/special/delete1")
R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
/**
@@ -612,7 +638,7 @@
* @return
*/
@PostMapping("common/data/special/tags/page")
- R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO);
+ R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO);
/**
* 新增或修改特殊群体标签
@@ -644,4 +670,125 @@
*/
@PostMapping("listtag/getTag")
R listTags(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 添加SysUser信息
+ * @param storeVO sysUser信息
+ * @return 添加sysUser结果
+ */
+ @PostMapping("addSysUser")
+ R addSysUser(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 修改SysUser信息
+ * @param storeVO sysUser信息
+ * @return 修改结果
+ */
+ @PostMapping("editSysUser")
+ R editSysUser(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 修改用户小程序首页活动提示
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editUserTips")
+ R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO);
+
+ /**
+ * 获取用户电子档案
+ * @param userId 家庭成员信息
+ * @return 结果
+ */
+ @GetMapping("getUserArchives")
+ R getUserArchives(@RequestParam("userId") Long userId);
+
+ /**
+ * 编辑用户电子档案
+ * @param userArchivesVO 编辑的信息
+ * @return 编辑结果
+ */
+ @PostMapping("updateUserArchives")
+ R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO);
+
+ /**
+ * 修改app用户密码
+ * @param userInfoAppDTO 请求参数
+ * @return 修改结果
+ */
+ @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);
+
+ @GetMapping("big/no/tip")
+ R noTips(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询社区的收益说明
+ * @param communityId 社区id
+ * @return 收益说明
+ */
+ @PostMapping("listagreements")
+ R listAgreements(@RequestParam("communityId")Long communityId);
+
+ @PostMapping("user/getUserGrids")
+ R getGridIsOk(@RequestParam("userId")Long userId);
+
+ @GetMapping("getGridsMemberList")
+ R getGridsMemberList(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 根据用户id查询用户openid
+ * @param userId 用户id
+ * @return openid
+ */
+ @GetMapping("getUserOpenId")
+ R getUserOpenId(@RequestParam("userId")Long userId);
}
--
Gitblit v1.7.1