diff --git a/src/main/java/com/jmfy/controller/LoginController.java b/src/main/java/com/jmfy/controller/LoginController.java index 9f3aa3e..acda6ad 100644 --- a/src/main/java/com/jmfy/controller/LoginController.java +++ b/src/main/java/com/jmfy/controller/LoginController.java @@ -20,6 +20,7 @@ import javax.servlet.http.HttpSession; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; /** @@ -55,6 +56,8 @@ public class LoginController { powersVo.setUserName(admin.getUserName()); updatePowers(powersVo,admin.getPowers()); map.put("powersVo",powersVo); + admin.getPowers().contains(53); + return "index"; } else { return "redirect:/login"; @@ -63,7 +66,7 @@ public class LoginController { - private void updatePowers(PowersVo powersVo,List powerList) { + private void updatePowers(PowersVo powersVo, HashSet powerList) { for (Integer str : powerList) { switch (str) { case 1: @@ -213,6 +216,12 @@ public class LoginController { case 50: powersVo.setAdminList(0); break; + case 52: + powersVo.setBannedList(0); + break; + case 53: + powersVo.setSupport(0); + break; } } @@ -259,7 +268,7 @@ public class LoginController { CAdminVo cAdminVo = new CAdminVo(); cAdminVo.setUserName(cAdmin.getUserName()); String power; - List powerList = cAdmin.getPowers(); + HashSet powerList = cAdmin.getPowers(); if (powerList.size() != 0) { power = getPower(powerList); } else { @@ -274,7 +283,7 @@ public class LoginController { return "member-list"; } - private String getPower(List powerList) { + private String getPower(HashSet powerList) { StringBuilder power = new StringBuilder(); for (Integer str : powerList) { String powers = ""; @@ -427,6 +436,12 @@ public class LoginController { case 50: powers = "用户管理"; break; + case 52: + powers = "封禁管理"; + break; + case 53: + powers = "扶持审核"; + break; diff --git a/src/main/java/com/jmfy/controller/ServerInfoController.java b/src/main/java/com/jmfy/controller/ServerInfoController.java index f0c246a..8e4ef35 100644 --- a/src/main/java/com/jmfy/controller/ServerInfoController.java +++ b/src/main/java/com/jmfy/controller/ServerInfoController.java @@ -93,6 +93,8 @@ public class ServerInfoController { serverInfo.setOpen_time(cServerOpenTime.getOpenTime()); } } + serverInfo.setRegister_state(serverInfo.getRegister_state()); + System.out.println(serverInfo); map.addAttribute("serverInfo", serverInfo); return "serverInfoEdit"; } @@ -103,9 +105,11 @@ public class ServerInfoController { int status = Integer.parseInt(request.getParameter("status")); String name = request.getParameter("name"); String server_id = request.getParameter("server_id"); - int isnew = Integer.parseInt(request.getParameter("isnew")); + int isnew = Integer.parseInt(request.getParameter("is_new")); String opentime = request.getParameter("startTime"); - serverInfoDao.updateServerInfo(server_id, status, 0, isnew, name); + String register_state = request.getParameter("register_state"); + System.out.println(register_state); + serverInfoDao.updateServerInfo(server_id, status, 0, isnew, name,register_state); if(status==-1){ //自动开服修改开服时间 RedisUtil.getInstence().putObject(String.valueOf(server_id) + RedisUserKey.Delimiter_colon + RedisUserKey.AUTOOPENTIME, "", opentime, -1); diff --git a/src/main/java/com/jmfy/dao/ServerInfoDao.java b/src/main/java/com/jmfy/dao/ServerInfoDao.java index ef11b46..5897346 100644 --- a/src/main/java/com/jmfy/dao/ServerInfoDao.java +++ b/src/main/java/com/jmfy/dao/ServerInfoDao.java @@ -19,7 +19,7 @@ public interface ServerInfoDao { void openServerWhite(String server_id) throws Exception; - void updateServerInfo(String server_id, int status,int isWhite,int isnew,String name) throws Exception; + void updateServerInfo(String server_id, int status,int isWhite,int isnew,String name,String register_state) throws Exception; void updateOpenServerTime(CServerOpenTime cServerOpenTime,String serverId) throws Exception; diff --git a/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java b/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java index 5c5bab9..2d72c60 100644 --- a/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java +++ b/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java @@ -64,12 +64,13 @@ public class ServerInfoDaoImpl implements ServerInfoDao { } @Override - public void updateServerInfo(String server_id, int status,int isWhite,int is_new,String name) throws Exception { + public void updateServerInfo(String server_id, int status,int isWhite,int is_new,String name,String register_state) throws Exception { Update update = new Update(); update.set("name",name); update.set("status",String.valueOf(status)); update.set("isWhite",String.valueOf(isWhite)); update.set("is_new",String.valueOf(is_new)); + update.set("register_state",register_state); 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/handler/GMHandler.java b/src/main/java/com/jmfy/handler/GMHandler.java index a8bed41..1843967 100644 --- a/src/main/java/com/jmfy/handler/GMHandler.java +++ b/src/main/java/com/jmfy/handler/GMHandler.java @@ -25,7 +25,6 @@ public class GMHandler extends BaseHandler { private UserInfoDao gsUserDao; public int execute(JSONObject jsonObject) throws Exception { - String uid; int dsid; int treat_type; diff --git a/src/main/java/com/jmfy/model/CAdmin.java b/src/main/java/com/jmfy/model/CAdmin.java index be1e26f..4b33472 100644 --- a/src/main/java/com/jmfy/model/CAdmin.java +++ b/src/main/java/com/jmfy/model/CAdmin.java @@ -5,7 +5,9 @@ import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Field; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Document(collection = "c_admin") public class CAdmin { @@ -22,7 +24,7 @@ public class CAdmin { private int identity; @Field(value = "power") - private List powers = new ArrayList<>(); + private HashSet powers = new HashSet<>(); public String getId() { return id; @@ -44,11 +46,11 @@ public class CAdmin { this.password = password; } - public List getPowers() { + public HashSet getPowers() { return powers; } - public void setPowers(List powers) { + public void setPowers(HashSet powers) { this.powers = powers; } diff --git a/src/main/java/com/jmfy/model/ServerInfo.java b/src/main/java/com/jmfy/model/ServerInfo.java index 88ce873..8a5a6ad 100644 --- a/src/main/java/com/jmfy/model/ServerInfo.java +++ b/src/main/java/com/jmfy/model/ServerInfo.java @@ -52,6 +52,9 @@ public class ServerInfo { @Field(value = "open_type") private String open_type; + @Field(value = "register_state") + private String register_state; + public ServerInfo(int _id, String name) { this._id = _id; this.server_id = String.valueOf(_id); @@ -153,4 +156,27 @@ public class ServerInfo { public void setOpen_type(String open_type) { this.open_type = open_type; } + + public String getRegister_state() { return register_state==null?"1":register_state; } + + public void setRegister_state(String register_state) { this.register_state = register_state; } + + @Override + public String toString() { + return "ServerInfo{" + + "_id=" + _id + + ", name='" + name + '\'' + + ", IP='" + IP + '\'' + + ", port='" + port + '\'' + + ", server_id='" + server_id + '\'' + + ", channel='" + channel + '\'' + + ", sub_channel='" + sub_channel + '\'' + + ", status='" + status + '\'' + + ", plat='" + plat + '\'' + + ", open_time='" + open_time + '\'' + + ", is_new='" + is_new + '\'' + + ", open_type='" + open_type + '\'' + + ", register_state='" + register_state + '\'' + + '}'; + } } diff --git a/src/main/java/com/jmfy/model/vo/PowersVo.java b/src/main/java/com/jmfy/model/vo/PowersVo.java index 9076dc9..d33945c 100644 --- a/src/main/java/com/jmfy/model/vo/PowersVo.java +++ b/src/main/java/com/jmfy/model/vo/PowersVo.java @@ -42,6 +42,7 @@ public class PowersVo { public int dowOrderList=1; public int bannedManage=1; public int bannedPost=1; + public int bannedList = 1; public int updateRoleName=1; public int grossWeight=1; public int InfoManage=1; @@ -54,6 +55,8 @@ public class PowersVo { public int personMailAudit=1; public int chatInfoManage=1; public int chatInfoFind=1; + public int support = 1; + public int getChannelGame() { return channelGame; @@ -454,4 +457,20 @@ public class PowersVo { public void setAdminList(int adminList) { this.adminList = adminList; } + + public int getBannedList() { + return bannedList; + } + + public void setBannedList(int bannedList) { + this.bannedList = bannedList; + } + + public int getSupport() { + return support; + } + + public void setSupport(int support) { + this.support = support; + } } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 5a3ca96..63abec7 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -74,7 +74,7 @@
  • 服务器信息
  • 添加服务器
  • @@ -141,7 +141,6 @@ - @@ -173,6 +172,9 @@
    禁言/踢人/禁登录/改名
      + diff --git a/src/main/resources/templates/permission-setting.html b/src/main/resources/templates/permission-setting.html index fd20aab..795fcaf 100644 --- a/src/main/resources/templates/permission-setting.html +++ b/src/main/resources/templates/permission-setting.html @@ -297,6 +297,12 @@
        +
        +
      • + + +
      • +
      • @@ -315,8 +321,7 @@
      • -
        -
        +
      @@ -421,6 +426,12 @@
    +
    +
  • + + +
  • +
    diff --git a/src/main/resources/templates/serverInfoEdit.html b/src/main/resources/templates/serverInfoEdit.html index 1b83336..2ab5601 100644 --- a/src/main/resources/templates/serverInfoEdit.html +++ b/src/main/resources/templates/serverInfoEdit.html @@ -89,10 +89,28 @@ * 服务器推荐:
    - - + +
    + +
    + +
    + + +
    @@ -143,6 +161,21 @@ $(document).ready(function () { var flag = $("#status").val(); + var register_state=$("#register_state").val(); + var is_new=$("#is_new").val(); + if (register_state === "1"){ + $("#register_state1 option[value='" + register_state + "']").attr("selected", "selected"); + } else if(register_state === "0"){ + $("#register_state1 option[value='" + register_state + "']").attr("selected", "selected"); + } + + if (is_new === "1"){ + $("#is_new1 option[value='" + is_new + "']").attr("selected", "selected"); + } else if(register_state === "0"){ + $("#is_new1 option[value='" + is_new + "']").attr("selected", "selected"); + } + + //根据值让option选中 if (flag === "4") { $("#status1 option[value='" + flag + "']").attr("selected", "selected");