diff --git a/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenuePullTask.java b/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenuePullTask.java index 669ec8b..ecbcfbe 100644 --- a/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenuePullTask.java +++ b/xservice-server/src/main/java/com/xiang/app/schedule/jntyzx/JtVenuePullTask.java @@ -18,8 +18,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.time.DayOfWeek; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; import java.util.Objects; @@ -47,6 +47,8 @@ public class JtVenuePullTask { return; } String token; + LocalDateTime now = LocalDateTime.now(); + int dayOfWeek = now.getDayOfWeek().getValue(); for (UserTokenInfoDO userTokenInfoDO : availableUser) { if (Objects.isNull(userTokenInfoDO)) { @@ -62,14 +64,11 @@ public class JtVenuePullTask { } venueService.saveOrUpdateTodayVenueInfo(sitePositionLists); - sitePositionLists = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList(); - if (CollectionUtils.isEmpty(sitePositionLists)) { - return; - } - sitePositionLists = sitePositionLists.stream().filter(item -> StringUtils.equals(item.getContacts(), "0")).toList(); + sitePositionLists = handleMsgSendList(sitePositionLists, dayOfWeek); if (CollectionUtils.isEmpty(sitePositionLists)) { return; } + StringBuffer msg = new StringBuffer("查询到20:00-22:00空闲场地信息===>时间:" + DateUtils.getDateFromDate(LocalDate.now()) + "\n"); sitePositionLists.forEach(item -> { msg.append(item.getPlaceName()).append("\n"); @@ -77,4 +76,18 @@ public class JtVenuePullTask { jtDingTalkFactory.sendMsg(msg.toString()); } } + + private List handleMsgSendList(List sitePositionLists, int dayOfWeek) { + if (dayOfWeek == 6 || dayOfWeek == 7) { + return sitePositionLists.stream() + .filter(VenueInfoUtils::get8210VenueInfo) + .filter(item -> StringUtils.equals(item.getContacts(), "0")) + .filter(item -> !item.getPlaceName().contains("小馆")) + .toList(); + } + return sitePositionLists.stream() + .filter(VenueInfoUtils::get8210VenueInfo) + .filter(item -> StringUtils.equals(item.getContacts(), "0")) + .toList(); + } }