From 28e82b20499f6659d2b20d504d3fb987a646e535 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Apr 2024 15:37:22 +0800
Subject: [PATCH] 修改图斑错误信息
---
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
index b8dfb92..82afe87 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java
@@ -1,7 +1,5 @@
package com.dji.sample.patches.service.impl;
-import com.dji.sample.common.error.CommonErrorEnum;
-import com.dji.sample.component.mqtt.model.RequestsReply;
import com.dji.sample.patches.dao.ShpToDataSourceMapper;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.ShpToDataSourceService;
@@ -27,18 +25,19 @@
@Service
public class ShpToDataSourceServiceImpl implements ShpToDataSourceService {
+
@Autowired
private ShpToDataSourceMapper mapper;
@Autowired
private IWaylineFileService service;
String head = POLYGON;
+// String sourceDir = "src/main/resources/template/wpmz/"; // 源文件夹路径
String sourceDir = "/home/drone/server/template/wpmz/"; // 源文件夹路径
MultipartFile multipartFile;
String json;
-
public MultipartFile insertGeo(MultipartFile file, String workspaceId,String waylineName, double airportLat, double airportLon) throws Exception {
List<LotInfo> list = new ArrayList<>();
MultipartFileTOFileUtil multipartFileTOFileUtil = new MultipartFileTOFileUtil();
@@ -63,21 +62,20 @@
lotInfo.setXzb(Double.valueOf(points[0]));
lotInfo.setYzb(Double.valueOf(points[1]));
mapper.insert(lotInfo);
- list.add(lotInfo);
}
Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(list, airportLat, airportLon);
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
CreateWaylineFileUtils.createWaylineFile(xmlModel);
// 压缩文件夹中的内容
+// String destKMZFile = "src/main/resources/template/kmz/"+waylineName+".kmz"; // 输出的KMZ文件路径
String destKMZFile = "/home/drone/server/template/kmz/"+waylineName+".kmz"; // 输出的KMZ文件路径
zipFolder(sourceDir, destKMZFile);
+// multipartFile = convert(new File("src/main/resources/template/kmz/"+waylineName+".kmz"));
multipartFile = convert(new File("/home/drone/server/template/kmz/"+waylineName+".kmz"));
return multipartFile;
}
-
}
-
--
Gitblit v1.9.3