11.11

liujie

2023-11-28 d36bf25f7494870cbb77c256a04dd8c8b2d42f31

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

@@ -26,6 +26,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 +1022,11 @@
   private SiteClient siteClient;




    @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 +1046,7 @@
        }
    System.out.println("======strings======="+strings);


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


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


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

        return timeRanges;




    }