From 27a580b6dc75cc256b84a611db8a227305d6e0b8 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 04 七月 2024 17:47:20 +0800
Subject: [PATCH] fix: 学习端退出学习计算学习进度bug
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 363dd9a..d7a1add 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
@@ -94,8 +94,27 @@
userInfoVO.setTodayHours(data1.getTodayHours());
userInfoVO.setWeekHours(data1.getWeekHours());
userInfoVO.setMonthHours(data1.getMonthHours());
+ PageInfo<TGameRecord> gameRecords = data1.getGameRecords();
+ List<TGameRecord> records = gameRecords.getRecords();
+ for (TGameRecord record : records) {
+ String s = convertSecondsToHoursMinutes(record.getUseTime());
+ record.setUseTime1(s);
+ }
userInfoVO.setGameRecords(data1.getGameRecords());
return AjaxResult.success(userInfoVO);
+ }
+ public static String convertSecondsToHoursMinutes(int seconds) {
+ int hours = seconds / 3600;
+ int minutes = (seconds % 3600) / 60;
+ if (hours == 0){
+ if (minutes == 0){
+ return String.format("%d秒", seconds);
+ }else{
+ return String.format("%d分钟", minutes);
+ }
+ }else{
+ return String.format("%d小时%d分钟", hours, minutes);
+ }
}
public static String convertToChineseOrdinal(int number) {
if (number <= 0 || number > 50) {
@@ -171,6 +190,7 @@
return AjaxResult.error("新密码不能与旧密码相同");
}
one.setPassword(SecurityUtils.encryptPassword(password));
+ sysUserService.updateById(one);
return AjaxResult.success();
}
@GetMapping("/sendPhoneCode")
--
Gitblit v1.7.1