Commit f21c049d authored by 赵啸非's avatar 赵啸非

添加通知

parent b2af6ec6
......@@ -25,10 +25,7 @@ import com.mortals.xhx.module.room.model.RoomDeviceQuery;
import com.mortals.xhx.module.room.service.RoomDeviceService;
import org.springframework.util.ObjectUtils;
import java.util.Date;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
......@@ -60,6 +57,7 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity
super.findAfter(params, pageInfo, context, list);
Map<Long, Long> collect = workmanService.find(new WorkmanQuery()).stream().collect(Collectors.groupingBy(x -> x.getRoomId(), Collectors.counting()));
list.forEach(item -> {
item.setNoticeList(new ArrayList<>());
List<NoticeRoomEntity> noticeRoomEntities = noticeRoomService.find(new NoticeRoomQuery().roomId(item.getId()));
if (!ObjectUtils.isEmpty(noticeRoomEntities)) {
NoticeQuery noticeQuery = new NoticeQuery();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment