From d7c9280ec2b5d1b3878bd0672168ef2a0a7d459f Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 10 Sep 2019 16:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/LoginController.java | 10 +- .../jmfy/controller/QuestionController.java | 130 ++++++++++++++---- .../jmfy/controller/ServerInfoController.java | 18 ++- src/main/java/com/jmfy/dao/ServerInfoDao.java | 2 +- .../java/com/jmfy/dao/impl/GSUserDaoImpl.java | 2 +- .../com/jmfy/dao/impl/ServerInfoDaoImpl.java | 5 +- .../com/jmfy/model/CQuestionCoreBean.java | 27 ++++ .../com/jmfy/model/CQuestionOptionBean.java | 20 +-- src/main/java/com/jmfy/model/ServerInfo.java | 11 ++ .../java/com/jmfy/model/vo/CQuestSendVo.java | 50 +++++++ .../java/com/jmfy/model/vo/ServerInfoVo.java | 6 + .../jmfy/redisProperties/RedisUserKey.java | 1 + src/main/java/com/jmfy/utils/RedisUtil.java | 14 ++ .../resources/static/html/getquestInfo.html | 2 +- .../static/html/getquestSendInfo.html | 88 ++++++++++++ src/main/resources/static/html/question.html | 39 +++++- .../resources/templates/findServerInfo.html | 5 + src/main/resources/templates/index.html | 1 + .../resources/templates/questsendInfo.html | 65 +++++++++ .../resources/templates/serverInfoEdit.html | 20 +++ 20 files changed, 467 insertions(+), 49 deletions(-) create mode 100644 src/main/java/com/jmfy/model/CQuestionCoreBean.java create mode 100644 src/main/java/com/jmfy/model/vo/CQuestSendVo.java create mode 100644 src/main/resources/static/html/getquestSendInfo.html create mode 100644 src/main/resources/templates/questsendInfo.html diff --git a/src/main/java/com/jmfy/controller/LoginController.java b/src/main/java/com/jmfy/controller/LoginController.java index 553073f..37e4dfc 100644 --- a/src/main/java/com/jmfy/controller/LoginController.java +++ b/src/main/java/com/jmfy/controller/LoginController.java @@ -1,10 +1,15 @@ package com.jmfy.controller; +import com.google.gson.Gson; import com.jmfy.dao.CUserDao; import com.jmfy.model.CAdmin; +import com.jmfy.model.CQuestionCoreBean; import com.jmfy.model.vo.CAdminVo; +import com.jmfy.model.vo.CQuestSendVo; import com.jmfy.model.vo.PowersVo; +import com.jmfy.redisProperties.RedisUserKey; import com.jmfy.utils.JsonUtil; +import com.jmfy.utils.RedisUtil; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.ui.ModelMap; @@ -14,9 +19,7 @@ import com.jmfy.WebSecurityConfig; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; +import java.util.*; /** * Created by huangds on 2017/10/24. @@ -216,4 +219,5 @@ public class LoginController { return power.toString(); } + } diff --git a/src/main/java/com/jmfy/controller/QuestionController.java b/src/main/java/com/jmfy/controller/QuestionController.java index 906d6a4..0df87c7 100644 --- a/src/main/java/com/jmfy/controller/QuestionController.java +++ b/src/main/java/com/jmfy/controller/QuestionController.java @@ -1,12 +1,16 @@ package com.jmfy.controller; +import com.google.gson.Gson; import com.jmfy.dao.QuestDao; import com.jmfy.dao.ServerInfoDao; import com.jmfy.dao.impl.GSUserDaoImpl; import com.jmfy.model.*; +import com.jmfy.model.vo.CQuestSendVo; import com.jmfy.model.vo.CQuestVo; -import com.jmfy.model.vo.CUserVo; +import com.jmfy.redisProperties.GlobalsDef; +import com.jmfy.redisProperties.RedisUserKey; import com.jmfy.utils.JsonUtil; +import com.jmfy.utils.RedisUtil; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +20,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; /** * Created by huangds on 2017/10/24. @@ -33,6 +36,9 @@ public class QuestionController { @Resource private GSUserDaoImpl gsUserDao; + private Gson gson = new Gson(); + private static final DateFormat ymdhmsFormat_new = new SimpleDateFormat("yyyyMMddHHmm"); + @RequestMapping(value = "/updataQuest", method = {RequestMethod.POST, RequestMethod.GET}) public @ResponseBody int sendNotice(HttpSession session, HttpServletRequest request) throws Exception { @@ -43,14 +49,19 @@ public class QuestionController { serverList.add(serverInfo.getServer_id()); } - Map map = request.getParameterMap(); + CQuestionBean cQuestion = getQuest(request); + if (null == cQuestion) { + return 1; + } String serveIds = request.getParameter("serverId"); + CQuestionCoreBean cQuestionCoreBean = new CQuestionCoreBean(); + cQuestionCoreBean.setcQuestionBean(cQuestion); + cQuestionCoreBean.setServerId(serveIds); + RedisUtil.getInstence().putMapEntry(RedisUserKey.QUESTION_FROMBACK_ALL, + "", cQuestion.getId(), cQuestionCoreBean, GlobalsDef.REDIS_OVER_FOREVER); + if (serveIds.equals("0")) {//全服 for (ServerInfo serverInfo : allServerInfo) { - CQuestionBean cQuestion = getQuest(request); - if (null == cQuestion) { - continue; - } try { questDao.updataQuest(cQuestion, serverInfo.getServer_id()); } catch (Exception e) { @@ -64,10 +75,6 @@ public class QuestionController { if (!serverList.contains(str)) { continue; } - CQuestionBean cQuestion = getQuest(request); - if (null == cQuestion) { - continue; - } try { questDao.updataQuest(cQuestion, str); } catch (Exception e) { @@ -99,18 +106,20 @@ public class QuestionController { String[] questions = paramMap.get("question"); String[] questiontype = paramMap.get("questiontype"); + String[] answertype = paramMap.get("answertype"); if (questions.length != questiontype.length) { return null; } for (int i = 0; i < questions.length; i++) { - if (questiontype[i] == "2") { + if (questiontype[i].equals("2")) { continue; } else { int j = i + 1; String index = "questiontype_" + j + "_select"; CQuestionOptionBean cQuestionOptionBean = new CQuestionOptionBean(); cQuestionOptionBean.setType(Integer.valueOf(questiontype[i])); + cQuestionOptionBean.setAnswerType(Integer.valueOf(answertype[i])); cQuestionOptionBean.setContent(questions[i]); cQuestionOptionBean.setOptions(paramMap.get(index)); cQuestion.getcQuestionOptionBeans().add(cQuestionOptionBean); @@ -135,14 +144,18 @@ public class QuestionController { } if (serveIds.equals("0")) {//全服 for (ServerInfo serverInfo : allServerInfo) { - for (GSUser gsUser: gsUserDao.findAllUserInfo(Integer.valueOf(serverInfo.getServer_id()),Integer.valueOf(questId))){ - CQuestVo cQuestVo = getcUserVo(gsUser,questId); - if(null==cQuestVo){ - continue; + try { + for (GSUser gsUser : gsUserDao.findAllUserInfo(Integer.valueOf(serverInfo.getServer_id()), Integer.valueOf(questId))) { + CQuestVo cQuestVo = getcUserVo(gsUser, questId); + if (null == cQuestVo) { + continue; + } + cQuestVo.setServerId(Integer.valueOf(serverInfo.getServer_id())); + cQuestVos.add(cQuestVo); } - cQuestVo.setServerId(Integer.valueOf(serverInfo.getServer_id())); - cQuestVos.add(cQuestVo); + } catch (Exception e) { } + } } else { // 发送指定服务器公告 String[] split = serveIds.split(","); @@ -150,9 +163,9 @@ public class QuestionController { if (!serverList.contains(str)) { continue; } - for (GSUser gsUser: gsUserDao.findAllUserInfo(Integer.valueOf(str),Integer.valueOf(questId))){ - CQuestVo cQuestVo = getcUserVo(gsUser,questId); - if(null==cQuestVo){ + for (GSUser gsUser : gsUserDao.findAllUserInfo(Integer.valueOf(str), Integer.valueOf(questId))) { + CQuestVo cQuestVo = getcUserVo(gsUser, questId); + if (null == cQuestVo) { continue; } cQuestVo.setServerId(Integer.valueOf(str)); @@ -166,7 +179,7 @@ public class QuestionController { } - private CQuestVo getcUserVo(GSUser gsUser, String questId){ + private CQuestVo getcUserVo(GSUser gsUser, String questId) { CQuestVo cQuestVo = new CQuestVo(); if (gsUser == null) { return null; @@ -174,11 +187,76 @@ public class QuestionController { cQuestVo.setUserId(gsUser.getId()); cQuestVo.setLevel(gsUser.getPlayerManager().getLevel()); cQuestVo.setSave_amt(gsUser.getPlayerManager().getRechargeInfo().getSaveAmt()); - List answers = gsUser.getQuestionManagerBean().getAnswerMap().getOrDefault(questId,new ArrayList<>()); + List answers = gsUser.getQuestionManagerBean().getAnswerMap().getOrDefault(questId, new ArrayList<>()); String[] strings = new String[answers.size()]; cQuestVo.setAnswer(answers.toArray(strings)); } return cQuestVo; } + + @RequestMapping(value = "/sendquestion", method = {RequestMethod.POST, RequestMethod.GET}) + public String sendquestion(HttpSession session, ModelMap map, HttpServletRequest request) throws Exception { + Set cQuestSendVo; + + HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String serveIds = request.getParameter("serverId"); + + String backtype = parameterMap.get("backtype"); + switch (backtype) { + case "0": + cQuestSendVo = new TreeSet<>((o1, o2) -> -1); + break; + case "1": + cQuestSendVo = new TreeSet<>((o1, o2) -> { + if (Long.valueOf(o1.getStart()) > Long.valueOf(o2.getStart())) { + return -1; + } else if (Long.valueOf(o1.getStart()).equals(Long.valueOf(o2.getStart()))) { + return 0; + } else { + return 1; + } + }); + break; + default: + cQuestSendVo = new TreeSet<>((o1, o2) -> { + if (Long.valueOf(o1.getEnd()) > Long.valueOf(o2.getEnd())) { + return -1; + } else if (Long.valueOf(o1.getEnd()).equals(Long.valueOf(o2.getEnd()))) { + return 0; + } else { + return 1; + } + }); + + } + + List filter = new ArrayList<>(); + if (!serveIds.equals("0")) { + String[] split = serveIds.split(","); + filter = Arrays.asList(split); + } + + + Map valueMap = RedisUtil.getInstence().getRedisMapString(RedisUserKey.QUESTION_FROMBACK_ALL + RedisUserKey.Delimiter_colon); + + if (filter.size() != 0) { + filter.forEach(valueMap::remove); + } + Map treeMap = new TreeMap<>(valueMap); + treeMap.forEach((key, value) -> { + CQuestionCoreBean cQuestionCoreBean = gson.fromJson(value, CQuestionCoreBean.class); + CQuestSendVo cQuestSendVo1 = new CQuestSendVo(); + cQuestSendVo1.setServerid(cQuestionCoreBean.getServerId()); + cQuestSendVo1.setId(Integer.valueOf(key)); + Date data = new Date(Long.valueOf(cQuestionCoreBean.getcQuestionBean().getStart()) * 1000L); + cQuestSendVo1.setStart(ymdhmsFormat_new.format(data)); + Date data2 = new Date(Long.valueOf(cQuestionCoreBean.getcQuestionBean().getEnd()) * 1000L); + cQuestSendVo1.setEnd(ymdhmsFormat_new.format(data2)); + cQuestSendVo1.setValue(value); + cQuestSendVo.add(cQuestSendVo1); + }); + map.addAttribute("cQuestSendVo", cQuestSendVo); + return "questsendInfo"; + } } diff --git a/src/main/java/com/jmfy/controller/ServerInfoController.java b/src/main/java/com/jmfy/controller/ServerInfoController.java index 16d6b0f..fd0ccd1 100644 --- a/src/main/java/com/jmfy/controller/ServerInfoController.java +++ b/src/main/java/com/jmfy/controller/ServerInfoController.java @@ -40,6 +40,10 @@ public class ServerInfoController { serverInfoVo.setServer_id(String.valueOf(serverInfo.getServer_id())); serverInfoVo.setName(serverInfo.getName()); serverInfoVo.setStatus(Integer.valueOf(serverInfo.getStatus())); + if(null!= serverInfo.getIs_new()){ + serverInfoVo.setIsnew(Integer.valueOf(serverInfo.getIs_new())); + } + CServerOpenTime cServerOpenTime = RedisUtil.getInstence().getObject(RedisUserKey.SERVER_OPEN_TIME_KEY, serverInfo.getServer_id(), CServerOpenTime.class, GlobalsDef.REDIS_OVER_TIME); if (cServerOpenTime !=null){ @@ -54,6 +58,14 @@ public class ServerInfoController { return "findServerInfo"; } + /** + * 编辑服务器 + * @param session + * @param map + * @param id + * @return + * @throws Exception + */ @RequestMapping(value = "/toServerInfoEdit", method = {RequestMethod.POST, RequestMethod.GET}) public String toServerInfoEdit(HttpSession session, ModelMap map, int id) throws Exception { ServerInfo serverInfo = serverInfoDao.getServerinfo(id); @@ -64,16 +76,18 @@ public class ServerInfoController { public String toServerInfoEdit(HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { List serverInfoVos = new ArrayList<>(); int status = Integer.parseInt(request.getParameter("status")); -// int isWhite = Integer.parseInt(request.getParameter("isWhite")); + String name = request.getParameter("name"); int server_id = Integer.parseInt(request.getParameter("server_id")); + int isnew = Integer.parseInt(request.getParameter("isnew")); // int isCommend = Integer.parseInt(request.getParameter("isCommend")); - serverInfoDao.updateServerInfo(server_id,status,0,0); + serverInfoDao.updateServerInfo(server_id,status,0,isnew,name); ServerInfo serverInfo = serverInfoDao.getServerinfo(server_id); if (serverInfo != null){ ServerInfoVo serverInfoVo = new ServerInfoVo(); serverInfoVo.setServer_id(String.valueOf(serverInfo.getServer_id())); serverInfoVo.setName(serverInfo.getName()); serverInfoVo.setStatus(Integer.valueOf(serverInfo.getStatus())); + serverInfoVo.setIsnew(isnew); serverInfoVos.add(serverInfoVo); }else{ return "404"; diff --git a/src/main/java/com/jmfy/dao/ServerInfoDao.java b/src/main/java/com/jmfy/dao/ServerInfoDao.java index dfa4e0b..b52ebc0 100644 --- a/src/main/java/com/jmfy/dao/ServerInfoDao.java +++ b/src/main/java/com/jmfy/dao/ServerInfoDao.java @@ -15,7 +15,7 @@ public interface ServerInfoDao { void openServerWhite(int server_id) throws Exception; - void updateServerInfo(int server_id, int status,int isWhite,int isCommend) throws Exception; + void updateServerInfo(int server_id, int status,int isWhite,int isnew,String name) throws Exception; void updateOpenServerTime(CServerOpenTime cServerOpenTime) throws Exception; diff --git a/src/main/java/com/jmfy/dao/impl/GSUserDaoImpl.java b/src/main/java/com/jmfy/dao/impl/GSUserDaoImpl.java index 30176f6..b15b239 100644 --- a/src/main/java/com/jmfy/dao/impl/GSUserDaoImpl.java +++ b/src/main/java/com/jmfy/dao/impl/GSUserDaoImpl.java @@ -75,7 +75,7 @@ public class GSUserDaoImpl implements GSUserDao { public List findAllUserInfo(int serverId,int questionId) throws Exception { String dbName = MongoName.getMongoDBName(serverId); MongoTemplate mongoTemplate = connect.getMongoTemplete(dbName); - Query query = new Query(Criteria.where("questionManager.questionMap."+questionId).exists(true)); + Query query = new Query(Criteria.where("questionManager.answerMap."+questionId).exists(true)); return mongoTemplate.find(query,GSUser.class); } } diff --git a/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java b/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java index f0ba9e6..54f4d33 100644 --- a/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java +++ b/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java @@ -59,11 +59,12 @@ public class ServerInfoDaoImpl implements ServerInfoDao { } @Override - public void updateServerInfo(int server_id, int status,int isWhite,int isCommend) throws Exception { + public void updateServerInfo(int server_id, int status,int isWhite,int is_new,String name) throws Exception { Update update = new Update(); + update.set("name",name); update.set("status",status); update.set("isWhite",isWhite); - update.set("is_ommend",isCommend); + update.set("is_new",is_new); MongoTemplate mongoTemplate = connect.getMongoTemplete(dbName); Query query = new Query(Criteria.where("server_id").is(String.valueOf(server_id))); mongoTemplate.updateMulti(query, update, ServerInfo.class); diff --git a/src/main/java/com/jmfy/model/CQuestionCoreBean.java b/src/main/java/com/jmfy/model/CQuestionCoreBean.java new file mode 100644 index 0000000..9b26cac --- /dev/null +++ b/src/main/java/com/jmfy/model/CQuestionCoreBean.java @@ -0,0 +1,27 @@ +package com.jmfy.model; + +import java.util.ArrayList; +import java.util.List; + +public class CQuestionCoreBean { + + private String serverId; + private CQuestionBean cQuestionBean; + + public String getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } + + public CQuestionBean getcQuestionBean() { + return cQuestionBean; + } + + public void setcQuestionBean(CQuestionBean cQuestionBean) { + this.cQuestionBean = cQuestionBean; + } +} + diff --git a/src/main/java/com/jmfy/model/CQuestionOptionBean.java b/src/main/java/com/jmfy/model/CQuestionOptionBean.java index 47e458a..5a28180 100644 --- a/src/main/java/com/jmfy/model/CQuestionOptionBean.java +++ b/src/main/java/com/jmfy/model/CQuestionOptionBean.java @@ -1,19 +1,13 @@ 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; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - public class CQuestionOptionBean { - String content = ""; + private String content = ""; + private int answerType; private int type; private String[] options ; + public String getContent() { return content; } @@ -37,5 +31,13 @@ public class CQuestionOptionBean { public void setOptions(String[] options) { this.options = options; } + + public int getAnswerType() { + return answerType; + } + + public void setAnswerType(int answerType) { + this.answerType = answerType; + } } diff --git a/src/main/java/com/jmfy/model/ServerInfo.java b/src/main/java/com/jmfy/model/ServerInfo.java index cdc37d4..77c7ca8 100644 --- a/src/main/java/com/jmfy/model/ServerInfo.java +++ b/src/main/java/com/jmfy/model/ServerInfo.java @@ -43,6 +43,9 @@ public class ServerInfo { @Field(value = "open_time") private String open_time; + @Field(value = "is_new") + private String is_new; + public int get_id() { return _id; } @@ -122,4 +125,12 @@ public class ServerInfo { public void setOpen_time(String open_time) { this.open_time = open_time; } + + public String getIs_new() { + return is_new; + } + + public void setIs_new(String is_new) { + this.is_new = is_new; + } } diff --git a/src/main/java/com/jmfy/model/vo/CQuestSendVo.java b/src/main/java/com/jmfy/model/vo/CQuestSendVo.java new file mode 100644 index 0000000..68ba696 --- /dev/null +++ b/src/main/java/com/jmfy/model/vo/CQuestSendVo.java @@ -0,0 +1,50 @@ +package com.jmfy.model.vo; + +public class CQuestSendVo implements java.io.Serializable { + + public int id; + public String serverid; + public String start; + public String endt; + public String value; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getStart() { + return start; + } + + public void setStart(String start) { + this.start = start; + } + + public String getEnd() { + return endt; + } + + public void setEnd(String end) { + this.endt = end; + } + + public String getServerid() { + return serverid; + } + + public void setServerid(String serverid) { + this.serverid = serverid; + } +} diff --git a/src/main/java/com/jmfy/model/vo/ServerInfoVo.java b/src/main/java/com/jmfy/model/vo/ServerInfoVo.java index b9e7a99..152644a 100644 --- a/src/main/java/com/jmfy/model/vo/ServerInfoVo.java +++ b/src/main/java/com/jmfy/model/vo/ServerInfoVo.java @@ -9,11 +9,17 @@ public class ServerInfoVo{ public String open_time ; public int status; + public int is_new; public long registerNum; public long onlineNum; + + public void setIsnew(int isnew) { + this.is_new = isnew; + } + public void setServer_id(String server_id) { this.server_id = server_id; } diff --git a/src/main/java/com/jmfy/redisProperties/RedisUserKey.java b/src/main/java/com/jmfy/redisProperties/RedisUserKey.java index d8190af..744149d 100644 --- a/src/main/java/com/jmfy/redisProperties/RedisUserKey.java +++ b/src/main/java/com/jmfy/redisProperties/RedisUserKey.java @@ -16,6 +16,7 @@ public class RedisUserKey { public final static String SERVER_OPEN_TIME_KEY = "Server_Open_Time_Key"; //问卷调查 public static final String QUESTION_FROMBACK = "QUESTION_FROMBACK"; + public static final String QUESTION_FROMBACK_ALL = "QUESTION_FROMBACK_ALL";//所有问卷 } diff --git a/src/main/java/com/jmfy/utils/RedisUtil.java b/src/main/java/com/jmfy/utils/RedisUtil.java index 7beae2e..6a34c11 100644 --- a/src/main/java/com/jmfy/utils/RedisUtil.java +++ b/src/main/java/com/jmfy/utils/RedisUtil.java @@ -267,6 +267,20 @@ public class RedisUtil { redisObjectTemplate.opsForZSet().add(key, String.valueOf(uid), startTime); } + public Map getRedisMapString(String key){ + try { + Map reslut = new HashMap<>(); + Map map = redisObjectTemplate.opsForHash().entries(key); + for (Map.Entry entry : map.entrySet()) { + reslut.put((String) entry.getKey(), (String) entry.getValue()); + } + return reslut; + } catch (RedisConnectionFailureException e) { + LOGGER.error("------------------Redis 连接失败----------------msg={}", e); + } + return null; + } + public static void sleep(long millis) { try { Thread.sleep(millis); diff --git a/src/main/resources/static/html/getquestInfo.html b/src/main/resources/static/html/getquestInfo.html index de8c5c5..5ace14b 100644 --- a/src/main/resources/static/html/getquestInfo.html +++ b/src/main/resources/static/html/getquestInfo.html @@ -43,7 +43,7 @@ 服务器id:
diff --git a/src/main/resources/static/html/getquestSendInfo.html b/src/main/resources/static/html/getquestSendInfo.html new file mode 100644 index 0000000..9800584 --- /dev/null +++ b/src/main/resources/static/html/getquestSendInfo.html @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + 问卷查询 + + + + + +
+

查询已发问卷

+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/html/question.html b/src/main/resources/static/html/question.html index 707db3a..20fc051 100644 --- a/src/main/resources/static/html/question.html +++ b/src/main/resources/static/html/question.html @@ -48,7 +48,7 @@ 服务器id:
@@ -123,6 +123,16 @@ + +
+ +
+ +
+
- +
选项A: 选项D:
+
+ 选项E: + 选项F: + 选项G: + 选项H: +
@@ -215,13 +236,23 @@ '*问题 标题&类型:
' + '
' + '×
' + + '
' + + '
' + '
' + - '
' + + '
' + + '
' + '选项A: ' + '选项B: ' + '选项C: ' + - '选项D:
'); + '选项D: ' + + '
' + + '选项E: ' + + '选项F: ' + + '选项G: ' + + '选项H:
'+ + ''); x++; } return false; diff --git a/src/main/resources/templates/findServerInfo.html b/src/main/resources/templates/findServerInfo.html index 8c9ca2e..77cd7f4 100644 --- a/src/main/resources/templates/findServerInfo.html +++ b/src/main/resources/templates/findServerInfo.html @@ -36,6 +36,7 @@ 服务器名字 开启时间 服务器状态 + 新服推荐 操作 @@ -52,6 +53,10 @@ 拥挤 爆满 + + 普通 + 新服推荐 + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 92291f8..91e578b 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -125,6 +125,7 @@ diff --git a/src/main/resources/templates/questsendInfo.html b/src/main/resources/templates/questsendInfo.html new file mode 100644 index 0000000..b5ddd3c --- /dev/null +++ b/src/main/resources/templates/questsendInfo.html @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + 问卷信息 + + +
+
+

已发问卷

+
+ + + + + + + + + + + + + + + + + + + + + +
IDserveridsendTimeendTimequestion
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/serverInfoEdit.html b/src/main/resources/templates/serverInfoEdit.html index 8c6f684..b4faae3 100644 --- a/src/main/resources/templates/serverInfoEdit.html +++ b/src/main/resources/templates/serverInfoEdit.html @@ -50,6 +50,14 @@ +
+ +
+ +
+
+
+ +
+ + +
+