From 3afaf1a21f47b6f9b46dd8e089e15e1e325c810a Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Jul 2024 15:44:51 +0800
Subject: [PATCH] 更新喇叭，图斑解析更新
---
src/main/java/com/dji/sample/patches/service/impl/ShpToDataSourceServiceImpl.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 5e256ed..db86543 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
@@ -3,6 +3,7 @@
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.dto.ShpDTO;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.ShpToDataSourceService;
import com.dji.sample.patches.utils.*;
@@ -19,6 +20,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.UUID;
@@ -46,9 +48,10 @@
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());
- List<String> s = ShapeFileUtil.shpToGeoJson(file1);
- String[] arr1 = FormatConversionUtil.formatConversion(s);
- for (int i = 0; i < arr1.length; i++) {
+ List<ShpDTO> shpData = ShapeFileUtil.shpToGeoJson(file1);
+ String s=null;
+ for (int i = 0; i < shpData.size(); i++) {
+ String[] arr1 = FormatConversionUtil.formatConversion(Collections.singletonList(s));
LotInfo lotInfo = new LotInfo();
String temp = arr1[i].trim();
temp = FormatConversionUtil.modifySpacesAndCommas(temp);
@@ -79,11 +82,13 @@
}
@Transactional
- public void savaInMysql(List<TbDkjbxxEntity> list, String workspaceId) {
+ 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 = dbConvertToEntity(list.get(i), workspaceId);
+ lotInfo.setTaskId(id);
+ lotInfo.setTaskName(name);
+ lotInfo = dbConvertToEntity(list.get(i), workspaceId, id, name);
shpToDataSourceMapper.insert(lotInfo);
}
}
@@ -95,20 +100,31 @@
* @param file 需要转换的DKJBXX对象。
* @return 返回一个构建好的LotInfo对象，包含从数据库实体中转换来的信息。
*/
- private LotInfo dbConvertToEntity(TbDkjbxxEntity file, String workspaceId) {
+ private LotInfo dbConvertToEntity(TbDkjbxxEntity file, String workspaceId,String id,String name) {
LotInfo.LotInfoBuilder builder = LotInfo.builder();
builder.bsm(file.getFId())
- .xzqdm(file.getFXzqdmsys())
+ .xzqdm(file.getFXzqdm())
.dkbh(file.getFTbbh())
.dkfw(file.getFShape())
.workspaceId(workspaceId)
- .isplan(0)
+ .isPlan(0)
+ .isPush(0)
+ .xmc(DistrictCodeUtils.nameToCode(file.getFXzqdm()))
+ .investigate(0)
+ .taskId(id)
+ .taskName(name)
.build();
return builder.build();
}
+// private LotInfo shpDtoToLotInfo(ShpDTO shpDTO){
+// LotInfo.LotInfoBuilder builder=LotInfo.builder();
+// builder.
+//
+// }
+
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