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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 51a35a9..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;
@@ -26,6 +27,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.*;
import com.dsh.guns.modular.system.service.*;
+import com.dsh.guns.modular.system.util.DateComparisonExample;
import com.dsh.guns.modular.system.util.HttpRequestUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
@@ -1021,9 +1023,12 @@
private SiteClient siteClient;
+ @Autowired
+ private ISiteLockService siteLockService;
+
@RequestMapping("/yuyuetimes/{id}")
@ResponseBody
- public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date) {
+ public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date,String siteName,String halfName) {
System.out.println("=======date======"+date);
List<String> strings = new ArrayList<>();
@@ -1043,9 +1048,7 @@
}
System.out.println("======strings======="+strings);
-
List<OrderDto> timeRanges = new ArrayList<>();
-
Site site = siteClient.listById(id);
System.out.println("================"+site);
@@ -1060,8 +1063,6 @@
}else {
nextTime= getNextTime(currentTime);
}
-// String nextTime = getNextTime(currentTime);
-
String timeRange = currentTime + "-" + nextTime;
OrderDto orderDto = new OrderDto();
@@ -1085,6 +1086,10 @@
System.out.println("-------------"+timeRanges);
return timeRanges;
+
+
+
+
}
--
Gitblit v1.7.1