From cc90152bc8eab5e26bd997a0fc5b06ae78bd2b0b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 01 Aug 2024 17:52:26 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/controller/UserController.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/controller/UserController.java b/websocketSerivce/src/main/java/org/example/controller/UserController.java
index c0a090d..a23f0e0 100644
--- a/websocketSerivce/src/main/java/org/example/controller/UserController.java
+++ b/websocketSerivce/src/main/java/org/example/controller/UserController.java
@@ -1,4 +1,6 @@
package org.example.controller;
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,6 +8,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.example.common.ServerResponse;
import org.example.dao.ConfigCurrencyMapper;
import org.example.dao.LogMapper;
@@ -15,6 +18,7 @@
import org.example.pojo.User;
import org.example.pojo.vo.DeleteConfigVo;
import org.example.pojo.vo.SaveConfigVo;
+import org.example.pojo.vo.UpdateUserVo;
import org.example.server.impl.UserServiceImpl;
import org.example.util.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -137,7 +141,7 @@
@PostMapping("/saveConfig")
public ServerResponse saveConfig(@RequestBody SaveConfigVo saveConfigVo) {
- currencyMapper.delete(new LambdaQueryWrapper<ConfigCurrency>().eq(ConfigCurrency::getUserId,saveConfigVo.getUserId()));
+// currencyMapper.delete(new LambdaQueryWrapper<ConfigCurrency>().eq(ConfigCurrency::getUserId,saveConfigVo.getUserId()));
saveConfigVo.getCurrencyList().forEach(f->{
ConfigCurrency currency = new ConfigCurrency();
currency.setUserId(saveConfigVo.getUserId());
@@ -156,13 +160,29 @@
@PostMapping("/deleteConfig")
public ServerResponse deleteConfig(@RequestBody DeleteConfigVo deleteConfigVo) {
- currencyMapper.deleteBatchIds(deleteConfigVo.getConfigId());
+ currencyMapper.delete(new LambdaQueryWrapper<ConfigCurrency>()
+ .eq(ConfigCurrency::getUserId,deleteConfigVo.getUserId())
+ .in(ConfigCurrency::getId,deleteConfigVo.getConfigId()));
List<ConfigCurrency> configCurrencies = currencyMapper.selectList(new LambdaQueryWrapper<ConfigCurrency>().eq(ConfigCurrency::getUserId, deleteConfigVo.getUserId()));
String key = "config_";
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String json = gson.toJson(configCurrencies);
RedisUtil.set(key+deleteConfigVo.getUserId(),json);
return ServerResponse.createBySuccess();
+ }
+
+ @PostMapping("/selectConfig")
+ public ServerResponse selectConfig(@RequestParam(value = "currency", required = false) String currency,
+ @RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ HttpServletRequest request) {
+ String token = request.getHeader("token");
+ User user = JwtUtil.verify(token);
+ Page<ConfigCurrency> page = new Page<>(pageNum, pageSize);
+ Page<ConfigCurrency> configCurrencyPage = currencyMapper.selectPage(page, new LambdaQueryWrapper<ConfigCurrency>()
+ .eq(StringUtils.isNotEmpty(currency), ConfigCurrency::getCurrency, currency));
+ return ServerResponse.createBySuccess(configCurrencyPage);
+
}
@PostMapping("/saveUser")
@@ -180,7 +200,7 @@
@PostMapping("/deleteUser")
public ServerResponse deleteUser(@RequestParam("id") int id) {
User byId = userService.getById(id);
- if(null == byId){
+ if(null == byId || byId.getIsRoot() == 1){
return ServerResponse.createByErrorMsg("用户不存在");
}
userService.removeById(id);
@@ -188,13 +208,29 @@
}
@PostMapping("/updateUser")
- public ServerResponse deleteUser(User user) {
- User byId = userService.getById(user.getId());
- if(null == byId){
+ public ServerResponse deleteUser(UpdateUserVo updateUserVo) {
+ User user = userService.getById(updateUserVo.getId());
+ if(null == user || user.getIsRoot() == 1){
return ServerResponse.createByErrorMsg("用户不存在");
}
- user.setPassword(MD5Util.encrypt(user.getPassword()));
+ user.setAccount(updateUserVo.getAccount());
+ user.setPassword(MD5Util.encrypt(updateUserVo.getPassword()));
+ user.setEndTime(updateUserVo.getEndTime());
+ user.setIsLock(updateUserVo.getIsLock());
userService.updateById(user);
return ServerResponse.createBySuccess();
}
+
+ @GetMapping("/selectUser")
+ public ServerResponse selectUser(@RequestParam(value = "account", required = false) String account,
+ @RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize) {
+ Page<User> page = new Page<>(pageNum, pageSize);
+ Page<User> pageList = userService.page(page, new LambdaQueryWrapper<User>()
+ .eq(StringUtils.isNotEmpty(account), User::getAccount, account)
+ .eq(User::getIsShow,0)
+ .eq(User::getIsRoot,0)
+ .orderByDesc(User::getAddTime));
+ return ServerResponse.createBySuccess(pageList);
+ }
}
--
Gitblit v1.9.3