From 69257b5c80332b9f8e2016d4e7ab3fb6e36fb4e1 Mon Sep 17 00:00:00 2001 From: Xiang Date: Mon, 15 Dec 2025 17:32:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=9C=BA=E5=9C=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/jntyzx/constants/UrlConstant.java | 3 ++- .../script/jntyzx/controller/VenueController.java | 7 +++++++ .../script/jntyzx/service/IVenueService.java | 1 + .../script/jntyzx/service/IVenueServiceHttp.java | 3 ++- .../jntyzx/service/VenueServiceHttpImpl.java | 14 +++++++++++++- .../script/jntyzx/service/VenueServiceImpl.java | 12 +++++++++++- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/constants/UrlConstant.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/constants/UrlConstant.java index 67c0d37..5b2fb8f 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/constants/UrlConstant.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/constants/UrlConstant.java @@ -14,7 +14,8 @@ public class UrlConstant { /** * 查询当天的场地信息 */ - public final static String QUERY_SUBSCRIBE_URL = GNTYZX_BASE_URL + "/GYM-JN/multi/Subscribe/getSubscribeByToday"; + public final static String QUERY_TODAY_SUBSCRIBE_URL = GNTYZX_BASE_URL + "/GYM-JN/multi/Subscribe/getSubscribeByToday"; + public final static String QUERY_TOMORROW_SUBSCRIBE_URL = GNTYZX_BASE_URL + "/GYM-JN/multi/Subscribe/getSubscribeByTomorrow"; /** * 订阅场地 diff --git a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/controller/VenueController.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/controller/VenueController.java index 2bf0078..55fa340 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/controller/VenueController.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/controller/VenueController.java @@ -1,6 +1,7 @@ package com.xiang.xservice.application.script.jntyzx.controller; import com.xiang.xservice.application.script.jntyzx.entity.pojo.VenueInfoDO; +import com.xiang.xservice.application.script.jntyzx.entity.resp.query.SitePositionList; import com.xiang.xservice.application.script.jntyzx.service.IVenueService; import com.xiang.xservice.application.script.jntyzx.service.IVenueServiceHttp; import com.xiang.xservice.basic.common.resp.Result; @@ -30,6 +31,12 @@ public class VenueController { return Result.success(); } + @PostMapping("/getTomorrowVenue") + public Result getTomorrowVenue() { + List sitePositionLists = venueService.queryTomorrowVenue(); + return Result.success(sitePositionLists); + } + @PostMapping("addSubscribe") public Result addSubscribe() { List venueInfoDOS = venueService.queryCanBuyVenue(); diff --git a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/IVenueService.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/IVenueService.java index 6718fa8..44e3300 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/IVenueService.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/IVenueService.java @@ -12,6 +12,7 @@ import java.util.List; public interface IVenueService { List queryVenueService(); + List queryTomorrowVenue(); List queryCanBuyVenue(); } diff --git a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/IVenueServiceHttp.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/IVenueServiceHttp.java index 5e5c586..3b66159 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/IVenueServiceHttp.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/IVenueServiceHttp.java @@ -12,9 +12,10 @@ import java.util.List; public interface IVenueServiceHttp { /** - * 查询今日6-10可用场地 + * 查询今日可用场地 */ List queryAvailable(String isWeekend, String token); + List queryAvailableTomorrow(String isWeekend, String token); /** * 订单创建 diff --git a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/VenueServiceHttpImpl.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/VenueServiceHttpImpl.java index 2274b6d..8c19aab 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/VenueServiceHttpImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/VenueServiceHttpImpl.java @@ -15,6 +15,7 @@ import com.xiang.xservice.basic.utils.Base64; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -34,7 +35,12 @@ public class VenueServiceHttpImpl implements IVenueServiceHttp { @Override public List queryAvailable(String isWeekend, String token) { - String url = UrlConstant.QUERY_SUBSCRIBE_URL; + String url = UrlConstant.QUERY_TODAY_SUBSCRIBE_URL; + return querySitePositionInfo(isWeekend, token, url); + } + + @NotNull + private static List querySitePositionInfo(String isWeekend, String token, String url) { Map header = Maps.newHashMap(); header.put("X-Access-Token", token); String resp = null; @@ -82,6 +88,12 @@ public class VenueServiceHttpImpl implements IVenueServiceHttp { return res; } + @Override + public List queryAvailableTomorrow(String isWeekend, String token) { + String url = UrlConstant.QUERY_TOMORROW_SUBSCRIBE_URL; + return querySitePositionInfo(isWeekend, token, url); + } + @Override public Boolean createOrder(List venueInfos) { diff --git a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/VenueServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/VenueServiceImpl.java index aab221a..9091312 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/VenueServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/script/jntyzx/service/VenueServiceImpl.java @@ -5,6 +5,7 @@ import com.google.common.collect.Maps; import com.xiang.xservice.application.script.jntyzx.entity.pojo.VenueInfoDO; import com.xiang.xservice.application.script.jntyzx.entity.resp.query.SitePositionList; import com.xiang.xservice.application.script.jntyzx.manage.IVenueInfoManage; +import com.xiang.xservice.basic.utils.DateUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -40,6 +41,15 @@ public class VenueServiceImpl implements IVenueService { return sitePositionLists; } + public List queryTomorrowVenue() { + List sitePositionLists = venueServiceHttp.queryAvailableTomorrow("1", STATIC_TOKEN); + if (CollectionUtils.isEmpty(sitePositionLists)) { + return Lists.newArrayList(); + } + updateDatabase(sitePositionLists); + return sitePositionLists; + } + @Override public List queryCanBuyVenue() { return venueInfoManage.queryByType(LocalDate.now(), 0); @@ -65,7 +75,7 @@ public class VenueServiceImpl implements IVenueService { } else { VenueInfoDO venueInfoDO = new VenueInfoDO(); venueInfoDO.setPlaceName(sitePositionList.getPlaceName()); - venueInfoDO.setDate(LocalDate.now()); + venueInfoDO.setDate(DateUtils.getDateFromStr(sitePositionList.getAppointments())); venueInfoDO.setPlaceMainId(sitePositionList.getId()); venueInfoDO.setPlaceId(sitePositionList.getPlaceId()); venueInfoDO.setScheduleId(Integer.valueOf(sitePositionList.getScheduleId()));