From e9085eb620dcae1ceae24bc8b70e1a6bca228b15 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 19:58:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 118 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 32c31f1..b72b9d6 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -1023,71 +1023,71 @@
+
@RequestMapping("/yuyuetimes/{id}")
@ResponseBody
- public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String day,String siteName,String halfName) {
-// System.out.println("=======date======"+date);
-//
-// List<String> strings = new ArrayList<>();
-//
-//// List<SiteBooking> siteBookings = siteClient.listBooks(id);
-// List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>()
-// .eq("siteId", id).like("times",date));
-//System.out.println("=======siteBookings======"+siteBookings);
-// for (SiteBooking siteBooking : siteBookings) {
-// String[] split = siteBooking.getTimes().split(";");
-// for (String s : split) {
-//
-// String convertedValue = s.substring(11);
-// strings.add(convertedValue);
-// }
-//
-// }
-// System.out.println("======strings======="+strings);
-//
-// List<OrderDto> timeRanges = new ArrayList<>();
-//
-// Site site = siteClient.listById(id);
-//System.out.println("================"+site);
-// String appointmentStartTime = site.getAppointmentStartTime();
-// String appointmentEndTime = site.getAppointmentEndTime();
-//
-// String currentTime = appointmentStartTime;
-// while (currentTime.compareTo(appointmentEndTime) < 0) {
-// String nextTime = null;
-// if("智慧场地".equals(site.getTypeName())){
-// nextTime=getNextTimeOne(currentTime);
-// }else {
-// nextTime= getNextTime(currentTime);
-// }
-//
-// String timeRange = currentTime + "-" + nextTime;
-// OrderDto orderDto = new OrderDto();
-// orderDto.setTime(timeRange);
-//
-// LocalTime currentTime1 = LocalTime.now();
-// LocalTime targetTime = LocalTime.parse(currentTime);
-//
-// boolean hasExceeded = currentTime1.isAfter(targetTime);
-// if (hasExceeded){
-// orderDto.setState(0);
-// }
-// if (strings.contains(timeRange)){
-// orderDto.setState(0);
-// }
-//
-//
-// timeRanges.add(orderDto);
-// currentTime = nextTime;
-// }
-// System.out.println("-------------"+timeRanges);
-//
-// return timeRanges;
+ public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date,String siteName,String halfName) {
+ System.out.println("=======date======"+date);
+
+ List<String> strings = new ArrayList<>();
+
+// List<SiteBooking> siteBookings = siteClient.listBooks(id);
+ List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>()
+ .eq("siteId", id).like("times",date));
+System.out.println("=======siteBookings======"+siteBookings);
+ for (SiteBooking siteBooking : siteBookings) {
+ String[] split = siteBooking.getTimes().split(";");
+ for (String s : split) {
+
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue);
+ }
+
+ }
+ System.out.println("======strings======="+strings);
+
+ List<OrderDto> timeRanges = new ArrayList<>();
+
+ Site site = siteClient.listById(id);
+System.out.println("================"+site);
+ String appointmentStartTime = site.getAppointmentStartTime();
+ String appointmentEndTime = site.getAppointmentEndTime();
+
+ String currentTime = appointmentStartTime;
+ while (currentTime.compareTo(appointmentEndTime) < 0) {
+ String nextTime = null;
+ if("智慧场地".equals(site.getTypeName())){
+ nextTime=getNextTimeOne(currentTime);
+ }else {
+ nextTime= getNextTime(currentTime);
+ }
+
+ String timeRange = currentTime + "-" + nextTime;
+ OrderDto orderDto = new OrderDto();
+ orderDto.setTime(timeRange);
+
+ LocalTime currentTime1 = LocalTime.now();
+ LocalTime targetTime = LocalTime.parse(currentTime);
+
+ boolean hasExceeded = currentTime1.isAfter(targetTime);
+ if (hasExceeded){
+ orderDto.setState(0);
+ }
+ if (strings.contains(timeRange)){
+ orderDto.setState(0);
+ }
+
+
+ timeRanges.add(orderDto);
+ currentTime = nextTime;
+ }
+ System.out.println("-------------"+timeRanges);
+
+ return timeRanges;
-return null;
}
--
Gitblit v1.7.1