.
This commit is contained in:
@@ -126,7 +126,7 @@ public class TaskQueue<T extends Object> extends BaseService implements Runnable
|
||||
cacheSource.set(30 * 60, cacheKey, ids);
|
||||
}
|
||||
|
||||
int[] contentids = new int[limit];
|
||||
int[] contentids = new int[((List<Integer>) ids).size()];
|
||||
for (int i = 0; i < ((List<Integer>) ids).size(); i++) {
|
||||
contentids[i] = ((List<Integer>) ids).get(i);
|
||||
}
|
||||
|
@@ -17,6 +17,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
*
|
||||
* Created by liangxianyou at 2018/7/8 22:51.
|
||||
*/
|
||||
@SuppressWarnings("Duplicates")
|
||||
@RestWebSocket(name = "chat", catalog = "ws", comment = "文字聊天", anyuser = true)
|
||||
public class ChatWebSocket extends WebSocket {
|
||||
|
||||
|
@@ -18,7 +18,9 @@ import org.redkale.util.ResourceType;
|
||||
import javax.annotation.Resource;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@ResourceType(ImFriendService.class)
|
||||
@RestService(name = "imfriend",automapping = true, comment = "好友管理")
|
||||
@@ -51,7 +53,7 @@ public class ImFriendServiceImpl extends BaseService implements ImFriendService
|
||||
List<Kv> friend = new ArrayList<>();
|
||||
List<Kv> group = new ArrayList<>();
|
||||
|
||||
List list = new ArrayList();
|
||||
List<Kv> list = new ArrayList();
|
||||
records.forEach(x->{
|
||||
Kv _friend = Kv.by("id", x.getUserid());
|
||||
_friend.set("username", x.getNickname());
|
||||
@@ -61,7 +63,10 @@ public class ImFriendServiceImpl extends BaseService implements ImFriendService
|
||||
list.add(_friend);
|
||||
});
|
||||
|
||||
friend.add(Kv.by("groupname", "默认分组").set("id", 1).set("online", list.size()).set("list", list));
|
||||
//把自己排在最上面
|
||||
List<Kv> _list = list.stream().sorted(Comparator.comparing(x -> !x.getStr("username").equals(mine.getStr("username")))).collect(Collectors.toList());
|
||||
|
||||
friend.add(Kv.by("groupname", "默认分组").set("id", 1).set("online", _list.size()).set("list", _list));
|
||||
group.add(Kv.by("groupname", "默认分组").set("id", 1).set("avatar", "/res/images/avatar/13.jpg"));
|
||||
|
||||
data.set("mine", mine).set("friend", friend).set("group", group);
|
||||
|
Reference in New Issue
Block a user