diff --git a/src/main/java/com/jmfy/controller/FindFlowController.java b/src/main/java/com/jmfy/controller/FindFlowController.java index 1a6ee43..b938d24 100644 --- a/src/main/java/com/jmfy/controller/FindFlowController.java +++ b/src/main/java/com/jmfy/controller/FindFlowController.java @@ -1,9 +1,11 @@ package com.jmfy.controller; import com.jmfy.dao.ItemDao; +import com.jmfy.dao.ServerInfoDao; import com.jmfy.model.CItemInfo; import com.jmfy.model.CItemParam; import com.jmfy.model.MoneyFlow; +import com.jmfy.model.ServerInfo; import com.jmfy.model.vo.ItemFlowVo; import com.jmfy.utils.FileCacheUtils; import com.jmfy.utils.JsonUtil; @@ -29,6 +31,20 @@ import java.util.List; public class FindFlowController { @Autowired ItemDao itemDao; + @Resource + private ServerInfoDao serverInfoDao; + + @RequestMapping(value = "toFlowPage",method = RequestMethod.GET) + public String toOrderPage(ModelMap map){ + try { + List allServerInfo = serverInfoDao.getAllServerInfo(); + map.addAttribute("serverInfo",allServerInfo); + } catch (Exception e) { + e.printStackTrace(); + } + return "findFlow"; + } + @RequestMapping(value = "/findFlow", method = {RequestMethod.POST,RequestMethod.GET}) public String findFlow(HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); diff --git a/src/main/java/com/jmfy/controller/GameTitleController.java b/src/main/java/com/jmfy/controller/GameTitleController.java index a18e35e..bc7d6e8 100644 --- a/src/main/java/com/jmfy/controller/GameTitleController.java +++ b/src/main/java/com/jmfy/controller/GameTitleController.java @@ -3,11 +3,13 @@ package com.jmfy.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; +import com.jmfy.dao.ServerInfoDao; import com.jmfy.dao.UserInfoDao; import com.jmfy.handler.BaseHandler; import com.jmfy.handler.ManagerManager; import com.jmfy.model.BlackList; import com.jmfy.model.CUserInfo; +import com.jmfy.model.ServerInfo; import com.jmfy.redisProperties.RedisUserKey; import com.jmfy.utils.JsonUtil; import com.jmfy.utils.RedisUtil; @@ -26,16 +28,35 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.net.URLDecoder; import java.util.HashMap; +import java.util.List; import java.util.Map; -/** - * Created by huangds on 2017/10/24. - */ @Controller public class GameTitleController { private static final Logger LOGGER = LoggerFactory.getLogger(GameTitleController.class); @Resource private UserInfoDao userInfoDao; + @Resource + private ServerInfoDao serverInfoDao; + + @RequestMapping(value = "/toGameTitle",method = RequestMethod.GET) + public String toGameTitle(ModelMap map,Integer type){ + try { + List allServerInfo = serverInfoDao.getAllServerInfo(); + map.addAttribute("serverInfo",allServerInfo); + } catch (Exception e) { + e.printStackTrace(); + } + switch (type){ + case 1: return "gameTitle"; + case 2: return "gameTitle2"; + default:break; + } + return ""; + } + + + @RequestMapping(value = "/gameTitle", method = {RequestMethod.POST, RequestMethod.GET}) public @ResponseBody int gameTitle(HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); diff --git a/src/main/java/com/jmfy/controller/MailController.java b/src/main/java/com/jmfy/controller/MailController.java index dbc4a75..ce7bfa2 100644 --- a/src/main/java/com/jmfy/controller/MailController.java +++ b/src/main/java/com/jmfy/controller/MailController.java @@ -3,10 +3,10 @@ package com.jmfy.controller; import com.jmfy.WebSecurityConfig; import com.jmfy.dao.MailDao; +import com.jmfy.dao.ServerInfoDao; import com.jmfy.model.PersonalMail; -import com.jmfy.model.SCdkInfo; +import com.jmfy.model.ServerInfo; import com.jmfy.model.ServerMail; -import com.jmfy.model.vo.CDKInfoVo; import com.jmfy.model.vo.ServerMailVo; import com.jmfy.model.vo.ServerPMailVo; import com.jmfy.utils.JsonUtil; @@ -32,10 +32,31 @@ public class MailController { public MailDao mailDao; @Resource private SeqUtils seqUtils; + @Resource + private ServerInfoDao serverInfoDao; private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @RequestMapping(value = "/toMailPage",method = RequestMethod.GET) + public String toMailPage(ModelMap map,Integer type){ + try { + List allServerInfo = serverInfoDao.getAllServerInfo(); + map.addAttribute("serverInfo",allServerInfo); + } catch (Exception e) { + e.printStackTrace(); + } + switch (type){ + case 1: return "sendPersonalMail"; + case 2: return "sendSysMail"; + case 3: return "sendSysMSG"; + default:break; + } + return ""; + } + + + @RequestMapping(value = "/deleteSysMailCheck", method = {RequestMethod.POST, RequestMethod.GET}) public @ResponseBody int removeSysMail(HttpServletRequest request) throws Exception { diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index 99feb09..3c2fb2c 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -3,6 +3,7 @@ package com.jmfy.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.jmfy.dao.MailDao; +import com.jmfy.dao.ServerInfoDao; import com.jmfy.dao.UserInfoDao; import com.jmfy.model.*; import com.jmfy.redisProperties.RedisUserKey; @@ -38,6 +39,9 @@ public class OrderInfoController { private MailDao mailDao; @Resource private UserInfoDao userInfoDao; + + @Resource + private ServerInfoDao serverInfoDao; private static final Logger LOGGER = LoggerFactory.getLogger(OrderInfoController.class); @RequestMapping(value = "/getOrder", method = {RequestMethod.POST, RequestMethod.GET}) @@ -110,4 +114,14 @@ public class OrderInfoController { } return JSON.parseObject(sb.toString()); } + @RequestMapping(value = "toOrderPage",method = RequestMethod.GET) + public String toOrderPage(ModelMap map){ + try { + List allServerInfo = serverInfoDao.getAllServerInfo(); + map.addAttribute("serverInfo",allServerInfo); + } catch (Exception e) { + e.printStackTrace(); + } + return "findOrder"; + } } diff --git a/src/main/java/com/jmfy/controller/UserInfoController.java b/src/main/java/com/jmfy/controller/UserInfoController.java index 792ad6e..1e2addf 100644 --- a/src/main/java/com/jmfy/controller/UserInfoController.java +++ b/src/main/java/com/jmfy/controller/UserInfoController.java @@ -30,6 +30,20 @@ public class UserInfoController { @Resource private GSUserDaoImpl gsUserDao; + @Resource + private ServerInfoDao serverInfoDao; + + + @RequestMapping(value = "/toGetuserInfoPage", method = RequestMethod.GET) + public String toGetuserInfoPage(ModelMap map){ + try { + List allServerInfo = serverInfoDao.getAllServerInfo(); + map.addAttribute("serverInfo",allServerInfo); + } catch (Exception e) { + e.printStackTrace(); + } + return "getuserInfo"; + } @RequestMapping(value = "/getAllUserId", method = {RequestMethod.POST, RequestMethod.GET}) public String getAllUserId(HttpSession session, ModelMap map, HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); diff --git a/src/main/resources/static/html/findFlow.html b/src/main/resources/templates/findFlow.html similarity index 72% rename from src/main/resources/static/html/findFlow.html rename to src/main/resources/templates/findFlow.html index a60a866..7eb4517 100644 --- a/src/main/resources/static/html/findFlow.html +++ b/src/main/resources/templates/findFlow.html @@ -1,6 +1,6 @@  - + @@ -10,16 +10,16 @@ - - - - - + + + + + @@ -62,10 +62,11 @@
+ 区服id:
- - +
@@ -89,16 +90,16 @@ - - - - + + + + - - - - + + + + + + + + + + + + + + 玩家订单查询 @@ -62,10 +62,11 @@
+ 区服id:
- - +
@@ -89,16 +90,16 @@ - - - - + + + + - - - - + + + + + + + + + + + + + + 基本设置 @@ -44,10 +44,11 @@
+ 区服id:
- - +
@@ -113,16 +114,16 @@ - - - - + + + + - - - - + + + + + + + + + + + + + + 基本设置 @@ -45,10 +45,11 @@
+ 区服id:
- - +
@@ -89,16 +90,16 @@ - - - - + + + + - - - - + + + + - + + - + - - - + + + + - - - - + + + + + + + + + + + + + + 基本设置 @@ -41,12 +41,12 @@
+ 区服id:
- - +
@@ -102,16 +102,16 @@ - - - - + + + + - - - - + + + + + + + + + + + + + + 基本设置 @@ -44,10 +44,11 @@
+ 区服id:
- - +
@@ -147,16 +148,16 @@ - - - - + + + + - - - - + + + +