From b6294bd36b3023e18606c77553fe136e6500a4b2 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 17 Apr 2024 15:42:34 +0800
Subject: [PATCH] 完善DB数据配置
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/controller/PatchesController.java b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
index 7d2f781..e2a21fe 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -9,7 +9,9 @@
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
+import com.dji.sample.patches.service.ShpToDataSourceService;
import com.dji.sample.patches.service.impl.ShpToDataSourceServiceImpl;
+import com.dji.sample.territory.service.impl.TbDkjbxxServiceImpl;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.service.IWaylineFileService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,9 @@
import javax.servlet.http.HttpServletRequest;
import java.net.URL;
import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -28,11 +33,21 @@
@Autowired
private GetPatchesService getPatchesService;
@Autowired
- private ShpToDataSourceServiceImpl shpToDataSourceServiceImpl;
+ private ShpToDataSourceService shpToDataSourceService;
@Autowired
private IWaylineFileService waylineFileService;
+ @Autowired
+ private TbDkjbxxServiceImpl tbDkjbxxService;
- @GetMapping("/getPatches")
+ /**
+ * 根据workspaceId获取图斑列表信息
+ *
+ * @param page
+ * @param pageSize
+ * @param workspaceId
+ * @return
+ */
+ @GetMapping("/listPatches")
@SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@@ -46,13 +61,28 @@
return ResponseResult.success(data);
}
- @DeleteMapping("/delPatches")
+ /**
+ * 删除图斑信息
+ * 本接口不需要接收任何参数，调用成功后会删除相应的补丁信息。
+ *
+ * @return 返回操作结果，如果操作成功，则返回一个成功的响应结果。
+ */
+ @DeleteMapping("/deletePatches")
public ResponseResult del() {
getPatchesService.delPatches();
return ResponseResult.success();
}
- @GetMapping("/GetPhoto")
+ /**
+ * 根据图斑的地块编号获取相对应音视频
+ *
+ * @param page
+ * @param pageSize
+ * @param workspaceId
+ * @param dkbh
+ * @return
+ */
+ @GetMapping("/listPhoto")
public ResponseResult<PaginationData<MediaFileEntity>> GetPatchesPhoto(@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@RequestParam String workspaceId,
@@ -70,24 +100,44 @@
}
}
- @PostMapping("/getGeo")
+ /**
+ * 上传图斑文件，解析文件并入库，再生成航线并返回
+ *
+ * @param file
+ * @param workspaceId
+ * @param waylineName
+ * @param airportLat
+ * @param airportLon
+ * @param request
+ * @return
+ * @throws Exception
+ */
+ @PostMapping("/uploadLot")
public ResponseResult getGeo(@RequestParam("file") MultipartFile file,
@RequestParam String workspaceId,
@RequestParam String waylineName,
@RequestParam double airportLat,
@RequestParam double airportLon,
HttpServletRequest request) throws Exception {
- MultipartFile multipartFile = shpToDataSourceServiceImpl.insertGeo(file, workspaceId, waylineName, airportLat, airportLon);
+ MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon);
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
+ Map<String, String> infoMap = new HashMap<>();
URL url = null;
try {
url = waylineFileService.getObjectUrl(workspaceId, entity.getWaylineId());
+ infoMap.put("url", String.valueOf(MinioUrlUtils.getUrl(url)));
+ infoMap.put("waylineId", entity.getWaylineId());
} catch (SQLException e) {
throw new RuntimeException(e);
}
- return ResponseResult.success(MinioUrlUtils.getUrl(url));
+ return ResponseResult.success(infoMap);
+ }
+ @PostMapping("/test")
+ public void test(){
+ List<LotInfo> list=getPatchesService.listLotinfo();
+ tbDkjbxxService.insert(list);
}
}
--
Gitblit v1.9.3