From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 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 81afe7e..6111de8 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,20 +1,20 @@
package com.dji.sample.patches.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dji.sample.patches.config.pojo.PatchesConfigPojo;
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;
import com.dji.sample.wayline.service.IWaylineFileService;
import org.locationtech.jts.geom.Coordinate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@@ -25,21 +25,16 @@
import static com.dji.sample.patches.utils.FormatConversionUtil.getCentros;
import static com.dji.sample.patches.utils.MultipartFileTOFileUtil.convert;
import static com.dji.sample.patches.utils.ZipUtil.*;
+import static com.dji.sample.territory.utils.CoordinateSystemUtil.*;
import static org.locationtech.jts.io.WKTConstants.POLYGON;
@Service
public class ShpToDataSourceServiceImpl implements ShpToDataSourceService {
@Autowired
- private ShpToDataSourceMapper mapper;
+ private ShpToDataSourceMapper shpToDataSourceMapper;
- @Autowired
- private IWaylineFileService service;
private String head = POLYGON;
- @Value("${patches.url.path.kmz.sourceDir}")
- private String sourceDir;
- @Value("${patches.url.path.kmz.destKMZFile}")
- private String outkmz;
private MultipartFile multipartFile;
String json;
@@ -47,6 +42,7 @@
@Autowired
private PatchesConfigPojo patchesConfigPojo;
+ @Transactional
public MultipartFile insertGeo(MultipartFile file, String workspaceId, String waylineName, double airportLat, double airportLon) throws Exception {
List<LotInfo> list = new ArrayList<>();
File file1 = MultipartFileTOFileUtil.multipartFile2File(file, patchesConfigPojo.getUnzip());
@@ -69,17 +65,57 @@
String[] points = end.split(",");
lotInfo.setXzb(Double.valueOf(points[0]));
lotInfo.setYzb(Double.valueOf(points[1]));
- mapper.insert(lotInfo);
+ 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.getWaylines(),patchesConfigPojo.getWaylines(),patchesConfigPojo.getWaylines(),patchesConfigPojo.getWaylines());
+ CreateWaylineFileUtils.createWaylineFile(xmlModel, patchesConfigPojo.getTemplate(), patchesConfigPojo.getTargetTemplate(), patchesConfigPojo.getWaylines(), patchesConfigPojo.getTargetWaylines());
// 压缩文件夹中的内容
- String destKMZFile = outkmz + waylineName + ".kmz"; // 输出的KMZ文件路径
- zipFolder(sourceDir, destKMZFile);
+ String destKMZFile = patchesConfigPojo.getDestKMZFile() + waylineName + ".kmz"; // 输出的KMZ文件路径
+ zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
multipartFile = convert(new File(destKMZFile));
+ MultipartFileTOFileUtil.deleteFile(file1);
return multipartFile;
}
+
+ @Transactional
+ public void savaInMysql(List<TbDkjbxxEntity> list, String workspaceId,String id,String name) {
+ for (int i = 0; i < list.size(); i++) {
+ LotInfo lotInfo = new LotInfo();
+ lotInfo.setWorkspaceId(workspaceId);
+ lotInfo.setTaskId(id);
+ lotInfo.setTaskName(name);
+ lotInfo = dbConvertToEntity(list.get(i), workspaceId, id, name);
+ shpToDataSourceMapper.insert(lotInfo);
+ }
+ }
+
+
+ /**
+ * 将SQlite数据库中DKJBXX对象转换为LotInfo对象。
+ *
+ * @param file 需要转换的DKJBXX对象。
+ * @return 返回一个构建好的LotInfo对象，包含从数据库实体中转换来的信息。
+ */
+ private LotInfo dbConvertToEntity(TbDkjbxxEntity file, String workspaceId,String id,String name) {
+ LotInfo.LotInfoBuilder builder = LotInfo.builder();
+ builder.bsm(file.getFId())
+ .xzqdm(file.getFXzqdm())
+ .dkbh(file.getFTbbh())
+ .dkfw(file.getFShape())
+ .workspaceId(workspaceId)
+ .isPlan(0)
+ .xmc(DistrictCodeUtils.nameToCode(file.getFXzqdm()))
+ .investigate(0)
+ .taskId(id)
+ .taskName(name)
+ .build();
+ return builder.build();
+ }
+
+ public List<LotInfo> getNoPlan(){
+ return shpToDataSourceMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getIsPlan,0));
+ }
}
--
Gitblit v1.9.3