From 6ec2f685a9f0eb58e846058afe1e60ee8dbd2cc6 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 12 一月 2021 09:48:33 +0800
Subject: [PATCH] 登录bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 253 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 248 insertions(+), 5 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 7251d11..9b42937 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,10 +1,14 @@
package com.panzhihua.service_user.api;
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
+import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.user.ChangePasswordVO;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.service_user.service.UserService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -67,9 +71,9 @@
*/
@PostMapping("/getUserInfo")
public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName){
- int index = userName.indexOf("_");
+ int index = userName.lastIndexOf("_");
String type = userName.substring(index+1, userName.length());
- String name = userName.substring(0, userName.indexOf("_"));
+ String name = userName.substring(0, index);
return userService.getUserInfo(name,Integer.parseInt(type));
}
@@ -242,4 +246,243 @@
public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO){
return userService.putFamily(comMngFamilyInfoVO);
}
+
+ /**
+ * 新增运营、社区后台账户
+ * @param administratorsUserVO 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstage")
+ public R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
+
+ return userService.addUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 编辑运营、社区后台账户
+ * @param administratorsUserVO 编辑账户内容
+ * @return 编辑结果
+ */
+ @PostMapping("putuserbackstage")
+ R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
+ return userService.putUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 删除后台用户
+ * @param administratorsUserVO 用户主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteuserbackstage")
+ public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
+ return userService.deleteUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 分页查询后台用户
+ * @param administratorsUserVO 查询参数
+ * @return 后台用户
+ */
+ @PostMapping("pageuserbackstage")
+ public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
+ return userService.pageUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 保存操作日志
+ * @param operlog 日志内容
+ * @return 保存结果
+ */
+ @PostMapping("addoperlog")
+ public R addOperLog(@RequestBody SysOperLogVO operlog){
+ return userService.addOperLog(operlog);
+ }
+
+ /**
+ * 分页展示操作日志
+ * @param sysOperLogVO 分页参数
+ * @return 分页集合
+ */
+ @PostMapping("pageoperlog")
+ public R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO){
+ return userService.pageOperLog(sysOperLogVO);
+ }
+
+ /**
+ * 用户协议
+ * @return 协议集合
+ */
+ @PostMapping("listagreement")
+ public R listAgreement(){
+ return userService.listAgreement();
+ }
+
+ /**
+ * 编辑用户协议
+ * @param sysUserAgreementVO 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putagreement")
+ public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO){
+ return userService.putAgreement(sysUserAgreementVO);
+ }
+
+ /**
+ * 用户标签
+ * @param communityId 社区id
+ * @return 标签集合
+ */
+ @PostMapping("listcommngusertag")
+ public R listComMngUserTag(@RequestParam("communityId")Long communityId){
+ return userService.listComMngUserTag(communityId);
+ }
+
+ /**
+ * 新增删除用户标签
+ * @param systemmanagementConfigVO 操作内容
+ * @return 操作结果
+ */
+ @PostMapping("putcommngusertag")
+ public R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){
+ return userService.putComMngUserTag(systemmanagementConfigVO);
+ }
+
+ /**
+ * 分页查询小程序用户
+ * @param pageUserAppletsBackstageDTO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pageuserappletsbackstage")
+ public R pageUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){
+ return userService.pageUserAppletsBackstage(pageUserAppletsBackstageDTO);
+ }
+
+ /**
+ * 编辑用户状态
+ * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用
+ * @return 编辑结果
+ */
+ @PostMapping("putuserappletsbackstage")
+ public R putUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){
+ return userService.putUserAppletsBackstage(pageUserAppletsBackstageDTO);
+ }
+
+ /**
+ * 调试接口--清除昵称、社区、小区
+ * @param userId 登录用户id
+ * @return 清除结果
+ */
+ @PostMapping("deleteusertest")
+ public R deleteUserTest(@RequestParam("userId")Long userId){
+ return userService.deleteUserTest(userId);
+ }
+
+ /**
+ * 用户协议和隐私政策
+ * @param type 所属app 1居民端app 2网格员端app 3商家端app
+ * @return 协议内容
+ */
+ @PostMapping("useragreement")
+ public R userAgreement(@RequestParam("type")int type){
+ return userService.userAgreement(type);
+ }
+
+ /**
+ * 意见反馈
+ * @param sysUserFeedbackDTO 反馈内容
+ * @return 反馈结果
+ */
+ @PostMapping("addfeedback")
+ public R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+ /**
+ * 分页通知列表
+ * @param pageDTO 分页参数
+ * @return 分页结果
+ */
+ @PostMapping("pagenotice")
+ public R pageNotice(@RequestBody PageDTO pageDTO){
+ return userService.pageNotice(pageDTO);
+ }
+
+ /**
+ * 通知已读
+ * @param noticeReadDTO 通知已读
+ * @return 修改状态
+ */
+ @PostMapping("putnotice")
+ public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO){
+ return userService.putNotice(noticeReadDTO);
+ }
+
+ /**
+ * 分页查询用户意见反馈
+ * @param pageFeedBackDTO 分页查询参数
+ * @return 意见集合
+ */
+ @PostMapping("pagefeedback")
+ public R pageFeedback(@RequestBody PageFeedBackDTO pageFeedBackDTO){
+ return userService.pageFeedback(pageFeedBackDTO);
+ }
+
+ /**
+ * 未读消息汇总
+ * @param userId 登录用户信息
+ * @return 未读汇总
+ */
+ @PostMapping("noticeunreadnum")
+ public R noticeUnreadNum(@RequestParam("userId")Long userId){
+ return userService.noticeUnreadNum(userId);
+ }
+
+ /**
+ * 反馈意见详情
+ * @param id 反馈主键
+ * @return 反馈详情
+ *
+ */
+ @PostMapping("detailfeedback")
+ public R detailFeedback(@RequestParam("id")Long id){
+ return userService.detailFeedback(id);
+ }
+
+ /**
+ * 数据看板
+ * @return 运营后台数据看板
+ */
+ @PostMapping("datakanban")
+ public R dataKanban(){
+ return userService.dataKanban();
+ }
+
+ /**
+ * 社区管理后台数据看板
+ * @param communityId 社区id
+ * @return 看板用户数据
+ */
+ @PostMapping("indexdatacommunitybackstage")
+ public R indexDataCommunityBackstage(@RequestParam("communityId")Long communityId){
+ return userService.indexDataCommunityBackstage(communityId);
+ }
+
+ /**
+ * 定时任务维护用户持续登录时间
+ * @return 维护结果
+ */
+ @PostMapping("timedtaskcontinuouslandingdays")
+ public R timedTaskContinuousLandingDays(){
+ return userService.timedTaskContinuousLandingDays();
+ }
+
+ /**
+ * 新增用户通知
+ * @param sysUserNoticeVO 通知内容
+ * @return 新增结果
+ */
+ @PostMapping("addnotice")
+ public R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO){
+ return userService.addNotice(sysUserNoticeVO);
+ }
}
--
Gitblit v1.7.1