diff --git a/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java b/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java index b88c8a3..89dfa8a 100644 --- a/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java +++ b/src/main/java/com/jmfy/dao/impl/ServerInfoDaoImpl.java @@ -14,9 +14,11 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Component public class ServerInfoDaoImpl implements ServerInfoDao { @@ -29,7 +31,8 @@ public class ServerInfoDaoImpl implements ServerInfoDao { @Override public List getAllServerInfo() throws Exception { MongoTemplate mongoTemplate = connect.getMongoTemplete(dbName); - return mongoTemplate.find(new Query(), ServerInfo.class); + List serverInfos = mongoTemplate.find(new Query(), ServerInfo.class); + return serverInfos.stream().sorted().collect(Collectors.toList()); } @Override diff --git a/src/main/java/com/jmfy/model/ServerInfo.java b/src/main/java/com/jmfy/model/ServerInfo.java index 653f526..3d34b7d 100644 --- a/src/main/java/com/jmfy/model/ServerInfo.java +++ b/src/main/java/com/jmfy/model/ServerInfo.java @@ -125,6 +125,10 @@ public class ServerInfo implements Comparable,Cloneable { this.server_id = server_id; } + public int getServerId(){ + return Integer.parseInt(server_id); + } + public String getChannel() { return channel; } diff --git a/src/main/resources/templates/serverListEdit.html b/src/main/resources/templates/serverListEdit.html index 03809a4..4659c0b 100644 --- a/src/main/resources/templates/serverListEdit.html +++ b/src/main/resources/templates/serverListEdit.html @@ -101,7 +101,7 @@ // 批量修改服务器状态 function updateCrossId() { var serverId = serverInfos.getValue('valueStr'); - var crossId = $("#crossId").val().toString(); + var crossId = $("#crossId").val(); $.ajax({ type: "POST", data: {