From ac8522fc973eaedee01d867b9886c807fdc5e945 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 30 Aug 2024 18:39:40 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/controller/UserController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/controller/UserController.java b/websocketSerivce/src/main/java/org/example/controller/UserController.java
index c8293de..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;
@@ -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);
}
@@ -207,6 +222,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,
--
Gitblit v1.9.3