From cd83b6020e8dbc40aa2fa8d21dac80e7331b3c89 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 28 Dec 2023 17:13:45 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=20=E6=9C=80=E5=90=8E=E6=B4=BB=E8=B7=83?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coal/loginUser/repository/LoginUserRepository.java |  2 +-
 .../coal/loginUser/service/LoginUserService.java       | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/loginUser/repository/LoginUserRepository.java b/src/main/java/cn/lihongjie/coal/loginUser/repository/LoginUserRepository.java
index 96612c31..6ccc0210 100644
--- a/src/main/java/cn/lihongjie/coal/loginUser/repository/LoginUserRepository.java
+++ b/src/main/java/cn/lihongjie/coal/loginUser/repository/LoginUserRepository.java
@@ -17,7 +17,7 @@ public interface LoginUserRepository extends BaseRepository<LoginUserEntity> {
     @Transactional
     @Modifying
     @Query(
-            "update LoginUserEntity l set l.lastActiveTime = ?1 where l.id = ?2 and l.lastActiveTime < ?3")
+            "update LoginUserEntity l set l.lastActiveTime = ?1 where l.id = ?2 and (l.lastActiveTime < ?3 or l.lastActiveTime is null)")
     int updateLastActiveTimeByIdAndLastActiveTimeLessThan(
             LocalDateTime lastActiveTime, String id, LocalDateTime lastActiveTime1);
 
diff --git a/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java b/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
index 65b76fa4..141aee39 100644
--- a/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
+++ b/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
@@ -124,12 +124,14 @@ public class LoginUserService extends BaseService<LoginUserEntity, LoginUserRepo
 
     public void newLogin(LoginUserEntity entity) {
 
-        entity.setLoginTime(LocalDateTime.now());
+        LocalDateTime now = LocalDateTime.now();
+        entity.setLoginTime(now);
         int seconds =
                 Integer.parseInt(
                         sysConfigService.getConfigVal(Constants.SYSCONFIG_SESSION_TIMEOUT));
         entity.setTimeout(seconds);
-        entity.setExpireTime(LocalDateTime.now().plusSeconds(seconds));
+        entity.setExpireTime(now.plusSeconds(seconds));
+        entity.setLastActiveTime(now);
 
         List<LoginUserEntity> exists = this.repository.findAllByUser(entity.getUser());
 
@@ -181,9 +183,9 @@ public class LoginUserService extends BaseService<LoginUserEntity, LoginUserRepo
 
         for (Map.Entry<String, LocalDateTime> entry : copy.entrySet()) {
 
-            repository.updateLastActiveTimeByIdAndLastActiveTimeLessThan(
+            int count = repository.updateLastActiveTimeByIdAndLastActiveTimeLessThan(
                     entry.getValue(), entry.getKey(), entry.getValue());
-            log.info("更新会话最后活跃时间: {} to {}", entry.getKey(), entry.getValue());
+            log.info("更新会话最后活跃时间: {} to {},  count:{}", entry.getKey(), entry.getValue(), count);
         }
 
     }