shjung 2 years ago
parent
commit
2252f06a8b

+ 7 - 4
src/main/java/com/its/op/controller/its/LoginController.java

@@ -179,12 +179,15 @@ public class LoginController {
         if (!"".equals(encUserId)) {
             String userId = WebMvcConfig.decUserId(encUserId);
             LoginDto.LogoutReqDto req = LoginDto.LogoutReqDto.builder()
-                    .user_id(WebMvcConfig.decUserId(userId))
+                    .user_id(userId)
                     .login_hms(loginHms)
-                    .user_id(session == null ? "xxx-xxx-xxx-xxx" : session.getId())
+                    .session_id(session == null ? "xxx-xxx-xxx-xxx" : session.getId())
                     .build();
-            this.service.logout(req);
-            log.info("Logout Request, Logout History Save: [{}], {}, {}", req.getSessionId(), req.getUserId(), req.getLoginHms());
+            if (this.service.logout(req)) {
+                log.info("Logout Request, Logout History Save: [{}], {}, {}", req.getSessionId(), req.getUserId(), req.getLoginHms());
+            } else {
+                log.info("Logout Request, Logout History Save Failed.: [{}], {}, {}", req.getSessionId(), req.getUserId(), req.getLoginHms());
+            }
         }
 
         // 로그아웃 이력 저장 후 세션 종료 시킴

+ 2 - 1
src/main/java/com/its/op/dto/its/LoginDto.java

@@ -101,9 +101,10 @@ public class LoginDto implements Serializable {
         private String sessionId;
 
         @Builder
-        public LogoutReqDto(String user_id, String login_hms) {
+        public LogoutReqDto(String user_id, String login_hms, String session_id) {
             this.userId = user_id;
             this.loginHms = login_hms;
+            this.sessionId = session_id;
         }
 
         public TbUserCnncHs toCnncHsEntity() {

+ 3 - 2
src/main/java/com/its/op/service/its/LoginService.java

@@ -52,10 +52,11 @@ public class LoginService {
      * 로그아웃 처리
      * @param req
      */
-    public void logout(LoginDto.LogoutReqDto req) {
+    public boolean logout(LoginDto.LogoutReqDto req) {
 
         TbUserCnncHs cnncHs = req.toCnncHsEntity();
-        this.cnncHsRepo.updateData(cnncHs.getLoginHms(), cnncHs.getUserId(), cnncHs.getLogoutHms());
+        Integer count = this.cnncHsRepo.updateData(cnncHs.getLoginHms(), cnncHs.getUserId(), cnncHs.getLogoutHms());
+        return count > 0;
         //this.cnncHsRepo.save(cnncHs);
     }
 

+ 1 - 1
src/main/resources/static/application/op/00.main/tick.js

@@ -2,4 +2,4 @@
 
 setInterval(() => {
     postMessage("_keepAlive");
-}, 5000);
+}, 20000);