From e534b5d89ef838ba7236f72d1700d817ffbc8e15 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 23 Jul 2021 13:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E5=92=8C=E9=87=8D=E5=90=AF=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmfy/controller/ServerInfoController.java | 6 ++- .../java/com/jmfy/model/CServerOpenTime.java | 38 ++++++++++++++++++- .../java/com/jmfy/model/vo/ServerInfoVo.java | 25 ++++++++++-- .../resources/templates/findServerInfo.html | 6 ++- src/main/resources/templates/welcome.html | 8 +--- 5 files changed, 69 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/jmfy/controller/ServerInfoController.java b/src/main/java/com/jmfy/controller/ServerInfoController.java index b083d95..ffdc3b2 100644 --- a/src/main/java/com/jmfy/controller/ServerInfoController.java +++ b/src/main/java/com/jmfy/controller/ServerInfoController.java @@ -59,19 +59,21 @@ public class ServerInfoController { CServerOpenTime cServerOpenTime = serverInfoDao.getOpenServerTime(serverInfo.getServer_id()); if (null != cServerOpenTime) { serverInfoVo.setOpen_time(cServerOpenTime.getOpenTime()); + serverInfoVo.setVersion(cServerOpenTime.getVersion()); + serverInfoVo.setRestartTime(cServerOpenTime.getRestartTime()); } - serverInfoVos.add(serverInfoVo); serverInfoVo.setIp_port(serverInfo.getIP()+":"+serverInfo.getPort()); String openT = "手动开服"; if(serverInfo.getOpen_type()!=null&&serverInfo.getOpen_type().equals(Constants.SERVEROPEN_TIME)){ - openT = RedisUtil.getInstence().getObject(String.valueOf(serverInfo.getServer_id()) + RedisUserKey.Delimiter_colon + RedisUserKey.AUTOOPENTIME, "", String.class, -1); + openT = RedisUtil.getInstence().getObject(serverInfo.getServer_id() + RedisUserKey.Delimiter_colon + RedisUserKey.AUTOOPENTIME, "", String.class, -1); }else if(serverInfo.getOpen_type()!=null&&serverInfo.getOpen_type().equals(Constants.SERVEROPEN_NUM)) { openT = "按量开服"; } if(null!=openT) { serverInfoVo.setOpen_type(openT); } + serverInfoVos.add(serverInfoVo); } map.addAttribute("serverInfos", serverInfoVos); return "findServerInfo"; diff --git a/src/main/java/com/jmfy/model/CServerOpenTime.java b/src/main/java/com/jmfy/model/CServerOpenTime.java index 0ce7a7a..d689b88 100644 --- a/src/main/java/com/jmfy/model/CServerOpenTime.java +++ b/src/main/java/com/jmfy/model/CServerOpenTime.java @@ -7,11 +7,29 @@ import org.springframework.data.mongodb.core.mapping.Field; @Document(collection="server_config") public class CServerOpenTime { + /** + * serverId + */ @Id - private int id; // serverId + private int id; + /** + * 精确到秒的时间戳 + */ @Field(value = "open_time") - private String openTime; // 精确到秒的时间戳 + private String openTime; + + /** + * 版本号 + */ + @Field(value = "version") + private int version; + + /** + * 重启时间 + */ + @Field(value = "restartTime") + private String restartTime; public int getId() { return id; @@ -28,4 +46,20 @@ public class CServerOpenTime { public void setOpenTime(String openTime) { this.openTime = openTime; } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getRestartTime() { + return restartTime; + } + + public void setRestartTime(String restartTime) { + this.restartTime = restartTime; + } } diff --git a/src/main/java/com/jmfy/model/vo/ServerInfoVo.java b/src/main/java/com/jmfy/model/vo/ServerInfoVo.java index 792c0b6..5ffa35b 100644 --- a/src/main/java/com/jmfy/model/vo/ServerInfoVo.java +++ b/src/main/java/com/jmfy/model/vo/ServerInfoVo.java @@ -5,13 +5,14 @@ public class ServerInfoVo{ public String server_id; public String ip_port; public String name; - public String open_time ; - public String open_type ; + public String open_time; + public String open_type; public int status; public int is_new; public long registerNum; public long onlineNum; - + private int version; + private String restartTime; public void setIsnew(int isnew) { this.is_new = isnew; @@ -60,6 +61,22 @@ public class ServerInfoVo{ this.ip_port = ip_port; } + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getRestartTime() { + return restartTime; + } + + public void setRestartTime(String restartTime) { + this.restartTime = restartTime; + } + @Override public String toString() { return "ServerInfoVo{" + @@ -72,6 +89,8 @@ public class ServerInfoVo{ ", is_new=" + is_new + ", registerNum=" + registerNum + ", onlineNum=" + onlineNum + + ", version='" + version + '\'' + + ", restartTime='" + restartTime + '\'' + '}'; } } diff --git a/src/main/resources/templates/findServerInfo.html b/src/main/resources/templates/findServerInfo.html index 71caf50..8aba60d 100644 --- a/src/main/resources/templates/findServerInfo.html +++ b/src/main/resources/templates/findServerInfo.html @@ -81,6 +81,8 @@ 开启时间 服务器状态 新服推荐 + 版本号 + 上次重启时间 操作 @@ -109,8 +111,10 @@ 普通 新服推荐 + + - + diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html index f09fb58..7316095 100644 --- a/src/main/resources/templates/welcome.html +++ b/src/main/resources/templates/welcome.html @@ -26,12 +26,8 @@

戒灵后台管理台

-

更新日志[2021-6-28]

-

1、序列号查询功能修改优化

-

2、gm管理-->添加游戏隐私协议管理功能

-

3、扶持账号申请添加账号重复验证

-

4、用户管理-->添加渠道包管理功能

-

5、订单列表-->添加渠道权限

+

更新日志[2021-7-23]

+

1、服务器信息列表添加版本号和上次重启时间展示