From 6365456e5476830267fde30914a1b260d2ec6462 Mon Sep 17 00:00:00 2001
From: xingjinshuang <xingjs@qq.com>
Date: 星期四, 26 十二月 2024 15:20:23 +0800
Subject: [PATCH] @xingjs@20241226@添加查询管线工具类,修改解决查询站点接口token存在无法获取的情况，解决后可正常获取token，并查询出需要的站点；解析shp文件获取站点范围
---
src/main/java/com/se/simu/controller/SimuController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index 0f3d346..63327f0 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.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.se.simu.config.PropertiesConfig;
import com.se.simu.domain.dto.GeDb;
@@ -11,6 +12,7 @@
import com.se.simu.domain.vo.R;
import com.se.simu.domain.vo.SimuVo;
import com.se.simu.service.*;
+import com.se.simu.utils.ShpToolUtils;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -208,12 +210,24 @@
// 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()) {
+ return fail("瑙ｆ瀽鑼冨洿鏂囦欢澶辫触锛侀�夋嫨鑼冨洿涓嶈兘涓虹┖锛岃閲嶆柊閫夋嫨鏂囦欢锛�", false);
+ }
}
String stationFile = vo.getStationFile();
log.info("绔欑偣鏂囦欢shp鍦板潃锛歿}", floodFile);
+
+
String stationRainFile = vo.getStationRainFile();
log.info("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃锛歿}", floodFile);
// TODO: 2024/12/24 鏍规嵁杩欎簺鏂囦欢鐨勫湴鍧�锛岃幏鍙栨枃浠跺唴瀹癸紝鍒涘缓浠跨湡瑙嗗浘
@@ -225,21 +239,16 @@
if (null == vo.getDuration() || vo.getDuration() < 1 || vo.getDuration() > 10080) {
return fail("浠跨湡鏃堕暱涓嶈兘涓虹┖锛屼笖鍙栧�煎湪1~10080涔嬮棿");
}
- if (null == vo.getMinx() || null == vo.getMiny() || null == vo.getMaxx() || null == vo.getMaxy()) {
- return fail("閫夋嫨鑼冨洿涓嶈兘涓虹┖", false);
- }
if (null == vo.getPid() || vo.getPid() < 0) {
vo.setPid(0);
}
if (null == vo.getNum() || vo.getNum() < 1) {
vo.setNum(simuService.getMaxId() + 1);
}
- if (null == vo.getPid() || vo.getPid() < 0) {
- vo.setPid(0);
- }
if (null == vo.getStartTime()) {
vo.setStartTime(new Date());
}
+ // 闃叉睕浣滀笟
if (vo.getPid() > 0) {
SimuPo pp = simuService.getSimuByPid(vo.getPid());
if (null == pp) {
@@ -261,6 +270,7 @@
return fail("闃叉睕鑼冨洿涓嶈兘涓虹┖", false);
}
}
+ // 寮�濮嬫ā鎷熻绠�
boolean flag = simuFilesService.createByfiles(vo);
return success(flag, flag ? "鎴愬姛" : "澶辫触");
} catch (Exception ex) {
--
Gitblit v1.9.3