From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +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 | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 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 78e8db1..9a381fe 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
@@ -1,19 +1,36 @@
package com.ruoyi.api.third.controller;
+import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
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.*;
+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
@RequestMapping("/app/car")
@@ -29,6 +46,17 @@
@Autowired
private ITmsFinanceDetailService tmsFinanceDetailService;
+ @Autowired
+ private ServerConfig serverConfig;
+ @Autowired
+ private ISysDictTypeService dictTypeService;
+
+ @Value("${custom.upload.network-path}")
+ private String networkPath;
+
+ @Autowired
+ OssUtils ossUtils;
+
/**
* 鐧诲綍鏂规硶[pda]
@@ -111,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));
}
@@ -129,4 +157,48 @@
+ /**
+ * 閫氱敤涓婁紶璇锋眰
+ */
+ @PostMapping("/uploadImg")
+ public AjaxResult uploadFile(MultipartFile file) throws Exception
+ {
+
+ try
+ {
+ // 涓婁紶鏂囦欢璺緞
+ String filePath = RuoYiConfig.getUploadPath();
+ // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+ String fileName = FileUploadUtils.upload(filePath, file);
+ String url = networkPath + fileName;
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("fileName", fileName);
+ ajax.put("url", url);
+ return ajax;
+ }
+ catch (Exception e)
+ {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
+ */
+ @GetMapping(value = "/type/{dictType}")
+ public AjaxResult dictType(@PathVariable String dictType)
+ {
+ List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+ if (StringUtils.isNull(data))
+ {
+ data = new ArrayList<SysDictData>();
+ }
+ return AjaxResult.success(data);
+ }
+
+ @GetMapping("/getOssToken")
+ public AjaxResult getOssToken(){
+ return AjaxResult.success(ossUtils.getToken());
+ }
+
}
--
Gitblit v1.8.0