From 7c62795d5c8b7f3400338b212941226971f34dbd Mon Sep 17 00:00:00 2001 From: gaojie Date: Sat, 11 May 2019 11:21:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmfy/controller/CdkInfoController.java | 5 +- .../com/jmfy/controller/LoginController.java | 155 +++++++++++++- .../com/jmfy/controller/MailController.java | 19 +- .../controller/RecoverItemController.java | 5 +- src/main/java/com/jmfy/dao/CUserDao.java | 4 + .../java/com/jmfy/dao/impl/CUserDaoImpl.java | 8 + src/main/java/com/jmfy/model/CAdmin.java | 15 ++ src/main/java/com/jmfy/model/vo/CAdminVo.java | 15 ++ src/main/java/com/jmfy/model/vo/PowersVo.java | 55 +++++ src/main/java/com/jmfy/utils/JsonUtil.java | 21 ++ src/main/resources/static/html/getRole.html | 36 ++-- .../resources/static/html/member-add.html | 179 ++++++++++++++++ .../resources/static/html/recoverItem.html | 72 +++++-- src/main/resources/static/html/sendMail.html | 76 +++++-- .../resources/static/html/sendSysMail.html | 69 +++++- .../resources/static/html/toAddCDKGoods.html | 47 +++- src/main/resources/templates/index.html | 200 +++++++++++------- src/main/resources/templates/itemFlow.html | 15 +- src/main/resources/templates/member-list.html | 65 ++++++ 19 files changed, 910 insertions(+), 151 deletions(-) create mode 100644 src/main/java/com/jmfy/model/vo/CAdminVo.java create mode 100644 src/main/java/com/jmfy/model/vo/PowersVo.java create mode 100644 src/main/resources/static/html/member-add.html create mode 100644 src/main/resources/templates/member-list.html diff --git a/src/main/java/com/jmfy/controller/CdkInfoController.java b/src/main/java/com/jmfy/controller/CdkInfoController.java index de7de5f..768f1c7 100644 --- a/src/main/java/com/jmfy/controller/CdkInfoController.java +++ b/src/main/java/com/jmfy/controller/CdkInfoController.java @@ -155,7 +155,10 @@ public class CdkInfoController { String startTime = JsonUtil.date3TimeStamp(parameterMap.get("startTime")); String endTime = JsonUtil.date3TimeStamp(parameterMap.get("endTime")); String goodsInfo = parameterMap.get("goodsInfo"); - String reward = parameterMap.get("reward"); + String reward = JsonUtil.getInstence().getReward(request); + if (reward.isEmpty()){ + throw new Exception("item erro !!!"); + } SCdkInfo sCdkInfo = new SCdkInfo(); sCdkInfo.setId(seqUtils.getSequence("cdk_goods_id")); sCdkInfo.setGoodsInfo(goodsInfo); diff --git a/src/main/java/com/jmfy/controller/LoginController.java b/src/main/java/com/jmfy/controller/LoginController.java index d9aed9b..f49b737 100644 --- a/src/main/java/com/jmfy/controller/LoginController.java +++ b/src/main/java/com/jmfy/controller/LoginController.java @@ -2,13 +2,21 @@ package com.jmfy.controller; import com.jmfy.dao.CUserDao; import com.jmfy.model.CAdmin; +import com.jmfy.model.vo.CAdminVo; +import com.jmfy.model.vo.PowersVo; +import com.jmfy.utils.JsonUtil; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; 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; /** * Created by huangds on 2017/10/24. @@ -28,7 +36,7 @@ public class LoginController { } @PostMapping("/loginVerify") - public String loginVerify(String userName,String password,HttpSession session) throws Exception { + public String loginVerify(String userName,String password,HttpSession session,ModelMap map) throws Exception { CAdmin admin = cUserDao.findAdmin(userName); boolean verify = false; if (admin != null){ @@ -38,30 +46,165 @@ public class LoginController { } if (verify) { session.setAttribute(WebSecurityConfig.SESSION_KEY, userName); + PowersVo powersVo = new PowersVo(); + updatePowers(powersVo,admin.getPowers()); + map.put("powersVo",powersVo); return "index"; } else { return "redirect:/login"; } } + private void updatePowers(PowersVo powersVo,List powerList) { + if (powerList.size() ==0){ + powersVo.setServerInfo(0); + powersVo.setNoticeInfo(0); + powersVo.setCDKinfo(0); + powersVo.setFlowInfo(0); + powersVo.setGMinfo(0); + powersVo.setUserInfo(0); + powersVo.setFamilyInfo(0); + powersVo.setArenaInfo(0); + powersVo.setTitleGame(0); + powersVo.setAdminList(0); + return; + } + for (Integer str : powerList) { + switch (str) { + case 1: + powersVo.setServerInfo(0); + break; + case 2: + powersVo.setNoticeInfo(0); + break; + case 3: + powersVo.setCDKinfo(0); + break; + case 4: + powersVo.setFlowInfo(0); + break; + case 5: + powersVo.setGMinfo(0); + break; + case 6: + powersVo.setUserInfo(0); + break; + case 7: + powersVo.setFamilyInfo(0); + break; + case 8: + powersVo.setArenaInfo(0); + break; + case 9: + powersVo.setTitleGame(0); + break; + case 10: + powersVo.setAdminList(0); + break; + } + } + + } + @GetMapping("/logout") public String logout(HttpSession session){ session.removeAttribute(WebSecurityConfig.SESSION_KEY); return "redirect:/login"; } - @GetMapping("/register") - public String register(HttpSession session) throws Exception { + @PostMapping("/register") + public @ResponseBody int register(HttpSession session, HttpServletRequest request) throws Exception { + HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String userName = parameterMap.get("userName"); + String password = parameterMap.get("password"); + CAdmin admin = cUserDao.findAdmin(userName); + if (admin != null){ + return 1; + } CAdmin cAdmin = new CAdmin(); - cAdmin.setUserName("admin"); - cAdmin.setPassword("123"); + cAdmin.setUserName(userName); + cAdmin.setPassword(password); + String[] powers = request.getParameterValues("power[]"); + if (powers != null){ + for (String prw : powers){ + cAdmin.getPowers().add(Integer.valueOf(prw)); + } + } cUserDao.registerAdmin(cAdmin); - return ""; +// List adminList = cUserDao.findAdminList(); +// map.addAttribute("adminList",adminList); + return 0; } @RequestMapping(value = "/welcome", method = {RequestMethod.POST, RequestMethod.GET}) public String welcome() { return "welcome"; } + @RequestMapping(value = "/findmemberlist", method = {RequestMethod.POST, RequestMethod.GET}) + public String findmemberlist(ModelMap map) throws Exception { + List adminList = cUserDao.findAdminList(); + List cAdminVoList = new ArrayList<>(); + for (CAdmin cAdmin:adminList){ + CAdminVo cAdminVo = new CAdminVo(); + cAdminVo.setUserName(cAdmin.getUserName()); + String power; + List powerList = cAdmin.getPowers(); + if (powerList.size() != 0) { + power = getPower(powerList); + } else { + power = "管理员,所有权限"; + + } + cAdminVo.setPowers(power); + cAdminVoList.add(cAdminVo); + } + map.addAttribute("adminList",cAdminVoList); + return "member-list"; + } + + private String getPower(List powerList) { + StringBuilder power = new StringBuilder(); + for (Integer str : powerList) { + String powers = ""; + switch (str) { + case 1: + powers = "服务器管理"; + break; + case 2: + powers = "公告管理"; + break; + case 3: + powers = "序列號管理"; + break; + case 4: + powers = "流水日誌管理"; + break; + case 5: + powers = "GM管理"; + break; + case 6: + powers = "個人信息管理"; + break; + case 7: + powers = "宗門信息管理"; + break; + case 8: + powers = "排行榜管理"; + break; + case 9: + powers = "封號/解封/禁言/解封"; + break; + case 10: + powers = "用户管理"; + break; + } + if (power.length() == 0) { + power = new StringBuilder(powers); + } else { + power.append(",").append(powers); + } + } + return power.toString(); + } } diff --git a/src/main/java/com/jmfy/controller/MailController.java b/src/main/java/com/jmfy/controller/MailController.java index eedd6ad..327f436 100644 --- a/src/main/java/com/jmfy/controller/MailController.java +++ b/src/main/java/com/jmfy/controller/MailController.java @@ -47,7 +47,11 @@ public class MailController { if (cUser ==null){ continue; } - CMail mail = getMail(parameterMap, Integer.parseInt(userId)); + String reward = JsonUtil.getInstence().getReward(request); + if (Integer.parseInt(parameterMap.get("isAttach"))==1 && reward.isEmpty()){ + return 2; + } + CMail mail = getMail(parameterMap, Integer.parseInt(userId),reward); try { mailDao.sendCMail(mail, serverId); } catch (Exception e) { @@ -58,6 +62,7 @@ public class MailController { } return 0; } + @RequestMapping(value = "/sendSysMail", method = {RequestMethod.POST, RequestMethod.GET}) public @ResponseBody int sendSysMail(HttpSession session, HttpServletRequest request) throws Exception { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); @@ -65,11 +70,19 @@ public class MailController { if (0 == serverId){ 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(); SysMail sysMail = getSysMail(parameterMap); mailDao.sendSystem(serverId ,sysMail); } }else{ + String reward = JsonUtil.getInstence().getReward(request); + if (Integer.parseInt(parameterMap.get("isAttach"))==1 && reward.isEmpty()){ + return 2; + } SysMail sysMail = getSysMail(parameterMap); mailDao.sendSystem(serverId ,sysMail); } @@ -96,7 +109,7 @@ public class MailController { return sysMail; } - private CMail getMail(HashMap parameterMap ,int uid) { + private CMail getMail(HashMap parameterMap ,int uid,String reward) { CMail cMail = new CMail(); String str = UUID.randomUUID().toString(); cMail.setId(str.substring(0, 8)); @@ -104,7 +117,7 @@ public class MailController { cMail.setHead(parameterMap.get("mailTitle")); cMail.setContent(parameterMap.get("mailContent")); if (Integer.parseInt(parameterMap.get("isAttach"))==1){ - cMail.setMailItemList(parameterMap.get("attach")); + cMail.setMailItemList(reward); }else{ cMail.setMailItemList(""); } diff --git a/src/main/java/com/jmfy/controller/RecoverItemController.java b/src/main/java/com/jmfy/controller/RecoverItemController.java index 59e1f40..ba9cab4 100644 --- a/src/main/java/com/jmfy/controller/RecoverItemController.java +++ b/src/main/java/com/jmfy/controller/RecoverItemController.java @@ -31,7 +31,10 @@ public class RecoverItemController { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); int serverId = Integer.parseInt(parameterMap.get("serverId")); String[] userIds = parameterMap.get("userIds").split("#"); - String itemInfos = parameterMap.get("itemInfo"); + String itemInfos = JsonUtil.getInstence().getReward(request); + if (itemInfos.isEmpty()){ + return 2; + } boolean isSuccess = false; for (String userId : userIds){ Result result = null; diff --git a/src/main/java/com/jmfy/dao/CUserDao.java b/src/main/java/com/jmfy/dao/CUserDao.java index d6aa344..78f0938 100644 --- a/src/main/java/com/jmfy/dao/CUserDao.java +++ b/src/main/java/com/jmfy/dao/CUserDao.java @@ -2,8 +2,12 @@ package com.jmfy.dao; import com.jmfy.model.CAdmin; +import java.util.List; + public interface CUserDao { CAdmin findAdmin(String userName) throws Exception; void registerAdmin(CAdmin cAdmin) throws Exception; + + List findAdminList()throws Exception; } diff --git a/src/main/java/com/jmfy/dao/impl/CUserDaoImpl.java b/src/main/java/com/jmfy/dao/impl/CUserDaoImpl.java index 6bedf9c..fc6dabf 100644 --- a/src/main/java/com/jmfy/dao/impl/CUserDaoImpl.java +++ b/src/main/java/com/jmfy/dao/impl/CUserDaoImpl.java @@ -9,6 +9,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.List; /** * @author Administrator @@ -32,4 +33,11 @@ public class CUserDaoImpl implements CUserDao { MongoTemplate mongoTemplate = connect.getMongoTemplete(dbName); mongoTemplate.insert(cAdmin); } + + @Override + public List findAdminList() throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(dbName); + Query query = new Query(); + return mongoTemplate.find(query, CAdmin.class); + } } diff --git a/src/main/java/com/jmfy/model/CAdmin.java b/src/main/java/com/jmfy/model/CAdmin.java index e2f8c7b..47c8427 100644 --- a/src/main/java/com/jmfy/model/CAdmin.java +++ b/src/main/java/com/jmfy/model/CAdmin.java @@ -3,6 +3,10 @@ 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; + @Document(collection = "c_admin") public class CAdmin { @Id @@ -14,6 +18,9 @@ public class CAdmin { @Field(value = "password") private String password; + @Field(value = "power") + private List powers = new ArrayList<>(); + public String getId() { return id; } @@ -33,4 +40,12 @@ public class CAdmin { public void setPassword(String password) { this.password = password; } + + public List getPowers() { + return powers; + } + + public void setPowers(List powers) { + this.powers = powers; + } } diff --git a/src/main/java/com/jmfy/model/vo/CAdminVo.java b/src/main/java/com/jmfy/model/vo/CAdminVo.java new file mode 100644 index 0000000..9582a8a --- /dev/null +++ b/src/main/java/com/jmfy/model/vo/CAdminVo.java @@ -0,0 +1,15 @@ +package com.jmfy.model.vo; + +public class CAdminVo { + public String userName; + + public String powers ; + + public void setUserName(String userName) { + this.userName = userName; + } + + public void setPowers(String powers) { + this.powers = powers; + } +} diff --git a/src/main/java/com/jmfy/model/vo/PowersVo.java b/src/main/java/com/jmfy/model/vo/PowersVo.java new file mode 100644 index 0000000..e9271aa --- /dev/null +++ b/src/main/java/com/jmfy/model/vo/PowersVo.java @@ -0,0 +1,55 @@ +package com.jmfy.model.vo; + +public class PowersVo { + //0: 显示 1不显示 + public int adminList = 1; + public int serverInfo =1; + public int noticeInfo =1; + public int CDKinfo=1; + public int flowInfo=1; + public int GMinfo=1; + public int TitleGame=1; + public int userInfo=1; + public int familyInfo=1; + public int arenaInfo=1; + + public void setAdminList(int adminList) { + this.adminList = adminList; + } + + public void setServerInfo(int serverInfo) { + this.serverInfo = serverInfo; + } + + public void setNoticeInfo(int noticeInfo) { + this.noticeInfo = noticeInfo; + } + + public void setCDKinfo(int CDKinfo) { + this.CDKinfo = CDKinfo; + } + + public void setFlowInfo(int flowInfo) { + this.flowInfo = flowInfo; + } + + public void setGMinfo(int GMinfo) { + this.GMinfo = GMinfo; + } + + public void setTitleGame(int titleGame) { + TitleGame = titleGame; + } + + public void setUserInfo(int userInfo) { + this.userInfo = userInfo; + } + + public void setFamilyInfo(int familyInfo) { + this.familyInfo = familyInfo; + } + + public void setArenaInfo(int arenaInfo) { + this.arenaInfo = arenaInfo; + } +} diff --git a/src/main/java/com/jmfy/utils/JsonUtil.java b/src/main/java/com/jmfy/utils/JsonUtil.java index b0aa435..b938492 100644 --- a/src/main/java/com/jmfy/utils/JsonUtil.java +++ b/src/main/java/com/jmfy/utils/JsonUtil.java @@ -47,6 +47,27 @@ public class JsonUtil { return map; } + public String getReward( HttpServletRequest request) { + StringBuilder reward = new StringBuilder(); + String[] itemIds = request.getParameterValues("itemIds[]"); + String[] itemNums = request.getParameterValues("itemNums[]"); + String[] itemTypes = request.getParameterValues("itemTypes[]"); + if (itemIds.length ==0 || itemNums.length ==0 || itemTypes.length ==0){ + return reward.toString(); + } + for (int i = 0; i < itemIds.length; i++){ + if (itemIds[i].isEmpty() || itemNums[i].isEmpty() || itemTypes[i].isEmpty()){ + return reward.toString(); + } + if (reward.length() == 0){ + reward = new StringBuilder(itemIds[i] + "#" + itemNums[i] + "#" + itemTypes[i]); + }else{ + reward.append("|").append(itemIds[i]).append("#").append(itemNums[i]).append("#").append(itemTypes[i]); + } + } + return reward.toString(); + } + public static String getServiceKey(String serviceName, String host, String port) { StringBuilder sb = new StringBuilder(); return sb.append(serviceName).append("|") diff --git a/src/main/resources/static/html/getRole.html b/src/main/resources/static/html/getRole.html index 340e072..d2b875f 100644 --- a/src/main/resources/static/html/getRole.html +++ b/src/main/resources/static/html/getRole.html @@ -25,30 +25,22 @@

查询账号角色

-
-
- -
- - + +
+ +
+ + +
-
- - - - - - - - - - - -
+
- +
diff --git a/src/main/resources/static/html/member-add.html b/src/main/resources/static/html/member-add.html new file mode 100644 index 0000000..63ec149 --- /dev/null +++ b/src/main/resources/static/html/member-add.html @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + +基本设置 + + + +
+
+
+
+ 添加会员信息 +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+
+
+
+
+ + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ + + + + + + + + + + + + + + + + diff --git a/src/main/resources/static/html/recoverItem.html b/src/main/resources/static/html/recoverItem.html index 424110b..087f3ff 100644 --- a/src/main/resources/static/html/recoverItem.html +++ b/src/main/resources/static/html/recoverItem.html @@ -62,11 +62,18 @@
+ 附件:
- - +
+
+ 物品id: + 物品数量: + 物品类型: + + + + +
+
@@ -103,11 +110,50 @@ index: 0 }); }); + + $(document).ready(function() { + var MaxInputs = 20; + var InputsWrapper = $("#InputsWrapper"); + var AddButton = $("#AddMoreFileBox"); + + var x = InputsWrapper.length; + var FieldCount=1; + + $(AddButton).click(function (e) + { + if(x <= MaxInputs) + { + FieldCount++; + $(InputsWrapper).append('
物品id: 物品数量: 物品类型:×
'); + x++; + } + return false; + }); + $("body").on("click",".removeclass", function(e){ //user click on remove text + if( x > 1 ) { + $(this).parent('div').remove(); //remove text box + x--; //decrement textbox + } + return false; + }) + + }); function sendMail() { var erroCode = $('.SERVERID'); var serverId = $("input[name='serverId']").val(); var userIds = $("textarea[name='userIds']").val(); - var itemInfo = $("textarea[name='itemInfo']").val(); + var itemIds = []; + $("input[name='itemId']").each(function () { + itemIds.push($(this).val()); + }); + var itemNums =[]; + $("input[name='itemNum']").each(function(){ + itemNums.push($(this).val()); + }); + var itemTypes =[]; + $("input[name='itemType']").each(function(){ + itemTypes.push($(this).val()); + }); if (serverId === '' || serverId == null) { erroCode.html('服务器id不能为空!'); return false; @@ -117,26 +163,26 @@ function sendMail() { erroCode.html('用户id不能为空!'); return false; } - if (itemInfo === '' || itemInfo == null) { - erroCode = $('.ITEMINFO'); - erroCode.html('回收道具不能为空!'); - return false; - } $.ajax({ type: "POST", data: { "serverId": serverId, "userIds": userIds, - "itemInfo": itemInfo + "itemIds[]": itemIds, + "itemNums[]": itemNums, + "itemTypes[]": itemTypes }, url: "/recoverItem", success: function (data) { - if (data == 0) { + if (data === 0) { layer.msg('回收成功,请到游戏中查出!', {icon: 6, time: 1000}); } - if (data == 1) { + if (data === 1) { layer.msg('回收道具失败,请检查该区是否有该角色信息!', {icon: 6, time: 1000}); } + if (data === 2) { + layer.msg('发送邮件失败 道具不能为空!', {icon: 6, time: 1000}); + } } } ) diff --git a/src/main/resources/static/html/sendMail.html b/src/main/resources/static/html/sendMail.html index 644a293..019a368 100644 --- a/src/main/resources/static/html/sendMail.html +++ b/src/main/resources/static/html/sendMail.html @@ -89,10 +89,20 @@
- +
- - +
+
+ 物品id: + 物品数量: + 物品类型: + + + + +
+
@@ -142,6 +152,34 @@ index: 0 }); }); + + $(document).ready(function() { + var MaxInputs = 20; + var InputsWrapper = $("#InputsWrapper"); + var AddButton = $("#AddMoreFileBox"); + + var x = InputsWrapper.length; + var FieldCount=1; + + $(AddButton).click(function (e) + { + if(x <= MaxInputs) + { + FieldCount++; + $(InputsWrapper).append('
物品id: 物品数量: 物品类型:×
'); + x++; + } + return false; + }); + $("body").on("click",".removeclass", function(e){ //user click on remove text + if( x > 1 ) { + $(this).parent('div').remove(); //remove text box + x--; //decrement textbox + } + return false; + }) + + }); function sendMail() { var erroCode = $('.SERVERID'); var serverId = $("input[name='serverId']").val(); @@ -149,7 +187,18 @@ function sendMail() { var mailTitle = $("input[name='mailTitle']").val(); var mailContent = $("textarea[name='mailContent']").val(); var isAttach = document.getElementById("isAttach").value; - var attach = $("input[name='attach']").val(); + var itemIds = []; + $("input[name='itemId']").each(function () { + itemIds.push($(this).val()); + }); + var itemNums =[]; + $("input[name='itemNum']").each(function(){ + itemNums.push($(this).val()); + }); + var itemTypes =[]; + $("input[name='itemType']").each(function(){ + itemTypes.push($(this).val()); + }); if (serverId === '' || serverId == null) { erroCode.html('服务器id不能为空!'); return false; @@ -169,13 +218,6 @@ function sendMail() { erroCode.html('邮件内容不能为空!'); return false; } - if(isAttach ===1){ - if (attach === '' || attach == null) { - erroCode = $('.ATTACH'); - erroCode.html('附件不能为空!'); - return false; - } - } $.ajax({ type: "POST", data: { @@ -184,19 +226,25 @@ function sendMail() { "mailTitle": mailTitle, "mailContent": mailContent, "isAttach": isAttach, - "attach": attach, + "itemIds[]": itemIds, + "itemNums[]": itemNums, + "itemTypes[]": itemTypes }, url: "/sendMail", success: function (data) { - if (data == 0) { + if (data === 0) { layer.msg('发送邮件成功!', {icon: 6, time: 1000}); } - if (data == 1) { + if (data === 1) { layer.msg('发送邮件失败!', {icon: 6, time: 1000}); } + if (data === 2) { + layer.msg('发送邮件失败 道具不能为空!', {icon: 6, time: 1000}); + } } } ) + } diff --git a/src/main/resources/static/html/sendSysMail.html b/src/main/resources/static/html/sendSysMail.html index 4adc527..9896075 100644 --- a/src/main/resources/static/html/sendSysMail.html +++ b/src/main/resources/static/html/sendSysMail.html @@ -79,11 +79,28 @@ + + + + + + +
- +
- - +
+
+ 物品id: + 物品数量: + 物品类型: + + + + +
+
@@ -151,6 +168,33 @@ $(function(){ index:0 }); }); +$(document).ready(function() { + var MaxInputs = 20; + var InputsWrapper = $("#InputsWrapper"); + var AddButton = $("#AddMoreFileBox"); + + var x = InputsWrapper.length; + var FieldCount=1; + + $(AddButton).click(function (e) + { + if(x <= MaxInputs) + { + FieldCount++; + $(InputsWrapper).append('
物品id: 物品数量: 物品类型:×
'); + x++; + } + return false; + }); + $("body").on("click",".removeclass", function(e){ //user click on remove text + if( x > 1 ) { + $(this).parent('div').remove(); //remove text box + x--; //decrement textbox + } + return false; + }) + +}); function sendSysMail() { var erroCode = $('.SERVERID'); var serverId = $("input[name='serverId']").val(); @@ -162,6 +206,18 @@ function sendSysMail() { var playerRTime = $("input[name='playerRTime']").val(); var effectTime = $("input[name='effectTime']").val(); var version = $("input[name='version']").val(); + var itemIds = []; + $("input[name='itemId']").each(function () { + itemIds.push($(this).val()); + }); + var itemNums =[]; + $("input[name='itemNum']").each(function(){ + itemNums.push($(this).val()); + }); + var itemTypes =[]; + $("input[name='itemType']").each(function(){ + itemTypes.push($(this).val()); + }); if (serverId === '' || serverId == null) { erroCode.html('服务器id不能为空!'); return false; @@ -195,7 +251,9 @@ function sendSysMail() { "mailTitle": mailTitle, "mailContent": mailContent, "isAttach": isAttach, - "attach" :attach , + "itemIds[]": itemIds, + "itemNums[]": itemNums, + "itemTypes[]": itemTypes, "sendTime": sendTime, "playerRTime": playerRTime, "effectTime": effectTime, @@ -209,6 +267,9 @@ function sendSysMail() { if (data == 1) { layer.msg('发送全服邮件失败!', {icon: 6, time: 1000}); } + if (data === 2) { + layer.msg('发送邮件失败 道具不能为空!', {icon: 6, time: 1000}); + } } } ) diff --git a/src/main/resources/static/html/toAddCDKGoods.html b/src/main/resources/static/html/toAddCDKGoods.html index 057699b..e3659ad 100644 --- a/src/main/resources/static/html/toAddCDKGoods.html +++ b/src/main/resources/static/html/toAddCDKGoods.html @@ -100,8 +100,16 @@ * 礼包奖励:
- - +
+
+ 物品id: + 物品数量: + 物品类型: + + + + +
+
@@ -150,6 +158,34 @@ $('#sendNotice').load(function () { //location.href='BookResourceList.jsp' } }) +$(document).ready(function() { + var MaxInputs = 20; //maximum input boxes allowed + var InputsWrapper = $("#InputsWrapper"); //Input boxes wrapper ID + var AddButton = $("#AddMoreFileBox"); //Add button ID + + var x = InputsWrapper.length; //initlal text box count + var FieldCount=1; //to keep track of text box added + + $(AddButton).click(function (e) //on add input button click + { + if(x <= MaxInputs) //max input box allowed + { + FieldCount++; //text box added increment + //add input box + $(InputsWrapper).append('
物品id: 物品数量: 物品类型:×
'); + x++; //text box increment + } + return false; + }); + $("body").on("click",".removeclass", function(e){ //user click on remove text + if( x > 1 ) { + $(this).parent('div').remove(); //remove text box + x--; //decrement textbox + } + return false; + }) + +}); function toaddCDKInfo() { var erroCode = $('.GOODSNAME'); var goodsName = $("input[name='goodsName']").val(); @@ -157,8 +193,6 @@ function toaddCDKInfo() { var startTime = $("input[name='startTime']").val(); var endTime = $("input[name='endTime']").val(); var goodsInfo = $("input[name='goodsInfo']").val(); - var reward = $("input[name='reward']").val(); - alert(goodsName) if (goodsName === '' || goodsName == null) { erroCode.html('商品名称不能为空!'); return false; @@ -181,11 +215,6 @@ function toaddCDKInfo() { erroCode = $('.GOODSINFO'); erroCode.html('商品信息不能为空!'); return false; - } - if (reward === '' || reward == null) { - erroCode = $('.REWARD'); - erroCode.html('商品奖励不能为空!'); - return false; } return true; } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 70582ca..d7a2448 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,4 +1,5 @@  + @@ -50,77 +51,134 @@ diff --git a/src/main/resources/templates/itemFlow.html b/src/main/resources/templates/itemFlow.html index 810d6e9..8298119 100644 --- a/src/main/resources/templates/itemFlow.html +++ b/src/main/resources/templates/itemFlow.html @@ -90,7 +90,7 @@ + + + + + + + + + + + \ No newline at end of file