From c86d53bc6be26eb67165b991fdc0311378f53c64 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 23 六月 2021 16:57:13 +0800
Subject: [PATCH] bug修改以及app接口开发
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 197 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 186 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 922c4f7..9e5f7eb 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
@@ -1,20 +1,16 @@
package com.panzhihua.common.service.user;
import com.panzhihua.common.model.dtos.PageDTO;
+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.community.ComMngStructAreaVO;
+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.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -169,6 +165,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);
+
/**
* 用户绑定社区、小区
* @param loginUserInfoVO 社区小区数据
@@ -207,7 +212,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);
/**
* 新增家庭成员
@@ -469,6 +476,13 @@
*/
@PostMapping("updateuserispartymember")
R updateUserIsPartymember(@RequestParam("idCard")String idCard);
+ /**
+ * 修改用户的为非党员状态
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @PostMapping("updateusernotpartymember")
+ R updateUserNotPartymember(@RequestParam("idCard")String idCard);
/**
* 获取角色的权限配置列表
@@ -543,6 +557,14 @@
@GetMapping("getUserByPhone")
R getSysUserVOByPhone(@RequestParam(value = "phone") String phone);
+ /**
+ * 通过账号查询用户信息
+ * @param account
+ * @return
+ */
+ @GetMapping("getUserByAccount")
+ R getSysUserVOByAccountAndType(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type);
+
/**
* 基础数据》居民管理》居民列表
@@ -584,5 +606,158 @@
*/
@PostMapping("/common/data/user/export")
R inputUserExport(@RequestBody ExportUserDTO exportUserDTO);
-
+
+ /**
+ * 基础数据》特殊群体》分页查询
+ * @param pageInputUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/page")
+ R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 删除特殊群体用户
+ * @param id
+ * @return
+ */
+ @DeleteMapping("common/data/special/delete")
+ R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
+
+ /**
+ * 基础数据》特殊群体》分页查询标签列表
+ * @param comMngUserTagDTO
+ * @return
+ */
+ @PostMapping("common/data/special/tags/page")
+ R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO);
+
+ /**
+ * 新增或修改特殊群体标签
+ * @param comMngTagVO
+ * @return
+ */
+ @PostMapping("common/data/special/tags/save")
+ R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO);
+
+ /**
+ * 删除特殊群体标签
+ * @param id
+ * @return
+ */
+ @DeleteMapping("common/data/special/tags/delete")
+ R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id);
+
+ /**
+ * 特殊群体导出
+ * @param exportSpecialUserDTO
+ * @return
+ */
+ @PostMapping("/common/data/special/export")
+ R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO);
+
+ /**
+ * 查询所有人员标签
+ * @return 标签集合
+ */
+ @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);
}
--
Gitblit v1.7.1