From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java | 182 +++++++++++++++++++++------------------------
1 files changed, 86 insertions(+), 96 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
index 2747f6a..6a41cb6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,96 +1,86 @@
-package com.ruoyi.system.service.impl;
-
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
-
-/**
- * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞�
- *
- * @author ruoyi
- */
-@Service
-public class SysUserOnlineServiceImpl implements ISysUserOnlineService
-{
- /**
- * 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅
- *
- * @param ipaddr 鐧诲綍鍦板潃
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- @Override
- public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)
- {
- if (StringUtils.equals(ipaddr, user.getIpaddr()))
- {
- return loginUserToUserOnline(user);
- }
- return null;
- }
-
- /**
- * 閫氳繃鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
- *
- * @param userName 鐢ㄦ埛鍚嶇О
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- @Override
- public SysUserOnline selectOnlineByUserName(String userName, LoginUser user)
- {
- if (StringUtils.equals(userName, user.getUsername()))
- {
- return loginUserToUserOnline(user);
- }
- return null;
- }
-
- /**
- * 閫氳繃鐧诲綍鍦板潃/鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
- *
- * @param ipaddr 鐧诲綍鍦板潃
- * @param userName 鐢ㄦ埛鍚嶇О
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
- */
- @Override
- public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user)
- {
- if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
- {
- return loginUserToUserOnline(user);
- }
- return null;
- }
-
- /**
- * 璁剧疆鍦ㄧ嚎鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鍦ㄧ嚎鐢ㄦ埛
- */
- @Override
- public SysUserOnline loginUserToUserOnline(LoginUser user)
- {
- if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser()))
- {
- return null;
- }
- SysUserOnline sysUserOnline = new SysUserOnline();
- sysUserOnline.setTokenId(user.getToken());
- sysUserOnline.setUserName(user.getUsername());
- sysUserOnline.setIpaddr(user.getIpaddr());
- sysUserOnline.setLoginLocation(user.getLoginLocation());
- sysUserOnline.setBrowser(user.getBrowser());
- sysUserOnline.setOs(user.getOs());
- sysUserOnline.setLoginTime(user.getLoginTime());
- if (StringUtils.isNotNull(user.getUser().getDept()))
- {
- sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
- }
- return sysUserOnline;
- }
-}
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysUserOnline;
+import com.ruoyi.system.service.ISysUserOnlineService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞�
+ *
+ * @author ruoyi
+ */
+@Service
+public class SysUserOnlineServiceImpl implements ISysUserOnlineService {
+ /**
+ * 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅
+ *
+ * @param ipaddr 鐧诲綍鍦板潃
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
+ */
+ @Override
+ public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) {
+ if (StringUtils.equals(ipaddr, user.getIpaddr())) {
+ return loginUserToUserOnline(user);
+ }
+ return null;
+ }
+
+ /**
+ * 閫氳繃鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
+ *
+ * @param userName 鐢ㄦ埛鍚嶇О
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
+ */
+ @Override
+ public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) {
+ if (StringUtils.equals(userName, user.getUsername())) {
+ return loginUserToUserOnline(user);
+ }
+ return null;
+ }
+
+ /**
+ * 閫氳繃鐧诲綍鍦板潃/鐢ㄦ埛鍚嶇О鏌ヨ淇℃伅
+ *
+ * @param ipaddr 鐧诲綍鍦板潃
+ * @param userName 鐢ㄦ埛鍚嶇О
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鍦ㄧ嚎鐢ㄦ埛淇℃伅
+ */
+ @Override
+ public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) {
+ if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
+ return loginUserToUserOnline(user);
+ }
+ return null;
+ }
+
+ /**
+ * 璁剧疆鍦ㄧ嚎鐢ㄦ埛淇℃伅
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鍦ㄧ嚎鐢ㄦ埛
+ */
+ @Override
+ public SysUserOnline loginUserToUserOnline(LoginUser user) {
+ if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser())) {
+ return null;
+ }
+ SysUserOnline sysUserOnline = new SysUserOnline();
+ sysUserOnline.setTokenId(user.getToken());
+ sysUserOnline.setUserName(user.getUsername());
+ sysUserOnline.setIpaddr(user.getIpaddr());
+ sysUserOnline.setLoginLocation(user.getLoginLocation());
+ sysUserOnline.setBrowser(user.getBrowser());
+ sysUserOnline.setOs(user.getOs());
+ sysUserOnline.setLoginTime(user.getLoginTime());
+ if (StringUtils.isNotNull(user.getUser().getDept())) {
+ sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
+ }
+ return sysUserOnline;
+ }
+}
--
Gitblit v1.9.3