From 7742172e5295f94e0569672870f6101ac5ee0552 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 20 四月 2026 16:31:29 +0800
Subject: [PATCH] 获取司机已预约或排班的城际出行

---
 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java
index c4b64fc..406dff1 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java
@@ -4,10 +4,10 @@
 import cn.hutool.core.date.DateUtil;
 import com.stylefeng.guns.modular.crossCity.server.ILineShiftDriverService;
 import com.stylefeng.guns.modular.crossCity.warpper.DriverShiftListWarpper;
+import com.stylefeng.guns.modular.crossCity.warpper.LineShiftItemWarpper;
 import com.stylefeng.guns.modular.crossCity.warpper.ScanOrderDetailWarpper;
 import com.stylefeng.guns.modular.system.service.IDriverService;
 import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.stylefeng.guns.modular.system.util.SystemException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -17,8 +17,8 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 【202601】城际专线排班控制器
@@ -68,6 +68,34 @@
     }
 
     /**
+     * 【202604】获取司机城际专线排班列表
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/queryMyDriverShiftList")
+    @ApiOperation(value = "【202604】获取司机城际专线排班列表", tags = {"司机端-首页"}, notes = "获取司机在今天之后(包含今天)的城际专线排班信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "日期(yyyy-MM-dd),默认无", name = "date", required = false, dataType = "String"),
+            @ApiImplicitParam(value = "页码,首页1", name = "pageNum", required = true, dataType = "int"),
+            @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+    })
+    public ResultUtil<List<LineShiftItemWarpper>> queryMyDriverShiftList(String date, int pageNum, int size, HttpServletRequest request) {
+        try {
+            Integer driverId = driverService.getUserIdFormRedis(request);
+            if (null == driverId) {
+                return ResultUtil.tokenErr();
+            }
+            List<LineShiftItemWarpper> result = lineShiftDriverService.queryMyDriverShiftList(driverId, date, pageNum, size);
+            return ResultUtil.success(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
+    }
+
+    /**
      * 验证日期有效性
      * @param dateStr
      * @return

--
Gitblit v1.7.1