From 9f3e1d5c58c8bc0caae91feea289643f2f8a72cf Mon Sep 17 00:00:00 2001 From: gaojie Date: Mon, 13 May 2019 16:01:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=9C=8D=E6=97=B6=E9=97=B4=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmfy/controller/ServerInfoController.java | 26 +++++++++++++- .../java/com/jmfy/model/CServerOpenTime.java | 31 +++++++++++++++++ .../java/com/jmfy/model/vo/ServerInfoVo.java | 34 +++++++++++++++++++ .../jmfy/redisProperties/RedisUserKey.java | 3 ++ src/main/resources/templates/index.html | 4 +-- src/main/resources/templates/member-list.html | 2 +- 6 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/jmfy/model/CServerOpenTime.java create mode 100644 src/main/java/com/jmfy/model/vo/ServerInfoVo.java diff --git a/src/main/java/com/jmfy/controller/ServerInfoController.java b/src/main/java/com/jmfy/controller/ServerInfoController.java index 12a1214..5f07f1b 100644 --- a/src/main/java/com/jmfy/controller/ServerInfoController.java +++ b/src/main/java/com/jmfy/controller/ServerInfoController.java @@ -1,7 +1,15 @@ package com.jmfy.controller; +import ch.qos.logback.core.util.TimeUtil; import com.jmfy.dao.ServerInfoDao; +import com.jmfy.model.CServerOpenTime; import com.jmfy.model.ServerInfo; +import com.jmfy.model.vo.ServerInfoVo; +import com.jmfy.redisProperties.GlobalsDef; +import com.jmfy.redisProperties.RedisUserKey; +import com.jmfy.utils.JsonUtil; +import com.jmfy.utils.RedisUtil; +import org.springframework.data.redis.core.TimeoutUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; @@ -23,7 +31,23 @@ public class ServerInfoController { @RequestMapping(value = "/findServerInfo", method = {RequestMethod.POST, RequestMethod.GET}) public String loginVerify(HttpSession session, ModelMap map) throws Exception { List serverInfos = serverInfoDao.getAllServerInfo(); - map.addAttribute("serverInfos", serverInfos); + List serverInfoVos = new ArrayList<>(); + for (ServerInfo serverInfo :serverInfos){ + ServerInfoVo serverInfoVo = new ServerInfoVo(); + serverInfoVo.setServer_id(serverInfo.getServer_id()); + serverInfoVo.setName(serverInfo.getName()); + serverInfoVo.setStatus(serverInfo.getStatus()); + serverInfoVo.setIsWhite(serverInfo.getIsWhite()); + CServerOpenTime cServerOpenTime = RedisUtil.getInstence().getObject(RedisUserKey.SERVER_OPEN_TIME_KEY, Integer.toString(serverInfo.getServer_id()), + CServerOpenTime.class, GlobalsDef.REDIS_OVER_TIME); + if (cServerOpenTime !=null){ + serverInfoVo.setOpen_time(JsonUtil.timeStamp2Date(String.valueOf(cServerOpenTime.getOpenTime() * 1000))); + }else{ + serverInfoVo.setOpen_time(JsonUtil.timeStamp2Date(String.valueOf(serverInfo.getOpen_time() *1000))); + } + 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 new file mode 100644 index 0000000..35e5a1c --- /dev/null +++ b/src/main/java/com/jmfy/model/CServerOpenTime.java @@ -0,0 +1,31 @@ +package com.jmfy.model; + +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.data.mongodb.core.mapping.Field; + +@Document(collection="c_server_open_time") +public class CServerOpenTime { + + @Id + private int id; // serverId + + @Field(value = "openTime") + private int openTime; // 精确到秒的时间戳 + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getOpenTime() { + return openTime; + } + + public void setOpenTime(int openTime) { + this.openTime = openTime; + } +} diff --git a/src/main/java/com/jmfy/model/vo/ServerInfoVo.java b/src/main/java/com/jmfy/model/vo/ServerInfoVo.java new file mode 100644 index 0000000..3cb74a7 --- /dev/null +++ b/src/main/java/com/jmfy/model/vo/ServerInfoVo.java @@ -0,0 +1,34 @@ +package com.jmfy.model.vo; + +public class ServerInfoVo{ + + public int server_id; + + public String name; + + public String open_time ; + + public int status; + + public int isWhite; + + public void setServer_id(int server_id) { + this.server_id = server_id; + } + + public void setName(String name) { + this.name = name; + } + + public void setOpen_time(String open_time) { + this.open_time = open_time; + } + + public void setStatus(int status) { + this.status = status; + } + + public void setIsWhite(int isWhite) { + this.isWhite = isWhite; + } +} diff --git a/src/main/java/com/jmfy/redisProperties/RedisUserKey.java b/src/main/java/com/jmfy/redisProperties/RedisUserKey.java index 6b7d7a1..5e952ab 100644 --- a/src/main/java/com/jmfy/redisProperties/RedisUserKey.java +++ b/src/main/java/com/jmfy/redisProperties/RedisUserKey.java @@ -15,6 +15,9 @@ public class RedisUserKey { public final static String Ban_Chat = "Ban_Chat"; + + public final static String SERVER_OPEN_TIME_KEY = "Server_Open_Time_Key"; + } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 964b51f..343f937 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -55,10 +55,10 @@
diff --git a/src/main/resources/templates/member-list.html b/src/main/resources/templates/member-list.html index fb339d8..813271b 100644 --- a/src/main/resources/templates/member-list.html +++ b/src/main/resources/templates/member-list.html @@ -23,7 +23,7 @@ 用户管理 - +