From 4d17e9219dfeb41db32e82340ec9af9faedb4ca5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 27 十一月 2023 16:06:34 +0800
Subject: [PATCH] 11.27.3

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java |  120 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 61 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..2ab516e 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
@@ -19,6 +19,7 @@
 import com.dsh.course.feignClient.other.BallClient;
 import com.dsh.course.feignClient.other.SiteClient;
 import com.dsh.course.feignClient.other.model.Site;
+import com.dsh.course.service.ISiteLockService;
 import com.dsh.course.service.TGameConfigService;
 import com.dsh.guns.config.UserExt;
 import com.dsh.guns.core.base.controller.BaseController;
@@ -1022,72 +1023,73 @@
    private SiteClient siteClient;
 
 
+    @Autowired
+    private ISiteLockService siteLockService;
 
     @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