From 7ed2a032d0724e68aec8af940f2ce0023a9f0eb7 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 15 四月 2026 09:27:51 +0800
Subject: [PATCH] 修改调度单年月日

---
 api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java b/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
index 29a648d..65413f8 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
@@ -6,23 +6,30 @@
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.system.service.ISysDictTypeService;
 import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.tms.domain.TmsDriver;
 import com.ruoyi.tms.domain.TmsFinanceDetail;
 import com.ruoyi.tms.domain.TmsTrip;
 import com.ruoyi.tms.service.ITmsDispatchOrderService;
+import com.ruoyi.tms.service.ITmsDriverService;
 import com.ruoyi.tms.service.ITmsFinanceDetailService;
 import com.ruoyi.tms.service.ITmsTripService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 @RestController
@@ -43,6 +50,14 @@
     private ServerConfig serverConfig;
     @Autowired
     private ISysDictTypeService dictTypeService;
+
+    @Value("${custom.upload.network-path}")
+    private String networkPath;
+
+    @Autowired
+    OssUtils ossUtils;
+
+
     /**
      * 鐧诲綍鏂规硶[pda]
      *
@@ -72,7 +87,10 @@
      * @return
      */
     @GetMapping("/assignedItineraryLogList")
-    public AjaxResult assignedItineraryLogList(){
+    public AjaxResult assignedItineraryLogList(Integer pageNum, Integer pageSize){
+        if (pageNum != null && pageSize != null) {
+            return AjaxResult.success(tmsDispatchOrderService.assignedItineraryLogListPage(pageNum, pageSize));
+        }
         return tmsDispatchOrderService.assignedItineraryLogList();
     }
 
@@ -85,7 +103,7 @@
     }
 
     /**
-     * 琛岀▼鍘嗗彶
+     * 琛岀▼鍘嗗彶锛堟棫鎺ュ彛锛屼繚鎸佸吋瀹癸級
      */
     @GetMapping("/tmsTripList/{dispatchId}")
     public AjaxResult tmsTripList(@PathVariable Integer dispatchId){
@@ -93,11 +111,25 @@
     }
 
     /**
+     * 琛岀▼鍘嗗彶锛堝垎椤碉紝鎸夋椂闂村�掑簭锛宒ispatchId 鍙�� - 涓嶄紶鏌ュ叏閮級
+     */
+    @GetMapping("/tmsTripListPage")
+    public AjaxResult tmsTripListPage(Integer dispatchId, Integer pageNum, Integer pageSize){
+        if (pageNum == null) pageNum = 1;
+        if (pageSize == null) pageSize = 10;
+        return AjaxResult.success(tmsTripService.tmsTripListPage(dispatchId, pageNum, pageSize));
+    }
+
+    /**
      * 鑾峰彇鍨粯鍒楄〃
      * @return
      */
     @GetMapping("/getTmsFinanceDetailList")
-    public AjaxResult getTmsFinanceDetailList(Integer dispatchId){
+    public AjaxResult getTmsFinanceDetailList(Integer dispatchId, Integer pageNum, Integer pageSize){
+        // 浼犱簡鍒嗛〉鍙傛暟璧板垎椤碉紝鍚﹀垯鍏煎鏃ч�昏緫
+        if (pageNum != null && pageSize != null) {
+            return AjaxResult.success(tmsFinanceDetailService.getTmsFinanceDetailListPage(dispatchId, pageNum, pageSize));
+        }
         return AjaxResult.success(tmsFinanceDetailService.getTmsFinanceDetailList(dispatchId));
     }
 
@@ -124,7 +156,7 @@
      * 涓婁紶琛岀▼
      */
     @PostMapping("/uploadTrip")
-    public AjaxResult uploadTrip(@RequestBody TmsTrip tmsTrip){
+    public AjaxResult uploadTrip(@RequestBody TmsTrip tmsTrip) throws Exception {
         tmsTrip.setDataSource("1");
         return AjaxResult.success(tmsTripService.insertTmsTrip(tmsTrip));
     }
@@ -155,7 +187,7 @@
             String filePath = RuoYiConfig.getUploadPath();
             // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+            String url = networkPath + fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("fileName", fileName);
             ajax.put("url", url);
@@ -181,5 +213,9 @@
         return AjaxResult.success(data);
     }
 
+    @GetMapping("/getOssToken")
+    public AjaxResult getOssToken(){
+        return AjaxResult.success(ossUtils.getToken());
+    }
 
 }

--
Gitblit v1.8.0