|
|
@@ -152,8 +152,10 @@ public class SmsbItemPushServiceImpl implements ISmsbItemPushService {
|
|
|
List<SmsbMinioDataVo> sourceList = getSourceListByProgram(itemPushVo,reviewVo);
|
|
|
reviewVo.setResourceList(sourceList);
|
|
|
}
|
|
|
+ // 根据pushId+deviceId 获取本次发布的时间段
|
|
|
+ Long oneDeviceId = deviceList.get(0).getId();
|
|
|
List<SmsbItemPushPlaylistVo> pushPlaylistVos = smsbItemPushPlaylistMapper.selectVoList(new LambdaQueryWrapper<SmsbItemPushPlaylist>()
|
|
|
- .eq(SmsbItemPushPlaylist::getPushId, pushId));
|
|
|
+ .eq(SmsbItemPushPlaylist::getPushId, pushId).eq(SmsbItemPushPlaylist::getDeviceId,oneDeviceId));
|
|
|
String dateStart = pushPlaylistVos.get(0).getStartDate();
|
|
|
String dateEnd = pushPlaylistVos.get(0).getEndDate();
|
|
|
List<SmsbItemPushTimeRangeBo> timeRangeList = new ArrayList<>();
|