From ef497a4547843e1ade23d80f40bc682dca952ed0 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 06 Nov 2025 15:23:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
index 175ba15..97b721c 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFileServiceImpl.java
@@ -1,17 +1,20 @@
package com.ard.route.service.impl;
+import java.io.IOException;
import java.util.List;
-import java.util.UUID;
import com.ard.common.annotation.DataScope;
import com.ard.common.utils.DateUtils;
-import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
+import com.ard.oss.service.impl.OssServiceContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteFileMapper;
-import com.ard.route.domain.ArdRouteFile;
+import com.ard.route.domain.route.ArdRouteFile;
import com.ard.route.service.IArdRouteFileService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
/**
* 文件Service业务层处理
@@ -24,6 +27,9 @@
@Autowired
private ArdRouteFileMapper ardRouteFileMapper;
+
+ @Autowired
+ private OssServiceContext ossService;
/**
* 查询文件
@@ -55,9 +61,17 @@
* @return 结果
*/
@Override
- public int insertArdRouteFile(ArdRouteFile ardRouteFile) {
+ public int insertArdRouteFile(ArdRouteFile ardRouteFile, MultipartFile file){
ardRouteFile.setId(IdUtils.simpleUUID());
ardRouteFile.setCreateTime(DateUtils.getNowDate());
+ // 放到默认文件夹
+ ardRouteFile.setFolderId("0");
+ try {
+ String url = ossService.upload("kmz",file);
+ ardRouteFile.setFilePath(url);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return ardRouteFileMapper.insertArdRouteFile(ardRouteFile);
}
--
Gitblit v1.9.3