From 669d9c7c7913de3490cd95b3c18375b3c475a995 Mon Sep 17 00:00:00 2001
From: infrasys00 <blackdancers@163.com>
Date: 星期六, 20 二月 2021 13:20:10 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 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 9528a04..fdf9505 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,7 +1,9 @@
package com.panzhihua.common.service.user;
import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
@@ -9,6 +11,7 @@
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.user.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -492,4 +495,45 @@
*/
@PostMapping("putuserlastlogintime")
R putUserLastLoginTime(@RequestParam("userId")Long userId);
+
+ /**
+ * 删除意见反馈
+ * @param id 主键
+ * @return 删除结果
+ */
+ @PostMapping("deletefeedback")
+ R deleteFeedback(@RequestParam("id")Long id);
+
+ /**
+ * 批量导入居民用户
+ * @param list 居民用户集合
+ * @param areaName 小区名字
+ * @return 导入结果
+ */
+ @PostMapping("batchsaveuser")
+ R batchSaveUser(@RequestBody List<EexcelUserDTO> list, @RequestParam("areaName")StringBuffer areaName);
+
+ /**
+ * 校验小区是否存在
+ * @param areaName 小区名字
+ * @return 校验结果
+ */
+ @PostMapping("checkaereaname")
+ R checkAereaName(@RequestParam("areaName")String areaName);
+
+ /**
+ * 社区人员详情包括导入人员
+ * @param userId 人员id
+ * @return CommunityUserInfoVO
+ */
+ @PostMapping("detailusercomunity")
+ R detailUserComunity(@RequestParam("userId")Long userId);
+
+ /**
+ * 用户搜索了就下载搜索的用户否则下载所有用户
+ * @param exportUserDTO 用户搜索内容
+ * @return List<EexcelUserDTO> excel内容
+ */
+ @PostMapping("export")
+ R export(@RequestBody ExportUserDTO exportUserDTO);
}
--
Gitblit v1.7.1