From 096abd16d07228aba3189302a14b24f56bb63abd Mon Sep 17 00:00:00 2001
From: 张洋洋 <10611411+yang-yang-z@user.noreply.gitee.com>
Date: 星期五, 10 一月 2025 14:24:02 +0800
Subject: [PATCH] [add]h5读取改造
---
src/main/java/com/se/simu/controller/SimuController.java | 99 +++++++++++++++++++++++++++++--------------------
1 files changed, 59 insertions(+), 40 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..f8d151d 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -8,13 +8,11 @@
import com.se.simu.domain.dto.GeLayer;
import com.se.simu.domain.po.DataPo;
import com.se.simu.domain.po.SimuPo;
-import com.se.simu.domain.vo.CreateFilesSimuVo;
-import com.se.simu.domain.vo.CreateSimuVo;
-import com.se.simu.domain.vo.R;
-import com.se.simu.domain.vo.SimuVo;
+import com.se.simu.domain.vo.*;
import com.se.simu.service.*;
import com.se.simu.utils.CsvToSQLiteUtils;
import com.se.simu.utils.ShpToolUtils;
+import com.se.simu.utils.ZarrUtils;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -23,10 +21,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 +208,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璧嬪��
@@ -251,7 +251,7 @@
return fail("瑙ｆ瀽鑼冨洿鏂囦欢澶辫触锛侀�夋嫨鑼冨洿涓嶈兘涓虹┖锛岃閲嶆柊閫夋嫨鏂囦欢锛�", false);
}
}
-
+ JSONArray jsonArray = new JSONArray();
String stationFile = vo.getStationFile();
log.info("绔欑偣鏂囦欢shp鍦板潃锛歿}", stationFile);
try {
@@ -260,7 +260,7 @@
return fail("绔欑偣鏂囦欢shp鍦板潃涓嶈兘涓虹┖", false);
}
// 1 璇诲彇shp鏂囦欢锛岃幏鍙栫珯鐐瑰潗鏍囧��
- JSONArray jsonArray = ShpToolUtils.readShpGetLocal(stationFile);
+ jsonArray = ShpToolUtils.readShpGetLocal(stationFile);
System.out.println("jsonArray = " + jsonArray);
} catch (Exception e) {
log.error("瑙ｆ瀽绔欑偣鏂囦欢shp澶辫触");
@@ -268,15 +268,16 @@
String stationRainFile = vo.getStationRainFile();
log.info("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃锛歿}", floodFile);
+ JSONArray array = new JSONArray();
+ // 鍒涘缓琛ㄥ悕 鏃堕棿鎴�
+ String tableName = "station_rain_" + System.currentTimeMillis();
try {
// 鍒ゆ柇鍦板潃涓嶄负绌�
if (StringUtils.isEmpty(stationRainFile)) {
return fail("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃涓嶈兘涓虹┖", false);
}
- // 鍒涘缓琛ㄥ悕 鏃堕棿鎴�
- String tableName = "station_rain_" + System.currentTimeMillis();
// 1 璇诲彇CSV 鏂囦欢
- CsvToSQLiteUtils.readCsvSaveLocal(stationRainFile, tableName);
+ array = CsvToSQLiteUtils.readCsvSaveLocal(stationRainFile, tableName);
// 鑾峰彇浠跨湡鏃堕棿 duration
Integer duration = CsvToSQLiteUtils.getDuration(tableName);
log.info("浠跨湡鏃堕棿 duration = {}", duration);
@@ -326,6 +327,10 @@
return fail("闃叉睕鑼冨洿涓嶈兘涓虹┖", false);
}
}
+ //todo 缁勮cityjson
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("shp", jsonArray);
+ jsonObject.put("csv", array);
// 寮�濮嬫ā鎷熻绠�
boolean flag = simuFilesService.createByfiles(vo);
return success(flag, flag ? "鎴愬姛" : "澶辫触");
@@ -334,5 +339,19 @@
}
}
+ @ApiOperation(value = "tarr鏂囦欢缁勮")
+ @GetMapping(value = "/testZarr", produces = "application/json; charset=UTF-8")
+ public R<Boolean> testZarr(@RequestParam("name") String tableName) throws IOException {
+ List<String> list = CsvToSQLiteUtils.getNameList(tableName);
+ String basePath="D:\\鍩庡競鍐呮稘\\sem\\闆ㄩ噺绔欑偣鏁版嵁\\闄嶉洦閲弞arr\\";
+ for (String src : list
+ ) {
+ List<StationRainVo> stationRainVos = CsvToSQLiteUtils.getList(tableName, src);
+ ZarrUtils.saveZarrRainfall(basePath+src,stationRainVos);
+ ZarrUtils.saveZarrTime(basePath+src,stationRainVos);
+ System.out.println(src+"鐨剒arr鏁版嵁鐢熸垚=====================");
+ }
+ return success(true);
+ }
}
--
Gitblit v1.9.3