From a6c3b8e6eb7a0d48649cfa93487532e62c353d37 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 24 八月 2023 15:03:55 +0800
Subject: [PATCH] 修改app从融云获取用户在线状态（有状态变化再更新数据库）
---
ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java | 2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RongCloudTask.java | 11 ++---
ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeServiceImpl.java | 34 ++++++++++++++++-
ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeService.java | 4 +-
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java | 18 ++++----
6 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index 4817868..385f1d5 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -775,6 +775,7 @@
return minDistanceCameraId;
}
+
/**
* 闆疯揪寮曞鍏ラ槦
*/
diff --git a/ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java b/ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java
index 7fc9943..5a2b3e6 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java
@@ -13,7 +13,7 @@
/**
* @ClassName WebSocketUtils
- * @Description:
+ * @Description: websocket宸ュ叿绫�
* @Author 鍒樿嫃涔�
* @Date 2023/1/27 7:46
* @Version 1.0
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java
index 41f593f..d2a8e8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizationController.java
@@ -18,11 +18,11 @@
@Resource
AuthorizeService authorizeService;
//鐢熸垚涓存椂鎺堟潈鍙湁涓�澶�
-// @PostMapping("/makeTempLicense")
-// public JSONObject makeTempLicense() {
-// JSONObject jsonObject = authorizeService.makeTempLicense();
-// return jsonObject;
-// }
+ @PostMapping("/makeTempLicense")
+ public JSONObject makeTempLicense() {
+ JSONObject jsonObject = authorizeService.makeTempLicense();
+ return jsonObject;
+ }
//鑾峰彇鏈哄櫒鐮�
@ApiOperation("鑾峰彇鏈哄櫒鐮�")
@PostMapping("/getMachineCode")
@@ -45,16 +45,16 @@
return data;
}
- //鑾峰彇鎺堟潈
+ //鍔犲瘑
@PostMapping(value = "/getLicense")
public String getLicense(@RequestBody String data) {
- String EncryptedStr = authorizeService.getLicense(data);
+ String EncryptedStr = authorizeService.encryption(data);
return EncryptedStr;
}
- //瑙ｆ瀽鎺堟潈
+ //瑙ｅ瘑
@PostMapping(value = "/parsLicense")
public String parsLicense(@RequestBody String data) {
- String DecryptStr = authorizeService.parsLicense(data);
+ String DecryptStr = authorizeService.decryption(data);
return DecryptStr;
}
}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RongCloudTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RongCloudTask.java
index ded475e..a009f10 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RongCloudTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RongCloudTask.java
@@ -28,24 +28,23 @@
ISysUserService sysUserService;
@Resource
RongCloudService rongCloudService;
+
/**
* 瀹氭椂鑾峰彇app鐢ㄦ埛鍦ㄧ嚎鐘舵��
* 鍒樿嫃涔�
* 2023/8/9 9:17:48
*/
public void getAppUserOnlineStateTask() {
-
try {
List<SysUser> SysUserList = sysUserService.selectAllAppUserList(new SysUser());
if (SysUserList.size() > 0) {
for (SysUser sysUser : SysUserList) {
+ Boolean appOnlineState = sysUser.getAppOnlineState().equals("1");
Boolean online = rongCloudService.checkOnline(sysUser.getUserId());
- if (online) {
- sysUser.setAppOnlineState("1");
- } else {
- sysUser.setAppOnlineState("0");
+ if (!appOnlineState.equals(online)) {
+ sysUser.setAppOnlineState(online ? "1" : "0");
+ sysUserService.updateUserProfile(sysUser);
}
- sysUserService.updateUserProfile(sysUser);
}
}
} catch (Exception ex) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeService.java b/ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeService.java
index 54c2347..024174b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeService.java
@@ -10,6 +10,6 @@
JSONObject getMachineCode();//鑾峰彇鏈哄櫒鐮�
JSONObject uploadLicense(MultipartFile file);//涓婁紶鎺堟潈鏂囦欢
- String getLicense(String data);//鍔犲瘑
- String parsLicense(String data);//瑙ｅ瘑
+ String encryption(String data);//鍔犲瘑
+ String decryption(String data);//瑙ｅ瘑
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeServiceImpl.java
index ace1807..653aa26 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/authorize/service/AuthorizeServiceImpl.java
@@ -95,6 +95,11 @@
return null;
}
+ /**
+ * 楠岃瘉鎺堟潈
+ *
+ * @return JSONObject
+ */
@Override
public JSONObject verifyAuthorization() {
try {
@@ -145,6 +150,11 @@
}
}
+ /**
+ * 鍒朵綔涓存椂鎺堟潈
+ *
+ * @return JSONObject
+ */
@Override
public JSONObject makeTempLicense() {
String savedDir = System.getProperty("user.dir") + "\\ardLicense";
@@ -155,6 +165,11 @@
return data;
}
+ /**
+ * 鑾峰彇鏈哄櫒鐮�
+ *
+ * @return JSONObject
+ */
@Override
public JSONObject getMachineCode() {
try {
@@ -171,6 +186,11 @@
}
}
+ /**
+ * 涓婁紶鎺堟潈鏂囦欢
+ *
+ * @return JSONObject
+ */
@Override
public JSONObject uploadLicense(MultipartFile file) {
try {
@@ -196,8 +216,13 @@
}
}
+ /**
+ * 鍔犲瘑鎺堟潈鏁版嵁
+ *
+ * @return JSONObject
+ */
@Override
- public String getLicense(String data) {
+ public String encryption(String data) {
String codeString = "";
try {
if (data != "") {
@@ -216,8 +241,13 @@
}
}
+ /**
+ * 瑙ｅ瘑鎺堟潈鏁版嵁
+ *
+ * @return JSONObject
+ */
@Override
- public String parsLicense(String data) {
+ public String decryption(String data) {
String codeString = "";
try {
if (data != "") {
--
Gitblit v1.9.3