From 0272ac944a277bc7ed683bab2d1fb13fcfb58869 Mon Sep 17 00:00:00 2001
From: xingjinshuang <xingjs@qq.com>
Date: 星期四, 26 十二月 2024 16:29:44 +0800
Subject: [PATCH] @xingjs@20241226@添加查询管线工具类,修改解决查询站点接口token存在无法获取的情况，解决后可正常获取token，并查询出需要的站点；解析shp文件获取站点范围;新增把降水CSV文件内容解析保存到数据库中
---
src/main/java/com/se/simu/controller/SimuController.java | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index 63327f0..3e9aee1 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -1,5 +1,6 @@
package com.se.simu.controller;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.se.simu.config.PropertiesConfig;
@@ -12,9 +13,11 @@
import com.se.simu.domain.vo.R;
import com.se.simu.domain.vo.SimuVo;
import com.se.simu.service.*;
+import com.se.simu.utils.CsvToSQLiteUtils;
import com.se.simu.utils.ShpToolUtils;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -207,16 +210,28 @@
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);
+ } else {
+ // 1 璇诲彇shp鏂囦欢锛岃幏鍙栬寖鍥村��
+ JSONObject jsonObject = ShpToolUtils.readShp(floodFile);
+ // 2 鑾峰彇jsonObject涓殑鑼冨洿鍊�
+ vo.setMinx(jsonObject.getDouble("minX"));
+ vo.setMaxx(jsonObject.getDouble("maxX"));
+ vo.setMiny(jsonObject.getDouble("minY"));
+ vo.setMaxy(jsonObject.getDouble("maxY"));
+ }
+ }
// todo: 瑙ｆ瀽鑼冨洿鏂囦欢 鏍规嵁涓嶅悓鐨勭殑鏍煎紡鏂囦欢杩涜涓嶅悓鐨勮В鏋愶紝鑾峰彇闇�瑕佽绠楃殑鑼冨洿鍊�
// 涓婁紶鏍煎紡锛�.shp/.tiff/.img/.geojson
// 閲嶆柊缁檝o璧嬪��
- // 1 璇诲彇shp鏂囦欢锛岃幏鍙栬寖鍥村��
- JSONObject jsonObject = ShpToolUtils.readShp(floodFile);
- // 2 鑾峰彇jsonObject涓殑鑼冨洿鍊�
- vo.setMinx(jsonObject.getDouble("minX"));
- vo.setMaxx(jsonObject.getDouble("maxX"));
- vo.setMiny(jsonObject.getDouble("minY"));
- vo.setMaxy(jsonObject.getDouble("maxY"));
} catch (Exception e) {
log.error("瑙ｆ瀽鑼冨洿鏂囦欢澶辫触");
if (null == vo.getMinx() || null == vo.getMiny() || null == vo.getMaxx() || null == vo.getMaxy()) {
@@ -225,13 +240,40 @@
}
String stationFile = vo.getStationFile();
- log.info("绔欑偣鏂囦欢shp鍦板潃锛歿}", floodFile);
-
+ log.info("绔欑偣鏂囦欢shp鍦板潃锛歿}", stationFile);
+ try {
+ // 鍒ゆ柇鍦板潃涓嶄负绌�
+ if (StringUtils.isEmpty(stationFile)) {
+ return fail("绔欑偣鏂囦欢shp鍦板潃涓嶈兘涓虹┖", false);
+ }
+ // 1 璇诲彇shp鏂囦欢锛岃幏鍙栫珯鐐瑰潗鏍囧��
+ JSONArray jsonArray = ShpToolUtils.readShpGetLocal(stationFile);
+ System.out.println("jsonArray = " + jsonArray);
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽绔欑偣鏂囦欢shp澶辫触");
+ }
String stationRainFile = vo.getStationRainFile();
log.info("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃锛歿}", floodFile);
- // TODO: 2024/12/24 鏍规嵁杩欎簺鏂囦欢鐨勫湴鍧�锛岃幏鍙栨枃浠跺唴瀹癸紝鍒涘缓浠跨湡瑙嗗浘
+ try {
+ // 鍒ゆ柇鍦板潃涓嶄负绌�
+ if (StringUtils.isEmpty(stationRainFile)) {
+ return fail("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃涓嶈兘涓虹┖", false);
+ }
+ // 鍒涘缓琛ㄥ悕 鏃堕棿鎴�
+ String tableName = "station_rain_" + System.currentTimeMillis();
+ // 1 璇诲彇CSV 鏂囦欢
+ CsvToSQLiteUtils.readCsvSaveLocal(stationRainFile, tableName);
+ // 鑾峰彇浠跨湡鏃堕棿 duration
+
+ // 鑾峰彇闄嶉洦鎬婚噺 total
+
+
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽绔欑偣闆ㄩ噺CSV鏂囦欢澶辫触");
+ }
+ // TODO: 2024/12/24 鏍规嵁杩欎簺鏂囦欢鐨勫湴鍧�锛岃幏鍙栨枃浠跺唴瀹癸紝鍒涘缓浠跨湡瑙嗗浘
try {
if (null == vo.getTotal() || vo.getTotal() < 1 || vo.getTotal() > 1000) {
return fail("闄嶉洦閲忎笉鑳戒负绌猴紝涓斿彇鍊煎湪1~1000涔嬮棿");
--
Gitblit v1.9.3