From e540bd6a356e62270917f631a34cb4e2d472605c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Mon, 4 Sep 2023 16:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E6=9C=8D=E6=98=BE=E7=A4=BAid=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/ServerInfoController.java | 2 ++ src/main/java/com/jmfy/model/vo/ServerInfoVo.java | 14 ++++++++++++++ src/main/resources/templates/findServerInfo.html | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jmfy/controller/ServerInfoController.java b/src/main/java/com/jmfy/controller/ServerInfoController.java index 0b4fad8..c82763f 100644 --- a/src/main/java/com/jmfy/controller/ServerInfoController.java +++ b/src/main/java/com/jmfy/controller/ServerInfoController.java @@ -3,6 +3,7 @@ package com.jmfy.controller; import com.jmfy.dao.CUserDao; import com.jmfy.dao.ServerInfoDao; import com.jmfy.handler.GMHandler; +import com.jmfy.handler.HeFuManager; import com.jmfy.handler.RedisLogic; import com.jmfy.model.AssSetting; import com.jmfy.model.CAdmin; @@ -141,6 +142,7 @@ public class ServerInfoController { vo.setRestartTime(openTime.getRestartTime()); vo.setVersion(openTime.getVersion()); } + vo.setMasterServerId(HeFuManager.getHefuServerId(serverInfo.getServerId())); return vo; } diff --git a/src/main/java/com/jmfy/model/vo/ServerInfoVo.java b/src/main/java/com/jmfy/model/vo/ServerInfoVo.java index 2db383c..d885943 100644 --- a/src/main/java/com/jmfy/model/vo/ServerInfoVo.java +++ b/src/main/java/com/jmfy/model/vo/ServerInfoVo.java @@ -80,6 +80,12 @@ public class ServerInfoVo extends ServerInfo { @Transient private int cross; + /** + * 主服id + */ + @Transient + private int masterServerId; + public ServerInfoVo(){ } @@ -204,6 +210,14 @@ public class ServerInfoVo extends ServerInfo { public String getGroupShow(){ return getCrossGroupId()+"("+getOldGroupId()+")"; } + + public int getMasterServerId() { + return masterServerId; + } + + public void setMasterServerId(int masterServerId) { + this.masterServerId = masterServerId; + } } diff --git a/src/main/resources/templates/findServerInfo.html b/src/main/resources/templates/findServerInfo.html index ea99503..ff7b0be 100644 --- a/src/main/resources/templates/findServerInfo.html +++ b/src/main/resources/templates/findServerInfo.html @@ -45,7 +45,7 @@ 服务器id 地址端口 - 开启类型 + 主服id 服务器名字 渠道 子渠道 @@ -64,7 +64,7 @@ - +