From 8d53c609a6589158d68b5945cdb3061460a43d47 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 15 Aug 2024 04:02:17 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/controller/UserController.java | 86 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/controller/UserController.java b/websocketSerivce/src/main/java/org/example/controller/UserController.java
index e5d11b1..90f156e 100644
--- a/websocketSerivce/src/main/java/org/example/controller/UserController.java
+++ b/websocketSerivce/src/main/java/org/example/controller/UserController.java
@@ -26,6 +26,8 @@
import java.security.SecureRandom;
import java.sql.Date;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -73,6 +75,7 @@
map.put("user",user);
map.put("menu",menus);
extracted(account, request);
+ RedisUtil.set(user.getId().toString(),token);
return ServerResponse.createBySuccess(map);
}
@@ -92,8 +95,7 @@
List<Menu> menuList = menus.stream().filter(f -> f.getIsRoot() == 0).collect(Collectors.toList());
map.put("menu",menuList);
map.put("user",user);
- String key = "user_";
- RedisUtil.set(key+user.getId(),token);
+ RedisUtil.set(user.getId().toString(),token);
extracted(account, request);
return ServerResponse.createBySuccess(map);
@@ -125,6 +127,10 @@
currency.setCurrency(f.getCurrency());
currency.setBuy(f.getBuy());
currency.setSell(f.getSell());
+ LocalDateTime now = LocalDateTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String formattedDateTime = now.format(formatter);
+ currency.setAddTime(formattedDateTime);
currencyMapper.insert(currency);
});
List<ConfigCurrency> configCurrencies = currencyMapper.selectList(new LambdaQueryWrapper<ConfigCurrency>().eq(ConfigCurrency::getUserId, user.getId()));
@@ -157,7 +163,7 @@
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).eq(ConfigCurrency::getUserId,user.getId()));
+ .eq(StringUtils.isNotEmpty(currency), ConfigCurrency::getCurrency, currency).eq(ConfigCurrency::getUserId,user.getId()).orderByDesc(ConfigCurrency::getAddTime));
return ServerResponse.createBySuccess(configCurrencyPage);
}
@@ -207,6 +213,17 @@
return ServerResponse.createBySuccess();
}
+ @PostMapping("/updatePassword")
+ public ServerResponse updatePassword(@RequestParam("id") Integer id,@RequestParam("password") String password) {
+ User user = userService.getById(id);
+ if(null == user || user.getIsRoot() == 1){
+ return ServerResponse.createByErrorMsg("用户不存在");
+ }
+ user.setPassword(MD5Util.encrypt(password));
+ userService.updateById(user);
+ return ServerResponse.createBySuccess();
+ }
+
@GetMapping("/selectUser")
public ServerResponse selectUser(@RequestParam(value = "account", required = false) String account,
@RequestParam("pageNum") int pageNum,
@@ -230,4 +247,67 @@
.orderByDesc(Log::getLoginTime));
return ServerResponse.createBySuccess(pageList);
}
+
+ @GetMapping("/addMark")
+ public ServerResponse addMark(@RequestParam(value = "favorites") String favorites,
+ HttpServletRequest request) {
+ String token = request.getHeader("token");
+ User user = JwtUtil.verify(token);
+
+ if (user == null) {
+ // 处理用户验证失败的情况，例如返回未授权错误
+ return ServerResponse.createByErrorMsg("标记失败");
+ }
+
+ String mark = RedisUtil.get(user.getId() + "_mark");
+
+ if (StringUtils.isNotEmpty(mark)) {
+ // 使用 StringJoiner 或者 StringBuilder 来拼接字符串
+ mark += "," + favorites;
+ } else {
+ mark = favorites;
+ }
+
+ // 更新 Redis 中的标记
+ RedisUtil.set(user.getId() + "_mark", mark);
+
+ // 返回操作成功的响应
+ return ServerResponse.createBySuccess("标记成功");
+ }
+
+ @GetMapping("/deleteMark")
+ @ResponseBody
+ public ServerResponse deleteMark(@RequestParam(value = "favorites") String favorites,
+ HttpServletRequest request) {
+ String token = request.getHeader("token");
+ User user = JwtUtil.verify(token);
+
+ String mark = RedisUtil.get(user.getId() + "_mark");
+
+ if (StringUtils.isNotEmpty(mark)) {
+ // 使用逗号分隔符将标记分割成数组
+ String[] marks = mark.split(",");
+
+ // 创建一个新的标记列表，用于存储没有要删除的标记
+ List<String> updatedMarks = new ArrayList<>();
+
+ // 遍历现有的标记，将不等于要删除的标记加入新列表
+ for (String m : marks) {
+ if (!m.equals(favorites)) {
+ updatedMarks.add(m);
+ }
+ }
+
+ // 将新的标记列表转换为逗号分隔的字符串
+ mark = String.join(",", updatedMarks);
+
+ // 更新 Redis 中的标记
+ RedisUtil.set(user.getId() + "_mark", mark);
+
+
+ }
+ // 返回操作成功的响应
+ return ServerResponse.createBySuccess("取消标记成功");
+ }
+
}
--
Gitblit v1.9.3