From 53f8efd5655c310d2c8d2a8f2218f2fcd559cdd6 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 28 四月 2021 15:16:57 +0800
Subject: [PATCH] no
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 108 insertions(+), 6 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 75979d6..e30843c 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
@@ -1,16 +1,19 @@
package com.panzhihua.service_user.api;
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.user.*;
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.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.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -150,6 +153,15 @@
}
/**
+ * 查询当前社区所有标签以及预设标签
+ * @return 标签集合
+ */
+ @PostMapping("listtag/getTag")
+ public R listTags(@RequestParam("communityId") Long communityId){
+ return userService.listTags(communityId);
+ }
+
+ /**
* 人员详情
* @param userId 用户id
* @return 人员详情
@@ -177,6 +189,16 @@
@PostMapping("putuserisvolunteer")
R putUserIsVolunteer(@RequestParam("phone")String phone,@RequestParam("type")int type){
return userService.putUserIsVolunteer(phone,type);
+ }
+
+ /**
+ * 修改用户志愿者状态
+ * @param userId 志愿者ID
+ * @param type 1是志愿者 0 不是
+ */
+ @PostMapping("putuserisvolunteerbyid")
+ R putUserIsVolunteerById(@RequestParam("userId")Long userId,@RequestParam("type")int type){
+ return userService.putUserIsVolunteerById(userId, type);
}
/**
@@ -601,11 +623,21 @@
}
/**
+ * 通过账号和渠道查询用户信息
+ * @param account
+ * @return
+ */
+ @GetMapping("getUserByAccount")
+ public R getSysUserVOByAccount(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type){
+ return userService.getSysUserVOByAccount(account, type);
+ }
+
+ /**
*分页查询人口管理
* @param pageInputUserDTO 查询参数
* @return 分页数据
*/
- @PostMapping("/common/data/user/page")
+ @PostMapping("common/data/user/page")
public R pageInputUser(@RequestBody PageInputUserDTO pageInputUserDTO){
return sysUserInputService.pageInputUser(pageInputUserDTO);
}
@@ -615,7 +647,7 @@
* @param inputUserTagsDTO 标签信息
* @return 设置结果
*/
- @PostMapping("/common/data/user/tags")
+ @PostMapping("common/data/user/tags")
public R setInputUserTag(@RequestBody InputUserTagsDTO inputUserTagsDTO){
return sysUserInputService.putUserTag(inputUserTagsDTO);
}
@@ -626,7 +658,7 @@
* @param areaName 小区名字
* @return 导入结果
*/
- @PostMapping("/common/data/user/import")
+ @PostMapping("common/data/user/import")
public R batchSaveInputUser(@RequestBody List<EexcelUserDTO> list,@RequestParam("areaName")StringBuffer areaName){
R r = null;
try {
@@ -651,7 +683,7 @@
* @param id 人员id
* @return CommunityUserInfoVO
*/
- @PostMapping("/common/data/user/detail")
+ @PostMapping("common/data/user/detail")
public R inputUserDetail(@RequestParam("id")Long id){
return sysUserInputService.inputUserDetail(id);
}
@@ -661,9 +693,9 @@
* @param exportUserDTO 用户搜索内容
* @return List<EexcelUserDTO> excel内容
*/
- @PostMapping("/common/data/user/export")
+ @PostMapping("common/data/user/export")
public R inputUserExport(@RequestBody ExportUserDTO exportUserDTO){
- return sysUserInputService.export(exportUserDTO);
+ return sysUserInputService.exportInputUser(exportUserDTO);
}
/**
@@ -704,4 +736,74 @@
R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO) {
return sysUserInputService.saveSpecialInputUserTags(comMngTagVO);
}
+
+ /**
+ * 删除特殊群体标签
+ * @param id
+ * @return
+ */
+ @DeleteMapping("common/data/special/tags/delete")
+ R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id) {
+ return sysUserInputService.deleteSpecialInputUserTags(id);
+ }
+
+ /**
+ * 特殊群体导出
+ * @param exportSpecialUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/export")
+ R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO) {
+ return sysUserInputService.specialUserExport(exportSpecialUserDTO);
+ }
+
+ /**
+ * 创建SysUser用户信息以及权限
+ * @param storeVO 请求参数
+ * @return 创建结果
+ */
+ @PostMapping("addSysUser")
+ public R addSysUser(@RequestBody ShopStoreVO storeVO){
+ return userService.addSysUser(storeVO);
+ }
+
+ /**
+ * 修改SysUser用户信息
+ * @param storeVO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editSysUser")
+ public R editSysUser(@RequestBody ShopStoreVO storeVO){
+ return userService.editSysUser(storeVO);
+ }
+
+ /**
+ * 修改用户小程序首页活动提示
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editUserTips")
+ public R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
+ return userService.editUserTips(userEditTipsDTO);
+ }
+
+ /**
+ * 获取用户电子档案
+ * @param userId 家庭成员信息
+ * @return 结果
+ */
+ @GetMapping("getUserArchives")
+ public R getUserArchives(@RequestParam("userId") Long userId){
+ return userService.getUserArchives(userId);
+ }
+
+ /**
+ * 编辑用户电子档案
+ * @param userArchivesVO 编辑的信息
+ * @return 编辑结果
+ */
+ @PostMapping("updateUserArchives")
+ public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO){
+ return userService.updateUserArchives(userArchivesVO);
+ }
}
--
Gitblit v1.7.1