From c8863733a3b62efbdc26a906ed65c793902f3196 Mon Sep 17 00:00:00 2001
From: xingjinshuang <xingjs@qq.com>
Date: 星期五, 03 一月 2025 15:11:35 +0800
Subject: [PATCH] @xingjs@20250103@优化完善文件上传接口，解决文件上传报错和地址重复问题;优化文件创建模拟过程，添加绘制区域范围检测
---
src/main/java/com/se/simu/controller/SimuController.java | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index 100e534..b25fbe0 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -23,10 +23,7 @@
import javax.annotation.Resource;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Api(tags = "浠跨湡绠＄悊")
@Slf4j
@@ -213,35 +210,40 @@
String floodFile = vo.getFloodFile();
log.info("鑼冨洿鏂囦欢鍦板潃锛歿}", floodFile);
try {
- // 鍒ゆ柇鍦板潃涓嶄负绌�
- if (StringUtils.isEmpty(floodFile)) {
- return fail("鑼冨洿鏂囦欢鍦板潃涓嶈兘涓虹┖", false);
- } else {
- // 鑾峰彇鏂囦欢鐨勫悗缂�鍚�
- String fileName = floodFile.substring(floodFile.lastIndexOf("."));
- // 鍒ゆ柇鍚庣紑鍚嶆槸鍚︿负.shp
- if (!fileName.equalsIgnoreCase(".shp")) {
- return fail("鑼冨洿鏂囦欢鏍煎紡涓嶆纭�", false);
+ // 鍒ゆ柇鏄惁缁樺埗鍖哄煙
+ if (!StringUtils.isEmpty(vo.getMaxx().toString()) && !Objects.isNull(vo.getMaxx())) {
+ rangeVerify(vo.getMinx(), vo.getMaxx(), vo.getMiny(), vo.getMaxy());
+ log.info("缁樺埗鍖哄煙鑼冨洿楠岃瘉閫氳繃!");
+ } else
+ // 鍒ゆ柇鍦板潃涓嶄负绌�
+ if (StringUtils.isEmpty(floodFile)) {
+ return fail("鑼冨洿鏂囦欢鍦板潃涓嶈兘涓虹┖", false);
} else {
- // 1 璇诲彇shp鏂囦欢锛岃幏鍙栬寖鍥村��
- JSONObject jsonObject = ShpToolUtils.readShp(floodFile);
- // 2 鑾峰彇jsonObject涓殑鑼冨洿鍊�
- Double minX = jsonObject.getDouble("minY");
- Double maxX = jsonObject.getDouble("maxY");
- Double minY = jsonObject.getDouble("minX");
- Double maxY = jsonObject.getDouble("maxX");
- // 3 鍒ゆ柇鑼冨洿鍊兼槸鍚︿负绌�
- // vo.setMinx(jsonObject.getDouble("minX"));
- // vo.setMaxx(jsonObject.getDouble("maxX"));
- // vo.setMiny(jsonObject.getDouble("minY"));
- // vo.setMaxy(jsonObject.getDouble("maxY"));
- vo.setMinx(jsonObject.getDouble("minY"));
- vo.setMaxx(jsonObject.getDouble("maxY"));
- vo.setMiny(jsonObject.getDouble("minX"));
- vo.setMaxy(jsonObject.getDouble("maxX"));
- rangeVerify(minX,maxX, minY, maxY);
+ // 鑾峰彇鏂囦欢鐨勫悗缂�鍚�
+ String fileName = floodFile.substring(floodFile.lastIndexOf("."));
+ // 鍒ゆ柇鍚庣紑鍚嶆槸鍚︿负.shp
+ if (!fileName.equalsIgnoreCase(".shp")) {
+ return fail("鑼冨洿鏂囦欢鏍煎紡涓嶆纭�", false);
+ } else {
+ // 1 璇诲彇shp鏂囦欢锛岃幏鍙栬寖鍥村��
+ JSONObject jsonObject = ShpToolUtils.readShp(floodFile);
+ // 2 鑾峰彇jsonObject涓殑鑼冨洿鍊�
+ Double minX = jsonObject.getDouble("minY");
+ Double maxX = jsonObject.getDouble("maxY");
+ Double minY = jsonObject.getDouble("minX");
+ Double maxY = jsonObject.getDouble("maxX");
+ // 3 鍒ゆ柇鑼冨洿鍊兼槸鍚︿负绌�
+ // vo.setMinx(jsonObject.getDouble("minX"));
+ // vo.setMaxx(jsonObject.getDouble("maxX"));
+ // vo.setMiny(jsonObject.getDouble("minY"));
+ // vo.setMaxy(jsonObject.getDouble("maxY"));
+ vo.setMinx(jsonObject.getDouble("minY"));
+ vo.setMaxx(jsonObject.getDouble("maxY"));
+ vo.setMiny(jsonObject.getDouble("minX"));
+ vo.setMaxy(jsonObject.getDouble("maxX"));
+ rangeVerify(minX, maxX, minY, maxY);
+ }
}
- }
// todo: 瑙ｆ瀽鑼冨洿鏂囦欢 鏍规嵁涓嶅悓鐨勭殑鏍煎紡鏂囦欢杩涜涓嶅悓鐨勮В鏋愶紝鑾峰彇闇�瑕佽绠楃殑鑼冨洿鍊�
// 涓婁紶鏍煎紡锛�.shp/.tiff/.img/.geojson
// 閲嶆柊缁檝o璧嬪��
--
Gitblit v1.9.3