From 09323e7895ae85319cd8afc51409be43cde90e3d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 18 Nov 2025 15:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 247b335..351b7ab 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;
@@ -52,6 +53,7 @@
* @return 服务器管理
*/
@Override
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdServerInfo> selectArdServerInfoList(ArdServerInfo ardServerInfo) {
return ardServerInfoMapper.selectArdServerInfoList(ardServerInfo);
}
@@ -144,8 +146,13 @@
* 修改服务器状态
*/
@Override
- public int updateServerStatus(String id) {
- return ardServerInfoMapper.updateServerStatus(id);
+ 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