From cf09d241c787638be369486c42ec779c6129e435 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 14 Nov 2024 18:30:55 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/controller/UserController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/controller/UserController.java b/websocketSerivce/src/main/java/org/example/controller/UserController.java
index dce4a3d..adf77f8 100644
--- a/websocketSerivce/src/main/java/org/example/controller/UserController.java
+++ b/websocketSerivce/src/main/java/org/example/controller/UserController.java
@@ -1,4 +1,5 @@
package org.example.controller;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -26,6 +27,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 +76,7 @@
map.put("user",user);
map.put("menu",menus);
extracted(account, request);
+ RedisUtil.set(user.getId().toString(),token);
return ServerResponse.createBySuccess(map);
}
@@ -92,8 +96,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,7 +128,19 @@
currency.setCurrency(f.getCurrency());
currency.setBuy(f.getBuy());
currency.setSell(f.getSell());
- currencyMapper.insert(currency);
+ LocalDateTime now = LocalDateTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String formattedDateTime = now.format(formatter);
+ currency.setAddTime(formattedDateTime);
+ List<ConfigCurrency> configCurrencies = currencyMapper.selectList(new LambdaQueryWrapper<>(ConfigCurrency.class)
+ .eq(ConfigCurrency::getUserId,user.getId())
+ .eq(ConfigCurrency::getCurrency, f.getCurrency())
+ .eq(ConfigCurrency::getBuy, f.getBuy())
+ .eq(ConfigCurrency::getSell, f.getSell())
+ );
+ if(CollectionUtil.isEmpty(configCurrencies)){
+ currencyMapper.insert(currency);
+ }
});
List<ConfigCurrency> configCurrencies = currencyMapper.selectList(new LambdaQueryWrapper<ConfigCurrency>().eq(ConfigCurrency::getUserId, user.getId()));
String key = "config_";
@@ -157,7 +172,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);
}
@@ -203,6 +218,17 @@
user.setAccount(updateUserVo.getAccount());
user.setEndTime(updateUserVo.getEndTime());
user.setIsLock(updateUserVo.getIsLock());
+ userService.updateById(user);
+ 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();
}
@@ -259,6 +285,7 @@
}
@GetMapping("/deleteMark")
+ @ResponseBody
public ServerResponse deleteMark(@RequestParam(value = "favorites") String favorites,
HttpServletRequest request) {
String token = request.getHeader("token");
--
Gitblit v1.9.3