From 1e5aefcfe44ed8570d58cb810e798803186a2a79 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 07 May 2024 10:39:29 +0800
Subject: [PATCH] 修改上传接口
---
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 5a13fba..4549c98 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
@@ -5,10 +5,7 @@
import com.dji.sample.patches.dao.ShpToDataSourceMapper;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.ShpToDataSourceService;
-import com.dji.sample.patches.utils.FormatConversionUtil;
-import com.dji.sample.patches.utils.GeoToolsUtil;
-import com.dji.sample.patches.utils.MultipartFileTOFileUtil;
-import com.dji.sample.patches.utils.ShapeFileUtil;
+import com.dji.sample.patches.utils.*;
import com.dji.sample.patches.xml.mode.XMLTemplateModel;
import com.dji.sample.patches.xml.utils.CreateWaylineFileUtils;
import com.dji.sample.territory.model.entity.TbDkjbxxEntity;
@@ -70,7 +67,7 @@
lotInfo.setYzb(Double.valueOf(points[1]));
shpToDataSourceMapper.insert(lotInfo);
}
- Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(list, airportLat, airportLon);
+ List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, airportLat, airportLon);
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
CreateWaylineFileUtils.createWaylineFile(xmlModel, patchesConfigPojo.getTemplate(), patchesConfigPojo.getTargetTemplate(), patchesConfigPojo.getWaylines(), patchesConfigPojo.getTargetWaylines());
// 压缩文件夹中的内容
@@ -82,11 +79,13 @@
}
@Transactional
- public void savaInMysql(List<TbDkjbxxEntity> list, String workspaceId) {
+ public void savaInMysql(List<TbDkjbxxEntity> list, String workspaceId,int id,String name) {
for (int i = 0; i < list.size(); i++) {
LotInfo lotInfo = new LotInfo();
lotInfo.setWorkspaceId(workspaceId);
- lotInfo = dbConvertToEntity(list.get(i), workspaceId);
+ lotInfo.setTaskId(id);
+ lotInfo.setTaskName(name);
+ lotInfo = dbConvertToEntity(list.get(i), workspaceId, id, name);
shpToDataSourceMapper.insert(lotInfo);
}
}
@@ -98,20 +97,22 @@
* @param file 需要转换的DKJBXX对象。
* @return 返回一个构建好的LotInfo对象，包含从数据库实体中转换来的信息。
*/
- private LotInfo dbConvertToEntity(TbDkjbxxEntity file, String workspaceId) {
+ private LotInfo dbConvertToEntity(TbDkjbxxEntity file, String workspaceId,int id,String name) {
LotInfo.LotInfoBuilder builder = LotInfo.builder();
builder.bsm(file.getFId())
.xzqdm(file.getFXzqdmsys())
.dkbh(file.getFTbbh())
.dkfw(file.getFShape())
.workspaceId(workspaceId)
- .isplan(0)
+ .isPlan(0)
+ .taskId(id)
+ .taskName(name)
.build();
return builder.build();
}
public List<LotInfo> getNoPlan(){
- return shpToDataSourceMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getIsplan,0));
+ return shpToDataSourceMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getIsPlan,0));
}
}
--
Gitblit v1.9.3