合服显示id问题

master
PC-202302260912\Administrator 2023-09-04 16:05:25 +08:00
parent b7d9e6c30b
commit e540bd6a35
3 changed files with 18 additions and 2 deletions

View File

@ -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;
}

View File

@ -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;
}
}

View File

@ -45,7 +45,7 @@
<tr class="text-c" >
<th>服务器id</th>
<th>地址端口</th>
<th>开启类型</th>
<th>主服id</th>
<th>服务器名字</th>
<th>渠道</th>
<th>子渠道</th>
@ -64,7 +64,7 @@
<tr th:each="obj:${serverInfos}">
<td th:text="${obj.getServer_id()}" style="text-align: center;"></td>
<td th:text="${obj.getIpAndPort()}" style="text-align: center;"></td>
<td th:text="${obj.getOpenType()}" style="text-align: center;"></td>
<td th:text="${obj.getMasterServerId()}" style="text-align: center;"></td>
<td th:text="${obj.getName()}" style="text-align: center;"></td>
<td th:text="${obj.getChannel()}" style="text-align: center;"></td>
<td th:text="${obj.getSub_channel()}" style="text-align: center;"></td>