From 7213bd6d8bb4ace1de2cda66ce793d8dd1c609fe Mon Sep 17 00:00:00 2001 From: gaojie Date: Fri, 31 May 2019 16:13:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2openId=E5=8A=9F=E8=83=BD,=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6,=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/MailController.java | 23 ++++-- .../com/jmfy/controller/NoticeController.java | 52 +++++++++--- .../jmfy/controller/UserInfoController.java | 21 ++++- src/main/java/com/jmfy/dao/UserInfoDao.java | 3 + .../com/jmfy/dao/impl/UserInfoDaoImpl.java | 9 +++ src/main/java/com/jmfy/model/vo/RoleVo.java | 6 ++ .../resources/static/html/getRoleByName.html | 79 +++++++++++++++++++ .../resources/static/html/sendNotice.html | 2 +- .../resources/static/html/sendSysMail.html | 2 +- src/main/resources/templates/index.html | 1 + src/main/resources/templates/roleList1.html | 72 +++++++++++++++++ 11 files changed, 250 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/static/html/getRoleByName.html create mode 100644 src/main/resources/templates/roleList1.html diff --git a/src/main/java/com/jmfy/controller/MailController.java b/src/main/java/com/jmfy/controller/MailController.java index d35b0ac..5bdab69 100644 --- a/src/main/java/com/jmfy/controller/MailController.java +++ b/src/main/java/com/jmfy/controller/MailController.java @@ -68,15 +68,15 @@ public class MailController { public @ResponseBody int sendSysMail(HttpSession session, HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); - int serverId = Integer.parseInt(parameterMap.get("serverId")); - if (0 == serverId) { + String serverIds = parameterMap.get("serverId"); + if (serverIds.equals("0")) { List allServerInfo = serverInfoDao.getAllServerInfo(); for (ServerInfo serverInfo : allServerInfo) { String reward = JsonUtil.getInstence().getReward(request); if (Integer.parseInt(parameterMap.get("isAttach")) == 1 && reward.isEmpty()) { return 1; } - serverId = serverInfo.getServer_id(); + int serverId = serverInfo.getServer_id(); if(serverId == 10000) { continue; } @@ -87,12 +87,19 @@ public class MailController { mailDao.sendSystem(serverId, sysMail); } } else { - String reward = JsonUtil.getInstence().getReward(request); - if (Integer.parseInt(parameterMap.get("isAttach")) == 1 && reward.isEmpty()) { - return 2; + String[] split = serverIds.split(","); + for (String str:split){ + String reward = JsonUtil.getInstence().getReward(request); + if (Integer.parseInt(parameterMap.get("isAttach")) == 1 && reward.isEmpty()) { + return 2; + } + ServerInfo serverinfo = serverInfoDao.getServerinfo(Integer.parseInt(str)); + if (serverinfo == null){ + continue; + } + SysMail sysMail = getSysMail(parameterMap, reward); + mailDao.sendSystem(Integer.parseInt(str), sysMail); } - SysMail sysMail = getSysMail(parameterMap, reward); - mailDao.sendSystem(serverId, sysMail); } return 0; } diff --git a/src/main/java/com/jmfy/controller/NoticeController.java b/src/main/java/com/jmfy/controller/NoticeController.java index 9f5bc3b..3b01bb7 100644 --- a/src/main/java/com/jmfy/controller/NoticeController.java +++ b/src/main/java/com/jmfy/controller/NoticeController.java @@ -4,6 +4,7 @@ import com.jmfy.dao.NoticeDao; import com.jmfy.dao.ServerInfoDao; import com.jmfy.model.CNotice; import com.jmfy.model.ServerInfo; +import com.jmfy.model.SysMail; import com.jmfy.utils.JsonUtil; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -25,23 +26,56 @@ import java.util.List; public class NoticeController { @Resource private NoticeDao noticeDao; + @Resource + private ServerInfoDao serverInfoDao; @RequestMapping(value = "/sendNotice", method = {RequestMethod.POST, RequestMethod.GET}) - public @ResponseBody int getSendMail(HttpSession session, HttpServletRequest request){ + public @ResponseBody int sendNotice(HttpSession session, HttpServletRequest request) throws Exception { String plat = request.getParameter("plat"); - CNotice cNotice = getCNotice(request); - try { - noticeDao.sendSnotice(cNotice,plat); - } catch (Exception e) { - e.printStackTrace(); - return 1; + List allServerInfo = serverInfoDao.getAllServerInfo(); + String serveIds = request.getParameter("serverId"); + if (serveIds.equals("0")){//登录前全服公告 + CNotice cNotice = getCNotice(request, String.valueOf(serveIds)); + try { + noticeDao.sendSnotice(cNotice,plat); + } catch (Exception e) { + e.printStackTrace(); + return 1; + } + }else if (serveIds.equals("-1")){ //全服公告 + for (ServerInfo serverInfo : allServerInfo) { + int serverId = serverInfo.getServer_id(); + if(serverId == 10000) { + continue; + } + if (serverInfo.getIsWhite() == 1){ + continue; + } + CNotice cNotice = getCNotice(request, String.valueOf(serverId)); + try { + noticeDao.sendSnotice(cNotice,plat); + } catch (Exception e) { + e.printStackTrace(); + return 1; + } + } + }else{ // 发送指定服务器公告 + String[] split = serveIds.split(","); + for (String str :split){ + CNotice cNotice = getCNotice(request, String.valueOf(str)); + try { + noticeDao.sendSnotice(cNotice,plat); + } catch (Exception e) { + e.printStackTrace(); + return 1; + } + } } return 0; } - private CNotice getCNotice(HttpServletRequest request) { + private CNotice getCNotice(HttpServletRequest request,String serverId) { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); - String serverId = parameterMap.get("serverId"); String contentType = parameterMap.get("contentType"); String popType = parameterMap.get("popType"); String outline = parameterMap.get("outline"); diff --git a/src/main/java/com/jmfy/controller/UserInfoController.java b/src/main/java/com/jmfy/controller/UserInfoController.java index fc987ea..5acccc9 100644 --- a/src/main/java/com/jmfy/controller/UserInfoController.java +++ b/src/main/java/com/jmfy/controller/UserInfoController.java @@ -61,8 +61,27 @@ public class UserInfoController { 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 = "/getUserInfo", method = {RequestMethod.POST, RequestMethod.GET}) - public String getSendMail(HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { + public String getUserInfo(HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); int serverId = Integer.parseInt(parameterMap.get("serverId")); String openId = parameterMap.get("userId"); diff --git a/src/main/java/com/jmfy/dao/UserInfoDao.java b/src/main/java/com/jmfy/dao/UserInfoDao.java index 30c833c..92cffd8 100644 --- a/src/main/java/com/jmfy/dao/UserInfoDao.java +++ b/src/main/java/com/jmfy/dao/UserInfoDao.java @@ -31,4 +31,7 @@ public interface UserInfoDao { List findRoleList(String userId) throws Exception; void updateStatus(Update update, CUserInfo cUserInfo) throws Exception; + + CUser findCuserByName(int serverId, String userName) throws Exception; + } diff --git a/src/main/java/com/jmfy/dao/impl/UserInfoDaoImpl.java b/src/main/java/com/jmfy/dao/impl/UserInfoDaoImpl.java index 57f8141..4f74266 100644 --- a/src/main/java/com/jmfy/dao/impl/UserInfoDaoImpl.java +++ b/src/main/java/com/jmfy/dao/impl/UserInfoDaoImpl.java @@ -130,4 +130,13 @@ public class UserInfoDaoImpl implements UserInfoDao { Query query = new Query(Criteria.where("_id").is(userinfo.getId())); mongoTemplate.updateMulti(query, update, CUserInfo.class); } + + @Override + public CUser findCuserByName(int serverId, String userName) throws Exception { + String dbName = MongoName.getMongoDBName(serverId); + MongoTemplate mongoTemplate = connect.getMongoTemplete( dbName); + Query query = new Query(Criteria.where("userName").is(userName)); + return mongoTemplate.findOne(query, CUser.class); + } + } diff --git a/src/main/java/com/jmfy/model/vo/RoleVo.java b/src/main/java/com/jmfy/model/vo/RoleVo.java index 493a9e0..79b7ec8 100644 --- a/src/main/java/com/jmfy/model/vo/RoleVo.java +++ b/src/main/java/com/jmfy/model/vo/RoleVo.java @@ -12,6 +12,8 @@ public class RoleVo implements java.io.Serializable { public float save_amt; //目前儲值 + public String openId; // 账号id + public void setUserId(int userId) { this.userId = userId; } @@ -31,4 +33,8 @@ public class RoleVo implements java.io.Serializable { public void setSave_amt(float save_amt) { this.save_amt = save_amt; } + + public void setOpenId(String openId) { + this.openId = openId; + } } diff --git a/src/main/resources/static/html/getRoleByName.html b/src/main/resources/static/html/getRoleByName.html new file mode 100644 index 0000000..fe0b34e --- /dev/null +++ b/src/main/resources/static/html/getRoleByName.html @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + 個人信息查询 + + + +
+

查询个人账号信息

+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+ +
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/html/sendNotice.html b/src/main/resources/static/html/sendNotice.html index f4899a0..d0810f6 100644 --- a/src/main/resources/static/html/sendNotice.html +++ b/src/main/resources/static/html/sendNotice.html @@ -45,7 +45,7 @@ * 服务器id:
- +
diff --git a/src/main/resources/static/html/sendSysMail.html b/src/main/resources/static/html/sendSysMail.html index 9896075..3e429b0 100644 --- a/src/main/resources/static/html/sendSysMail.html +++ b/src/main/resources/static/html/sendSysMail.html @@ -46,7 +46,7 @@ * 服务器id:
- +
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 6c08c7e..e0d66b3 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -160,6 +160,7 @@ diff --git a/src/main/resources/templates/roleList1.html b/src/main/resources/templates/roleList1.html new file mode 100644 index 0000000..d1097b2 --- /dev/null +++ b/src/main/resources/templates/roleList1.html @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + 账号角色信息 + + + +
+

账号角色信息

+
+
+ + + + + + + + + + + + + + + + +
角色ID所在服务器ID角色名字账号ID
+
+
+ + + + + + + + + + + + + \ No newline at end of file