From c1915a7e947710572826a746e975e8d09516a0e7 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 08 Apr 2024 16:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java b/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java
index a7d5a03..fbd4f8b 100644
--- a/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java
+++ b/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java
@@ -1,9 +1,17 @@
package com.dji.sample.patches.service;
+import com.dji.sample.patches.model.entity.LotInfo;
+import org.springframework.core.io.Resource;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
public interface ShpToDataSourceService {
- void insertGeo(MultipartFile file) throws IOException;
+ List<LotInfo> insertGeo(MultipartFile file ,String workspaceId,String waylineName) throws IOException;
+ ResponseEntity<Resource> backWayline(String waylineName) throws FileNotFoundException, UnsupportedEncodingException;
}
--
Gitblit v1.9.3