From 588fd7b47b6caf30562e1267a27f5898a5c2671f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 27 四月 2026 17:34:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/YueKeDuo
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 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 a90e382..606f8e6 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
@@ -7,6 +7,7 @@
import com.stylefeng.guns.modular.crossCity.warpper.LineShiftItemWarpper;
import com.stylefeng.guns.modular.crossCity.warpper.OtherDriverShiftWarpper;
import com.stylefeng.guns.modular.crossCity.warpper.ScanOrderDetailWarpper;
+import com.stylefeng.guns.modular.crossCity.warpper.AddSelfTripWarpper;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import io.swagger.annotations.Api;
@@ -20,6 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 【202601】城际专线排班控制器
@@ -123,6 +125,37 @@
}
/**
+ * 【202604】新增司机自主行程
+ */
+ @ResponseBody
+ @PostMapping("/addSelfTrip")
+ @ApiOperation(value = "【202604】新增司机自主行程", tags = {"司机端-首页"}, notes = "新增司机自主行程并写入排班主表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "出发日期（yyyy-MM-dd）", name = "day", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "出发时间（HH:mm）", name = "startTime", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "座位数", name = "seat", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "出发城市编码", name = "startCityCode", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "出发城市名称", name = "startCityName", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "出发地地址", name = "startAddress", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "出发地经度", name = "startLon", required = true, dataType = "double"),
+ @ApiImplicitParam(value = "出发地纬度", name = "startLat", required = true, dataType = "double"),
+ @ApiImplicitParam(value = "目的地JSON数组（每项需包含endCityCode/endCityName/endAddress/endLon/endLat/price）", name = "destJson", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<Map<String, Object>> addSelfTrip(AddSelfTripWarpper warpper, HttpServletRequest request) {
+ try {
+ Integer driverId = driverService.getUserIdFormRedis(request);
+ if (null == driverId) {
+ return ResultUtil.tokenErr();
+ }
+ return lineShiftDriverService.addSelfTrip(driverId, warpper);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
* 验证日期有效性
* @param dateStr
* @return
--
Gitblit v1.7.1