From ca412ade3b178fbc8ba0a4b6215a040acdede954 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 09 十二月 2025 10:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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..d385490 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,33 @@
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.DateUtils;
+import com.ruoyi.common.utils.PdfTemplateUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
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 +53,11 @@
private ServerConfig serverConfig;
@Autowired
private ISysDictTypeService dictTypeService;
+
+ @Value("${custom.upload.network-path}")
+ private String networkPath;
+
+
/**
* 鐧诲綍鏂规硶[pda]
*
@@ -124,7 +139,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 +170,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);
--
Gitblit v1.8.0