|
@@ -75,6 +75,8 @@ public class WorkWechatServiceImpl implements WorkWechatService {
|
|
|
|
|
|
JSONObject chatRoomInfo = this.getChatRoomInfo(uuid, 0);
|
|
|
Map<String, Integer> roomAutoRemoveUserStatusMap = this.getRoomAutoRemoveUserStatusMap();
|
|
|
+ Map<String, Integer> roomShowTip = this.getRoomShowTipMap();
|
|
|
+ Map<String, String> roomTipInfoMap = this.getRoomTipInfoMap();
|
|
|
|
|
|
JSONArray roomList = chatRoomInfo.getJSONArray("roomList");
|
|
|
|
|
@@ -92,6 +94,8 @@ public class WorkWechatServiceImpl implements WorkWechatService {
|
|
|
workWechatRoomDTO.setUuid(uuid);
|
|
|
workWechatRoomDTO.setRoomId(roomId);
|
|
|
workWechatRoomDTO.setRoomName(room.getString("nickname"));
|
|
|
+ workWechatRoomDTO.setShowTip(roomShowTip.getOrDefault(roomId, 0));
|
|
|
+ workWechatRoomDTO.setTipInfo(roomTipInfoMap.getOrDefault(roomId, ""));
|
|
|
workWechatRoomDTO.setAutoRemoveUserSwitch(roomAutoRemoveUserStatusMap.getOrDefault(roomId, 0));
|
|
|
filteredRooms.add(workWechatRoomDTO);
|
|
|
}
|
|
@@ -207,4 +211,15 @@ public class WorkWechatServiceImpl implements WorkWechatService {
|
|
|
List<WorkWechatRoomInfo> workWechatRoomInfos = workWechatRoomInfoMapper.selectByExample(example);
|
|
|
return workWechatRoomInfos.stream().collect(Collectors.toMap(WorkWechatRoomInfo::getRoomId, WorkWechatRoomInfo::getAutoRemoveUserSwitch, (o1, o2) -> o2));
|
|
|
}
|
|
|
+
|
|
|
+ private Map<String, Integer> getRoomShowTipMap() {
|
|
|
+ WorkWechatRoomInfoExample example = new WorkWechatRoomInfoExample();
|
|
|
+ List<WorkWechatRoomInfo> workWechatRoomInfos = workWechatRoomInfoMapper.selectByExample(example);
|
|
|
+ return workWechatRoomInfos.stream().collect(Collectors.toMap(WorkWechatRoomInfo::getRoomId, WorkWechatRoomInfo::getShowtip, (o1, o2) -> o2));
|
|
|
+ }
|
|
|
+ private Map<String, String> getRoomTipInfoMap() {
|
|
|
+ WorkWechatRoomInfoExample example = new WorkWechatRoomInfoExample();
|
|
|
+ List<WorkWechatRoomInfo> workWechatRoomInfos = workWechatRoomInfoMapper.selectByExample(example);
|
|
|
+ return workWechatRoomInfos.stream().collect(Collectors.toMap(WorkWechatRoomInfo::getRoomId, WorkWechatRoomInfo::getTipinfo, (o1, o2) -> o2));
|
|
|
+ }
|
|
|
}
|