From 0f6b80c1bebbd43cc886b9fcc18314f0e4ae454d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 23 Apr 2024 16:34:13 +0800
Subject: [PATCH] 完善DB文件上传接口
---
src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java b/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
index 82ec6a2..894b616 100644
--- a/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
+++ b/src/main/java/com/dji/sample/territory/service/impl/TbDkjbxxServiceImpl.java
@@ -14,6 +14,7 @@
import com.dji.sample.territory.dao.ITbFjMapper;
import com.dji.sample.territory.model.entity.TbDkjbxxEntity;
import com.dji.sample.territory.model.entity.TbFjEntity;
+import com.dji.sample.territory.pojo.TerritoryConfigPojo;
import com.dji.sample.territory.service.ITbDkjbxxService;
import org.locationtech.jts.geom.Coordinate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,7 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import static com.dji.sample.patches.utils.MultipartFileTOFileUtil.convert;
import static com.dji.sample.patches.utils.ZipUtil.zipFolder;
@@ -41,11 +43,12 @@
@Service
@DS("sqlite-resource")
public class TbDkjbxxServiceImpl extends ServiceImpl<ITbDkjbxxMapper, TbDkjbxxEntity> implements ITbDkjbxxService {
- private static final String RESOURCE_FILE_PATH = "DB/resource_db.db";
@Autowired
- private ITbDkjbxxMapper mapper;
+ private ITbDkjbxxMapper iTbDkjbxxMapper;
@Autowired
private PatchesConfigPojo patchesConfigPojo;
+ @Autowired
+ private TerritoryConfigPojo territoryConfigPojo;
/**
* 上传DB文件并覆盖之前DB文件，自动读取数据到本地数据库
@@ -53,15 +56,19 @@
* @param file
* @return
*/
- public ResponseResult<String> uploadFile(MultipartFile file) {
+ public ResponseResult uploadFile(MultipartFile file) {
if (file.isEmpty()) {
- return ResponseResult.error("所上传的文件为空");
+ throw new IllegalArgumentException("上传文件为空");
+ }
+ boolean fileName = Objects.requireNonNull(file.getOriginalFilename()).endsWith("db");
+ if (!fileName) {
+ throw new IllegalArgumentException("检查文件是否为db文件");
}
try {
// 获取上传的文件输入流
InputStream inputStream = file.getInputStream();
// 创建输出流，将文件内容写入资源文件
- OutputStream outputStream = new FileOutputStream(RESOURCE_FILE_PATH);
+ OutputStream outputStream = new FileOutputStream(territoryConfigPojo.getPath());
byte[] buffer = new byte[1024];
int bytesRead;
while ((bytesRead = inputStream.read(buffer)) != -1) {
@@ -72,7 +79,7 @@
return ResponseResult.success("文件上传成功");
} catch (IOException e) {
e.printStackTrace();
- return ResponseResult.error(e.getMessage()); // 将异常信息包含在响应中返回给客户端
+ return ResponseResult.error(e.getMessage());
}
}
@@ -89,7 +96,7 @@
*/
@Transactional
public MultipartFile listFile(String workspaceId, String waylineName, double airportLat, double airportLon) throws IOException {
- List<TbDkjbxxEntity> list = mapper.selectList(null);
+ List<TbDkjbxxEntity> list = iTbDkjbxxMapper.selectList(null);
List<LotInfo> info = dbConvertToEntity(list);
Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(info, airportLat, airportLon);
// 创建XML模板模型
--
Gitblit v1.9.3