From 086ef5ab15ebd71f8e454868503c6d29b6c5eb98 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 26 Jul 2024 15:48:37 +0800
Subject: [PATCH] 新增图斑上传者
---
src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java | 2 +-
src/main/java/com/dji/sample/patches/model/entity/LotInfo.java | 3 +++
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 2 +-
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 3 ++-
4 files changed, 7 insertions(+), 3 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 5ca1931..e20ce42 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -249,9 +249,9 @@
@RequestParam double airportLat,
@RequestParam double airportLon,
HttpServletRequest request) throws Exception {
- MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon);
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
+ MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon,creator);
waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
diff --git a/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java b/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
index 824d8f9..088f79b 100644
--- a/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
+++ b/src/main/java/com/dji/sample/patches/model/entity/LotInfo.java
@@ -78,6 +78,9 @@
@TableField("is_push")
private int isPush;
+ @TableField("user_name")
+ private String userName;
+
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Long createTime;
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 add9296..b067bd0 100644
--- a/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java
+++ b/src/main/java/com/dji/sample/patches/service/ShpToDataSourceService.java
@@ -25,7 +25,7 @@
* @return 图斑生成的航线
* @throws Exception 处理过程中可能出现的任何异常
*/
- MultipartFile insertGeo(MultipartFile file , String workspaceId,String waylineName, double airportLat, double airportLon) throws Exception;
+ MultipartFile insertGeo(MultipartFile file , String workspaceId,String waylineName, double airportLat, double airportLon,String creator) throws Exception;
/**
* 将List<TbDkjbxxEntity>类型的数据批量插入到数据库中。
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 157abb7..a95fe5d 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
@@ -45,7 +45,7 @@
private PatchesConfigPojo patchesConfigPojo;
@Transactional
- public MultipartFile insertGeo(MultipartFile file, String workspaceId, String waylineName, double airportLat, double airportLon) throws Exception {
+ public MultipartFile insertGeo(MultipartFile file, String workspaceId, String waylineName, double airportLat, double airportLon,String creator) throws Exception {
List<LotInfo> list = new ArrayList<>();
File file1 = MultipartFileTOFileUtil.multipartFile2File(file, patchesConfigPojo.getUnzip());
List<ShpDTO> shpData = ShapeFileUtil.shpToGeoJson(file1);
@@ -54,6 +54,7 @@
String uuid = UUID.randomUUID().toString();
String bsm = uuid.replaceAll("-", "");
lotInfo.setBsm(bsm);
+ lotInfo.setUserName(creator);
lotInfo.setWorkspaceId(workspaceId);
lotInfo.setDkfw(poylonCGCStoWGS(convertToWKT(shpDatum.getDKFW())));
lotInfo.setDkbh(shpDatum.getDKBH());
--
Gitblit v1.9.3