generated from root/miduo_server
服务器列表bug
parent
a4f70e204c
commit
5858117a41
|
|
@ -15,7 +15,6 @@ import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
public class GetServerListController extends HttpServlet {
|
public class GetServerListController extends HttpServlet {
|
||||||
private final static String _COLLECTION_NAME = "server_info";
|
private final static String _COLLECTION_NAME = "server_info";
|
||||||
|
|
@ -50,20 +49,23 @@ public class GetServerListController extends HttpServlet {
|
||||||
response.sendError(400, "parm is wrong");
|
response.sendError(400, "parm is wrong");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// DBObject req = new BasicDBObject();
|
|
||||||
// req.put("channel", channel);
|
DBObject req = new BasicDBObject();
|
||||||
// req.put("sub_channel", sub_channel);
|
req.put("channel", channel);
|
||||||
// req.put("plat", plat);
|
req.put("sub_channel", sub_channel);
|
||||||
// req.put("server_version", Integer.valueOf(server_version));
|
req.put("plat", plat);
|
||||||
|
req.put("server_version", Integer.valueOf(server_version));
|
||||||
|
|
||||||
List<DBObject> serverList = new ArrayList<>();
|
List<DBObject> serverList = new ArrayList<>();
|
||||||
// long local = System.currentTimeMillis();
|
long local = System.currentTimeMillis();
|
||||||
// if ((local - lastRefreshTime) > 10 * 1000 || serverInfosCache.isEmpty()) {
|
// if ((local - lastRefreshTime) > 10 * 1000 || serverInfosCache.isEmpty()) {
|
||||||
serverInfosCache.clear();
|
serverInfosCache.clear();
|
||||||
// lastRefreshTime = local;
|
lastRefreshTime = local;
|
||||||
recommend = "";
|
recommend = "";
|
||||||
|
|
||||||
whiteListCache = BaseGlobal.getInstance().mongoDBPool.findOne(_WHITE_LIST, openId);
|
whiteListCache = BaseGlobal.getInstance().mongoDBPool.findOne(_WHITE_LIST, openId);
|
||||||
List<DBObject> serverInfoList = BaseGlobal.getInstance().mongoDBPool.findAll(_COLLECTION_NAME);
|
|
||||||
|
List<DBObject> serverInfoList = BaseGlobal.getInstance().mongoDBPool.find(_COLLECTION_NAME, req);
|
||||||
SortedSet<String> newServerList = new TreeSet<>();
|
SortedSet<String> newServerList = new TreeSet<>();
|
||||||
String maxNumServerId= "";
|
String maxNumServerId= "";
|
||||||
int maxNum = 0;
|
int maxNum = 0;
|
||||||
|
|
@ -129,21 +131,7 @@ public class GetServerListController extends HttpServlet {
|
||||||
|
|
||||||
|
|
||||||
// } else {
|
// } else {
|
||||||
// Set<DBObject> collect = serverInfosCache.values().stream().filter(dbObject -> {
|
// serverList.addAll(serverInfosCache.values());
|
||||||
//
|
|
||||||
// if(dbObject.containsField("channel")&&!dbObject.get("channel").equals(channel) ){
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
// if(dbObject.containsField("sub_channel")&&!dbObject.get("sub_channel").equals(sub_channel)){
|
|
||||||
// return false;
|
|
||||||
// } if( dbObject.containsField("plat")&&! dbObject.get("plat").equals(plat)){
|
|
||||||
// return false;
|
|
||||||
// } if( dbObject.containsField("server_version")&&!dbObject.get("server_version").equals(server_version)){
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
// return true;
|
|
||||||
// }).collect(Collectors.toSet());
|
|
||||||
// serverList.addAll(collect);
|
|
||||||
// }
|
// }
|
||||||
|
|
||||||
//获取我的服务器列表
|
//获取我的服务器列表
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue