From 3e64fc031eb42fb66f78104d0ff0f6cf797db0f0 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 08 Dec 2025 11:31:08 +0800
Subject: [PATCH] 优化六合边缘服务器超时无人机和服务状态同步
---
ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
index 7bda66c..d4063de 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.ard.work.service.impl;
+import com.ard.common.annotation.DataScope;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.work.component.forest.TyClient;
import com.ard.work.component.netty.TyTcpClientManager;
@@ -9,6 +10,7 @@
import com.ard.work.domain.receiver.TyHttpCommonReceiver;
import com.ard.work.mapper.ArdServerInfoMapper;
import com.ard.work.service.IArdServerInfoService;
+import com.dtflys.forest.exceptions.ForestRuntimeException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.util.DigestUtils;
@@ -52,6 +54,7 @@
* @return 服务器管理
*/
@Override
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdServerInfo> selectArdServerInfoList(ArdServerInfo ardServerInfo) {
return ardServerInfoMapper.selectArdServerInfoList(ardServerInfo);
}
@@ -122,7 +125,7 @@
@Override
public AccessTokenReceiver getAccessToken(String id) {
long timeStamp = getTimeStamp();
- AccessTokenReceiver accessToken = null;
+
ArdServerInfo serverInfo = selectArdServerInfoById(id);
// 准备请求的json
TokenDTO gtd = TokenDTO.builder()
@@ -130,14 +133,27 @@
.encryptStr(getEncryptStr(serverInfo, timeStamp))
.timeStamp(timeStamp)
.build();
- try {
- TyHttpCommonReceiver<AccessTokenReceiver> getTokenRes = tyClient.getToken(id, gtd);
- accessToken = getTokenRes.getContent();
- } catch (Exception e) {
- log.error("获取token失败:{}", e.getMessage());
- }
+ // try {
+ TyHttpCommonReceiver<AccessTokenReceiver> getTokenRes = tyClient.getToken(id, gtd);
+ return getTokenRes.getContent();
+// } catch (Exception e) {
+// log.error("获取 Token 失败 serverId={}, 异常: {}", id, e.getMessage());
+// return null; // 请求失败返回 null
+// }
//{"state":0,"content":{"companyId":4127,"accessToken":"sOONT0MMVdoKcMBibb40xxgrUrq0Hw9RFiajic3KOzoNtk"}}
- return accessToken;
+ }
+
+ /**
+ * 修改服务器状态
+ */
+ @Override
+ public int updateServerStatus(String id, String status) {
+ return ardServerInfoMapper.updateServerStatus(id, status);
+ }
+
+ @Override
+ public List<String> getServerIdsList() {
+ return ardServerInfoMapper.getServerIdsList();
}
private String getEncryptStr(ArdServerInfo serverInfo, long timeStamp) {
--
Gitblit v1.9.3