From 08eefab8f0b04018dc62928ec2191bcae9d3e7d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 15 十月 2021 16:25:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 2 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 23dd8c5..874c77b 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
@@ -4,6 +4,9 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.DataKanBansDto;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.PageDTO;
@@ -125,6 +128,30 @@
}
/**
+ * 重置密码
+ *
+ * @param userId
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPassword")
+ public R resetPassword(@RequestParam("userId") Long userId) {
+ return userService.resetPassword(userId);
+ }
+
+ /**
+ * 批量重置密码
+ *
+ * @param userId
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPasswordPatch")
+ public R resetPasswordPatch(@RequestParam("userIds") Long[] userId,@RequestParam("password")String password) {
+ return userService.resetPasswordPatch(userId,password);
+ }
+
+ /**
* 某社区后台人员查询
*
* @param param
@@ -204,8 +231,8 @@
* @return 标签集合
*/
@PostMapping("listtag/getTag")
- public R listTags(@RequestParam("communityId") Long communityId) {
- return userService.listTags(communityId);
+ public R listTags() {
+ return userService.listTags();
}
/**
@@ -1125,4 +1152,78 @@
return userService.getUserListByCommunityId(communityId);
}
+ /**
+ * 检查当前用户是否是社区工作人员
+ * @param phone
+ * @param communityId
+ * @return
+ */
+ @GetMapping("checkIsTeam")
+ public R checkCurrentUserIsTeam(String phone, Long communityId) {
+ return userService.checkCurrentUserIsTeam(phone, communityId);
+ }
+
+ /**
+ * 便民服务新增商家账号
+ * @param convenientMerchantDTO
+ * @return 商家用户id
+ */
+ @PostMapping("insertMerchantAccount")
+ public R addConvenientMerchantUser(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
+ return userService.addConvenientMerchantUser(convenientMerchantDTO);
+ }
+
+ /**
+ * 修改便民服务商家绑定账号
+ * @param userId 用户id
+ * @param account 修改账户
+ * @return 修改结果
+ */
+ @PutMapping("putMerchantUserAccount")
+ public R putUserAccount(@RequestParam("userId") Long userId, @RequestParam("account") String account) {
+ return userService.putUserAccount(userId, account);
+ }
+
+ /**
+ * 禁用/启用便民服务商家用户
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("disableOrEnableMerchantUsers")
+ public R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
+ return userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO);
+ }
+
+ /**
+ * 根据openid维护社区团队里是否注册
+ * @param openid 用户微信唯一标识
+ */
+ @PostMapping("judgeCommunityTeam")
+ public void judgeCommunityTeam(@RequestParam("openid") String openid) {
+ userService.judgeCommunityTeam(openid);
+ }
+
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
+ @PostMapping("datakanbans")
+ public R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto) {
+ return userService.dataKanBans(dataKanBansDto);
+ }
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ @GetMapping("community/statistics")
+ public R communityStatistics() {
+ return userService.communityStatistics();
+ }
+
+ @GetMapping("community/statistics/export")
+ public R communityStatisticsExport() {
+ return userService.communityStatisticsExport();
+ }
}
--
Gitblit v1.7.1