From 6b96492c540e24cc29d55573c5816df808279825 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 10 七月 2024 16:10:17 +0800
Subject: [PATCH] 分表
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
index d7a1add..7e84cd7 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
@@ -4,23 +4,21 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.constant.RedisConstants;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.management.domain.SysUser;
-import com.ruoyi.management.domain.TUser;
import com.ruoyi.management.domain.TVipSet;
-import com.ruoyi.management.service.ISysUserService;
-import com.ruoyi.management.service.ITUserService;
import com.ruoyi.management.service.ITVipSetService;
import com.ruoyi.management.vo.VipSetVO;
+import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.dto.AppUserQuery;
import com.ruoyi.study.api.dto.UserInfoQuery;
import com.ruoyi.study.api.feignClient.StudyClient;
import com.ruoyi.study.api.model.TGameRecord;
import com.ruoyi.study.api.vo.*;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -28,8 +26,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -44,14 +40,11 @@
@RequestMapping("/tUser")
public class TUserController {
@Autowired
- private ITUserService userService;
- @Autowired
private ITVipSetService vipSetService;
@Autowired
private StudyClient studyClient;
- @Autowired
- private ISysUserService sysUserService;
+
@PostMapping("/userList")
@ApiOperation(value = "用户列表", tags = {"用户管理"})
@@ -147,8 +140,8 @@
@PostMapping("/freeze")
@ApiOperation(value = "冻结/解冻", tags = {"用户管理"})
public AjaxResult freeze(Integer id) {
- TUser byId = userService.getById(id);
- if (byId.getState() == 1) {
+ TUser data = studyClient.getUserById(id).getData();
+ if (data.getState() == 1) {
studyClient.freeze(id);
return AjaxResult.success("冻结成功");
} else {
@@ -166,8 +159,7 @@
@ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true),
})
public AjaxResult updatePassword(String phone,String phoneCode,String password) {
- SysUser one = sysUserService.getOne(new QueryWrapper<SysUser>()
- .eq("phonenumber", phone).eq("del_flag", 0));
+ SysUser one = sysUserClient.getSysUserByPhonenumber(phone).getData();
if (one == null){
return AjaxResult.error("账号不存在!");
}
@@ -190,21 +182,23 @@
return AjaxResult.error("新密码不能与旧密码相同");
}
one.setPassword(SecurityUtils.encryptPassword(password));
- sysUserService.updateById(one);
+ sysUserClient.updatePassword1(one);
return AjaxResult.success();
}
+
+ @Autowired
+ private SysUserClient sysUserClient;
@GetMapping("/sendPhoneCode")
@ApiOperation(value = "发送手机验证码", tags = {"管理后台-修改密码"})
@ApiImplicitParams({
@ApiImplicitParam(value = "手机号", name = "phone", dataType = "string", required = true),
})
public R<?> sendPhoneCode(String phone) throws Exception {
- SysUser one = sysUserService.getOne(new QueryWrapper<SysUser>()
- .eq("phonenumber", phone).eq("del_flag", 0));
- if (one == null){
+ SysUser data = sysUserClient.getSysUserByPhonenumber(phone).getData();
+ if (data == null){
return R.fail("账号不存在!");
}
- return userService.phoneCode(phone) ? R.ok() : R.fail();
+ return vipSetService.phoneCode(phone) ? R.ok() : R.fail();
}
@PostMapping("/getVipSet")
@ApiOperation(value = "获取会员设置", tags = {"用户管理"})
--
Gitblit v1.7.1