From cb21b38287ee199cf4011878f96cfaeccb305a05 Mon Sep 17 00:00:00 2001 From: Xiang Date: Sat, 9 May 2026 14:58:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B1=9F=E4=BD=93=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/JntyzxUserInfoConfigTask.java | 2 ++ .../miniapp/schedule/JtVenuePullTask.java | 27 +++++++++++-------- .../schedule/JtVenueTomorrowPullTask.java | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JntyzxUserInfoConfigTask.java b/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JntyzxUserInfoConfigTask.java index a17a291..0157db6 100644 --- a/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JntyzxUserInfoConfigTask.java +++ b/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JntyzxUserInfoConfigTask.java @@ -92,6 +92,7 @@ public class JntyzxUserInfoConfigTask extends BaseScheduleTaskTemplate { return taskResult; } venueInfoDOS = venueInfoDOS.stream() + .filter(item -> !item.getPlaceName().contains("小馆")) .sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo(item.getPlaceName()))) .toList(); @@ -103,6 +104,7 @@ public class JntyzxUserInfoConfigTask extends BaseScheduleTaskTemplate { List list = Lists.newArrayList(); int i = 0; + userInfoService.delAll(); for (UserTokenInfoDO user : users) { VenueInfoDO venueInfoDO = venueInfoDOS.get(i); UserInfoDO userInfoDO = new UserInfoDO(); diff --git a/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenuePullTask.java b/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenuePullTask.java index 0fcf618..594212f 100644 --- a/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenuePullTask.java +++ b/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenuePullTask.java @@ -121,18 +121,23 @@ public class JtVenuePullTask extends BaseScheduleTaskTemplate { } venueService.saveOrUpdateTodayVenueInfo(sitePositionLists); - List sitePositionLists6_8 = handleMsgSendList(sitePositionLists, 1); - StringBuffer msg = new StringBuffer( - "查询到18:00-20:00空闲场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now()) + "\n"); - sitePositionLists6_8.forEach(item -> { - msg.append(item.getPlaceName()).append("\n"); - }); - List sitePositionLists8_10 = handleMsgSendList(sitePositionLists, 2); - msg.append("查询到18:00-20:00空闲场地信息=====>\n时间:").append(DateUtils.getDateFromDate(LocalDate.now())).append("\n"); - sitePositionLists8_10.forEach(item -> msg.append(item.getPlaceName()).append("\n")); + StringBuffer msg = new StringBuffer(); - String key = RedisKeyConstant.JNTYZX_VENUE_MSG_SEND_KEY + RedisKeyConstant.getDate(); - msgSendUtils.sendMsgRestrict1Hours(key, msg.toString()); + List sitePositionLists6_8 = handleMsgSendList(sitePositionLists, 1); + if (CollectionUtils.isNotEmpty(sitePositionLists6_8)) { + msg.append("查询到18:00-20:00空闲场地信息=====>\n时间:").append(DateUtils.getDateFromDate(LocalDate.now())).append("\n"); + sitePositionLists6_8.forEach(item -> msg.append(item.getPlaceName()).append("\n")); + } + List sitePositionLists8_10 = handleMsgSendList(sitePositionLists, 2); + if (CollectionUtils.isNotEmpty(sitePositionLists8_10)) { + msg.append("查询到20:00-22:00空闲场地信息=====>\n时间:").append(DateUtils.getDateFromDate(LocalDate.now())).append("\n"); + sitePositionLists8_10.forEach(item -> msg.append(item.getPlaceName()).append("\n")); + } + + if (StringUtils.isNotBlank(msg)) { + String key = RedisKeyConstant.JNTYZX_VENUE_MSG_SEND_KEY + RedisKeyConstant.getDate(); + msgSendUtils.sendMsgRestrict1Hours(key, msg.toString()); + } taskResult.setSuccess(true); taskResult.setSummary("查询场地信息成功！时间:" + now); return taskResult; diff --git a/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenueTomorrowPullTask.java b/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenueTomorrowPullTask.java index fce854c..7e3072f 100644 --- a/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenueTomorrowPullTask.java +++ b/src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenueTomorrowPullTask.java @@ -125,7 +125,7 @@ public class JtVenueTomorrowPullTask extends BaseScheduleTaskTemplate { } map.put(sitePositionList.getPlaceName(), sitePositionList); } - StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + time + "\n"); + StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + " " + time + "\n"); map.forEach((placeName, sitePositionList) -> { msg.append(placeName).append("订购人：").append(sitePositionList.getContacts()).append("\n"); });