From 6cb2134a53422f471f4f9b77c34d67e1fb4d31db Mon Sep 17 00:00:00 2001
From: 张洋洋 <10611411+yang-yang-z@user.noreply.gitee.com>
Date: 星期四, 09 一月 2025 10:16:56 +0800
Subject: [PATCH] [add]h5读取改造
---
src/main/java/com/se/simu/controller/SimuController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index b25fbe0..339d7b4 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -253,7 +253,7 @@
return fail("瑙ｆ瀽鑼冨洿鏂囦欢澶辫触锛侀�夋嫨鑼冨洿涓嶈兘涓虹┖锛岃閲嶆柊閫夋嫨鏂囦欢锛�", false);
}
}
-
+ JSONArray jsonArray = new JSONArray();
String stationFile = vo.getStationFile();
log.info("绔欑偣鏂囦欢shp鍦板潃锛歿}", stationFile);
try {
@@ -262,7 +262,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澶辫触");
@@ -270,6 +270,7 @@
String stationRainFile = vo.getStationRainFile();
log.info("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃锛歿}", floodFile);
+ JSONArray array = new JSONArray();
try {
// 鍒ゆ柇鍦板潃涓嶄负绌�
if (StringUtils.isEmpty(stationRainFile)) {
@@ -278,7 +279,7 @@
// 鍒涘缓琛ㄥ悕 鏃堕棿鎴�
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);
@@ -328,6 +329,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 ? "鎴愬姛" : "澶辫触");
--
Gitblit v1.9.3