From bc16d0f0fc46ca6cb7d9bfb8496ad8f20ffba677 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 06 May 2024 14:53:52 +0800
Subject: [PATCH] 修改DB库相关问题
---
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 f5e14db..5a13fba 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,5 +1,6 @@
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;
@@ -27,16 +28,15 @@
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;
private MultipartFile multipartFile;
@@ -44,6 +44,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<>();
@@ -67,11 +68,11 @@
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);
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
- CreateWaylineFileUtils.createWaylineFile(xmlModel,patchesConfigPojo.getTemplate(),patchesConfigPojo.getTargetTemplate(),patchesConfigPojo.getWaylines(),patchesConfigPojo.getTargetWaylines());
+ CreateWaylineFileUtils.createWaylineFile(xmlModel, patchesConfigPojo.getTemplate(), patchesConfigPojo.getTargetTemplate(), patchesConfigPojo.getWaylines(), patchesConfigPojo.getTargetWaylines());
// 压缩文件夹中的内容
String destKMZFile = patchesConfigPojo.getDestKMZFile() + waylineName + ".kmz"; // 输出的KMZ文件路径
zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
@@ -79,40 +80,39 @@
MultipartFileTOFileUtil.deleteFile(file1);
return multipartFile;
}
+
@Transactional
- public void savaInMysql(List<TbDkjbxxEntity> list){
- for (int i = 0; i <list.size() ; i++) {
+ public void savaInMysql(List<TbDkjbxxEntity> list, String workspaceId) {
+ for (int i = 0; i < list.size(); i++) {
LotInfo lotInfo = new LotInfo();
- lotInfo=dbConvertToEntity(list.get(i));
- mapper.insert(lotInfo);
+ lotInfo.setWorkspaceId(workspaceId);
+ lotInfo = dbConvertToEntity(list.get(i), workspaceId);
+ shpToDataSourceMapper.insert(lotInfo);
}
}
+
+
/**
* 将SQlite数据库中DKJBXX对象转换为LotInfo对象。
+ *
* @param file 需要转换的DKJBXX对象。
* @return 返回一个构建好的LotInfo对象，包含从数据库实体中转换来的信息。
*/
- private LotInfo dbConvertToEntity(TbDkjbxxEntity file) {
+ private LotInfo dbConvertToEntity(TbDkjbxxEntity file, String workspaceId) {
LotInfo.LotInfoBuilder builder = LotInfo.builder();
- if (file != null) {
- builder.bsm(file.getBsm())
- .bz(file.getBz())
- .dkmj(file.getDkmj())
- .dkmc(file.getDkmc())
- .dkbh(file.getDkbh())
- .xmc(file.getXmc())
- .xzb(file.getXzb())
- .sfbhzdk(file.getSfbhzdk())
- .sjlx(file.getSjlx())
- .dkfw(file.getDkfw())
- .xzqdm(file.getXzqdm())
- .yzb(file.getYzb())
- .kzxx(file.getKzxx())
- .dklx(file.getDklx())
- .build();
- }
+ builder.bsm(file.getFId())
+ .xzqdm(file.getFXzqdmsys())
+ .dkbh(file.getFTbbh())
+ .dkfw(file.getFShape())
+ .workspaceId(workspaceId)
+ .isplan(0)
+ .build();
return builder.build();
}
+
+ public List<LotInfo> getNoPlan(){
+ return shpToDataSourceMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getIsplan,0));
+ }
}
--
Gitblit v1.9.3