From 0edab788f512d3c269c6b5caa62682dc1ef396f4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 30 三月 2021 18:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 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..fc17484 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,6 +1,7 @@
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.*;
@@ -147,6 +148,15 @@
@PostMapping("listtag")
public R listTag(){
return userService.listTag();
+ }
+
+ /**
+ * 查询当前社区所有标签以及预设标签
+ * @return 标签集合
+ */
+ @PostMapping("listtag/getTag")
+ public R listTags(@RequestParam("communityId") Long communityId){
+ return userService.listTags(communityId);
}
/**
@@ -605,7 +615,7 @@
* @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 +625,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 +636,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 +661,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 +671,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 +714,24 @@
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);
+ }
}
--
Gitblit v1.7.1