11.27.3

nickchange

2023-11-27 4d17e9219dfeb41db32e82340ec9af9faedb4ca5

 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,15 +1023,19 @@
   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<>();

//        List<SiteBooking> siteBookings = siteClient.listBooks(id);
        List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).like("times",date));
        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(";");
@@ -1042,9 +1048,7 @@
        }
    System.out.println("======strings======="+strings);


        List<OrderDto> timeRanges = new ArrayList<>();


       Site site =  siteClient.listById(id);
System.out.println("================"+site);
@@ -1059,8 +1063,6 @@
            }else {
                nextTime= getNextTime(currentTime);
            }
//            String nextTime = getNextTime(currentTime);


            String timeRange = currentTime + "-" + nextTime;
            OrderDto orderDto = new OrderDto();
@@ -1084,6 +1086,10 @@
        System.out.println("-------------"+timeRanges);

        return timeRanges;




    }