From e2824cc5f7c0021e588ffec3de3fb0daeffd28a0 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 8 Dec 2022 16:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=9Agm=E5=8F=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9C=80=E6=97=A9=E6=99=8B=E5=8D=87=E7=A5=9E=E5=B0=8A?= =?UTF-8?q?11=E3=80=8112=E7=BA=A7=E5=BE=97=E4=B8=89=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmfy/controller/UserInfoController.java | 97 +++++------- .../java/com/jmfy/model/vo/PowersEnum.java | 1 + .../java/com/jmfy/model/vo/UserGodLvVo.java | 84 ++++++++++ .../jmfy/redisProperties/RedisUserKey.java | 2 +- src/main/java/com/jmfy/utils/RedisUtil.java | 14 ++ .../resources/static/html/add_white_list.html | 3 +- src/main/resources/templates/GodLvInfo.html | 82 ++++++++++ src/main/resources/templates/findGodLv.html | 144 ++++++++++++++++++ src/main/resources/version.md | 1 + 9 files changed, 365 insertions(+), 63 deletions(-) create mode 100644 src/main/java/com/jmfy/model/vo/UserGodLvVo.java create mode 100644 src/main/resources/templates/GodLvInfo.html create mode 100644 src/main/resources/templates/findGodLv.html diff --git a/src/main/java/com/jmfy/controller/UserInfoController.java b/src/main/java/com/jmfy/controller/UserInfoController.java index 6065e40..a1a9de2 100644 --- a/src/main/java/com/jmfy/controller/UserInfoController.java +++ b/src/main/java/com/jmfy/controller/UserInfoController.java @@ -6,6 +6,7 @@ import com.jmfy.dao.impl.GSUserDaoImpl; import com.jmfy.model.*; import com.jmfy.model.vo.CUserVo; import com.jmfy.model.vo.Hero; +import com.jmfy.model.vo.UserGodLvVo; import com.jmfy.redisProperties.RedisUserKey; import com.jmfy.utils.DateUtil; import com.jmfy.utils.JsonUtil; @@ -23,10 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; /** * Created by huangds on 2017/10/24. @@ -65,59 +63,6 @@ public class UserInfoController { return "sendMails"; } - @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); -// String openId = parameterMap.get("userId"); -// List userInfos = userInfoDao.findUserInfo(openId); -// List roleVos = new ArrayList<>(); -// for (CUserInfo cUserInfo : userInfos) { -// int serverid = cUserInfo.getServerid(); -// int userId = cUserInfo.getUserId(); -// RoleVo roleVo = new RoleVo(); -// -// CUser cUser = userInfoDao.findCuserInfo(serverid, userId); -// if (cUser == null) { -// continue; -// } -// roleVo.setServerId(cUserInfo.getServerid()); -// roleVo.setUserId(cUserInfo.getUserId()); -// roleVo.setUserName(cUser.getUserName()); -// CUserPrivilegeInfo cUserPrivilegeInfo = userInfoDao.getCUserPrivilegeInfo(serverid, userId); -// roleVo.setSave_amt(cUserPrivilegeInfo.getSave_amt()); -// CFamilyUser cFamilyUser = familyDao.getCFamilyUserById(serverid, userId); -// if (cFamilyUser != null) { -// roleVo.setFamilyId(String.valueOf(cFamilyUser.getFamilyId())); -// } else { -// roleVo.setFamilyId(String.valueOf(0)); -// } -// roleVos.add(roleVo); -// } -// map.put("RoleVos", roleVos); - return "roleList"; - } - -// @RequestMapping(value = "/getUserInfoByName", method = {RequestMethod.POST, RequestMethod.GET}) -// public String getUserInfoByName(HttpSession session, ModelMap map, HttpServletRequest request) throws Exception { -// HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); -// int serverId = Integer.parseInt(parameterMap.get("serverId")); -// String userName = parameterMap.get("userName"); -// List roleVos = new ArrayList<>(); -// CUser cUser = userInfoDao.findCuserByName(serverId, userName); -// if (cUser != null) { -// CUserInfo cUserInfo = userInfoDao.findUserInfoByUserId(cUser.getId()); -// RoleVo roleVo = new RoleVo(); -// roleVo.setUserName(cUser.getUserName()); -// roleVo.setUserId(cUser.getId()); -// roleVo.setOpenId(cUserInfo.getOpenId()); -// roleVo.setServerId(cUserInfo.getServerid()); -// roleVos.add(roleVo); -// } -// map.put("RoleVos", roleVos); -// return "roleList1"; -// } - - @RequestMapping(value = "/getUserRoleInfo", method = {RequestMethod.POST, RequestMethod.GET}) public String getUserInfo(ModelMap map, HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); @@ -194,7 +139,7 @@ public class UserInfoController { return "发送成功"; } - private CUserVo getcUserVo(GSUser gsUser) throws Exception { + private CUserVo getcUserVo(GSUser gsUser) { CUserVo cUserVo = new CUserVo(); if (gsUser == null) { cUserVo.setIsData(0); @@ -223,8 +168,6 @@ public class UserInfoController { return cUserVo; } - - @RequestMapping(value = "/addWhiteList", method = {RequestMethod.POST, RequestMethod.GET}) public @ResponseBody int addWhiteList(HttpSession session, HttpServletRequest request) throws Exception { @@ -280,4 +223,38 @@ public class UserInfoController { out.flush(); } + /** + * 查询神尊等级 + * @param map + * @param map + * @return + */ + @RequestMapping(value = "/toFindGodLv", method = {RequestMethod.POST, RequestMethod.GET}) + public String toFindGodLv(ModelMap map) throws Exception { + List serverInfos = serverInfoDao.getAllServerInfo(); + map.addAttribute("serverInfos", serverInfos); + return "findGodLv"; + } + + /** + * 查询神尊等级 + * @param request + * @param map + * @return + */ + @RequestMapping(value = "/findGodLv", method = {RequestMethod.POST, RequestMethod.GET}) + public String findGodLv(HttpServletRequest request, ModelMap map) { + String serverId = request.getParameter("serverId"); + String lv = request.getParameter("lv"); + String[] split = serverId.split(","); + ArrayList godLvVos = new ArrayList<>(); + for (String id : split) { + String key = RedisUserKey.GOD_LEVEL_UP_TIME + ":" + id + ":" + lv; + Map lvMap = RedisUtil.getInstence().getMap(key, UserGodLvVo.class, -1); + godLvVos.addAll(lvMap.values()); + } + map.addAttribute("godLvVos", godLvVos); + return "GodLvInfo"; + } + } diff --git a/src/main/java/com/jmfy/model/vo/PowersEnum.java b/src/main/java/com/jmfy/model/vo/PowersEnum.java index 09ed3f0..c9829d0 100644 --- a/src/main/java/com/jmfy/model/vo/PowersEnum.java +++ b/src/main/java/com/jmfy/model/vo/PowersEnum.java @@ -72,6 +72,7 @@ public enum PowersEnum { */ INFO_MANAGER(700,"信息管理",700,1,""), USER_INFO_QUERY(701,"角色信息查询",700,1,"toGetuserInfoPage"), + GOD_LV_QUERY(702,"神尊等级查询",700,1,"toFindGodLv"), /** * 问卷管理800-899 */ diff --git a/src/main/java/com/jmfy/model/vo/UserGodLvVo.java b/src/main/java/com/jmfy/model/vo/UserGodLvVo.java new file mode 100644 index 0000000..ea729b8 --- /dev/null +++ b/src/main/java/com/jmfy/model/vo/UserGodLvVo.java @@ -0,0 +1,84 @@ +package com.jmfy.model.vo; + +import com.jmfy.model.ServerInfo; +import com.jmfy.redisProperties.RedisUserKey; +import com.jmfy.utils.RedisUtil; + +import java.util.Map; + +/** + * @Author hj + * @Date 2022/12/8 16:00:38 + * @Description: + * @Version 1.0 + */ +public class UserGodLvVo { + //角色id + private int uid; + //角色名称 + private String name; + //区服id + private String serverId; + //创角时间 + private String createTime; + //神尊等级 + private int godLv; + //神尊等级到达时间 + private String upTime; + + public int getUid() { + return uid; + } + + public void setUid(int uid) { + this.uid = uid; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } + + public String getServerName(){ + ServerInfo serverInfo = RedisUtil.getInstence().getMapValue(RedisUserKey.SERVER_INFO, serverId, ServerInfo.class); + if (serverInfo == null){ + return serverId; + } + return serverInfo.getName(); + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public int getGodLv() { + return godLv; + } + + public void setGodLv(int godLv) { + this.godLv = godLv; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } +} diff --git a/src/main/java/com/jmfy/redisProperties/RedisUserKey.java b/src/main/java/com/jmfy/redisProperties/RedisUserKey.java index 92c8751..fbc18bf 100644 --- a/src/main/java/com/jmfy/redisProperties/RedisUserKey.java +++ b/src/main/java/com/jmfy/redisProperties/RedisUserKey.java @@ -44,7 +44,7 @@ public class RedisUserKey { public static final String GM_ACTIVITY_INFO = "GM_ACTIVITY_INFO";// GM活动信息 - public static final String GM_ACTIVITY_UPDATE = "GM_ACTIVITY_UPDATE";// GM活动更新 + public static final String GOD_LEVEL_UP_TIME = "GOD_LEVEL_UP_TIME";//晋升神尊等级排序 public static String getKey(String type, String key, int serverId) { if (serverId==0) { diff --git a/src/main/java/com/jmfy/utils/RedisUtil.java b/src/main/java/com/jmfy/utils/RedisUtil.java index 013f97c..bf42399 100644 --- a/src/main/java/com/jmfy/utils/RedisUtil.java +++ b/src/main/java/com/jmfy/utils/RedisUtil.java @@ -261,6 +261,20 @@ public class RedisUtil { return null; } + public T getMapValue(String key, String mapKey, Class clazz) { + try { + Object valueStr = redisObjectTemplate.opsForHash().get(key,mapKey); + if (valueStr == null) { + return null; + } + return gson.fromJson((String) valueStr, clazz); + } catch (RedisConnectionFailureException e) { + e.printStackTrace(); + LOGGER.error("------------------Redis 连接失败---------------msg={}", e); + } + return null; + } + /** * 获取Map中某hashKey值 * diff --git a/src/main/resources/static/html/add_white_list.html b/src/main/resources/static/html/add_white_list.html index ea11397..03b743e 100644 --- a/src/main/resources/static/html/add_white_list.html +++ b/src/main/resources/static/html/add_white_list.html @@ -31,8 +31,7 @@

添加白名单账号

-
+