From 579f3590f60df0e26c3400394222b26d3d7cc87c Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Thu, 25 Dec 2025 15:45:22 +0800
Subject: [PATCH] 1. 新增盒子编码，检查是否有重复的盒子编码。
---
ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 636696e..025eee6 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;
@@ -28,9 +29,11 @@
public class ArdServerInfoServiceImpl implements IArdServerInfoService {
@Resource
- private ArdServerInfoMapper ardServerInfoMapper;
- @Resource
private TyClient tyClient;
+
+ @Resource
+ private ArdServerInfoMapper ardServerInfoMapper;
+
@Resource
private TyTcpClientManager tyTcpClientManager;
@@ -52,6 +55,7 @@
* @return 服务器管理
*/
@Override
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdServerInfo> selectArdServerInfoList(ArdServerInfo ardServerInfo) {
return ardServerInfoMapper.selectArdServerInfoList(ardServerInfo);
}
@@ -122,7 +126,7 @@
@Override
public AccessTokenReceiver getAccessToken(String id) {
long timeStamp = getTimeStamp();
- AccessTokenReceiver accessToken = null;
+
ArdServerInfo serverInfo = selectArdServerInfoById(id);
// 准备请求的json
TokenDTO gtd = TokenDTO.builder()
@@ -130,22 +134,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);
+ 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