From 4e8be752d24ae22362455c16f75d3bcbccb23359 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 15:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 0463c1e..a4f943a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_user.service;
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.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
@@ -304,4 +305,62 @@
* @return 修改结果
*/
R updateUserIsPartymember(String idCard);
+ /**
+ * 获取各种协议
+ * @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
+ * @return 协议内容
+ */
+ R agreement(Integer type);
+ /**
+ * 维护用户最后登录时间
+ * @param userId 用户主键
+ * @return 维护结果
+ */
+ R putUserLastLoginTime(Long userId);
+ /**
+ * 删除意见反馈
+ * @param id 主键
+ * @return 删除结果
+ */
+ R deleteFeedback(Long id);
+ /**
+ * 校验小区是否存在
+ * @param areaName 小区名字
+ * @return 校验结果
+ */
+ R checkAereaName(String areaName);
+ /**
+ * 社区人员详情包括导入人员
+ * @param userId 人员id
+ * @return CommunityUserInfoVO
+ */
+ CommunityUserInfoVO detailUserComunity(Long userId);
+ /**
+ * 用户搜索了就下载搜索的用户否则下载所有用户
+ * @param exportUserDTO 用户搜索内容
+ * @return List<EexcelUserDTO> excel内容
+ */
+ R export(ExportUserDTO exportUserDTO);
+
+ /**
+ * 通过手机号码查询用户信息
+ * @param phone
+ * @return
+ */
+ R getSysUserVOByPhone(String phone);
+
+ /**
+ * 查询当前社区所有标签以及预设标签
+ * @return 标签集合
+ */
+ R listTags(Long communityId);
+
+ /**
+ * 通过账号查询用户信息
+ * @param account
+ * @param type
+ * @return
+ */
+
+ R getSysUserVOByAccount(String account, Integer type);
}
--
Gitblit v1.7.1