From 2303ba3d0bcc38607dd01329a12e4f4b74b444c0 Mon Sep 17 00:00:00 2001
From: xingjinshuang <xingjs@qq.com>
Date: 星期五, 27 十二月 2024 17:49:53 +0800
Subject: [PATCH] @xingjs@20241227@优化解决获取建筑物图层方法
---
src/main/java/com/se/simu/controller/SimuController.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 108 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index de8fccf..100e534 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -1,17 +1,23 @@
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;
import com.se.simu.domain.dto.GeDb;
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.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.*;
@@ -168,8 +174,11 @@
String token = gedbService.getToken();
GeDb db = gedbService.connectGedb(token, data);
List<GeLayer> layers = gedbService.getLayers(token, db);
+ boolean result = gedbService.queryBboxCount(token, db, layers);
+ log.info("result = " + result);
+ return success(result);
- return success(gedbService.queryBboxCount(token, db, layers));
+ // return success(gedbService.queryBboxCount(token, db, layers));
} catch (Exception ex) {
return fail(ex, false);
}
@@ -177,26 +186,114 @@
/**
* 鏂囦欢鍒涘缓妯℃嫙
+ * <p>
+ * "鐘舵�侊細
+ * 0-鍒涘缓浠跨湡浠诲姟锛�
+ * 1-杩炴帴GEDB搴擄紝
+ * 2-涓嬭浇绌洪棿鏁版嵁锛�
+ * 3-涓嬭浇楂樼▼鏁版嵁锛�
+ * 4-鐢熸垚闄嶉洦鏂囦欢锛�
+ * 5-鐢熸垚閰嶇疆鏂囦欢锛�
+ * 6-妯℃嫙鍐呮稘浠跨湡锛�
+ * 7-澶勭悊姘翠綅鏂囦欢锛�
+ * 8-澶勭悊鎺掓按鏂囦欢锛�
+ * 9-澶勭悊浠跨湡缁撴灉锛�
+ * 10-瀹屾垚锛�-10-鍑洪敊
*
* @param vo VO
* @return {@link R}<{@link Object}>
*/
@ApiOperation(value = "鏂囦欢鍒涘缓")
@PostMapping(value = "/file_create", produces = "application/json; charset=UTF-8")
- public R<Object> fileCreate(@RequestBody @ApiParam("鍒涘缓浠跨湡瑙嗗浘绫�") CreateSimuVo vo) throws IOException {
+ public R<Object> fileCreate(@RequestBody @ApiParam("鍒涘缓浠跨湡瑙嗗浘绫�") CreateFilesSimuVo vo) throws IOException {
// 鑾峰彇涓婁紶鏂囦欢璺緞
String targetDir = uploadedFolder;
-
-
+ log.info("涓婁紶鏂囦欢璺緞锛歿}", targetDir);
+ // 鑾峰彇鍚勪釜鏂囦欢鐨勫湴鍧�
+ String floodFile = vo.getFloodFile();
+ log.info("鑼冨洿鏂囦欢鍦板潃锛歿}", floodFile);
try {
- if (null == vo.getTotal() || vo.getTotal() < 1 || vo.getTotal() > 1000) {
- return fail("闄嶉洦閲忎笉鑳戒负绌猴紝涓斿彇鍊煎湪1~1000涔嬮棿");
+ // 鍒ゆ柇鍦板潃涓嶄负绌�
+ 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涓殑鑼冨洿鍊�
+ 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璧嬪��
+ } 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鍦板潃锛歿}", 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);
+ try {
+ // 鍒ゆ柇鍦板潃涓嶄负绌�
+ if (StringUtils.isEmpty(stationRainFile)) {
+ return fail("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃涓嶈兘涓虹┖", false);
+ }
+ // 鍒涘缓琛ㄥ悕 鏃堕棿鎴�
+ String tableName = "station_rain_" + System.currentTimeMillis();
+ // 1 璇诲彇CSV 鏂囦欢
+ CsvToSQLiteUtils.readCsvSaveLocal(stationRainFile, tableName);
+ // 鑾峰彇浠跨湡鏃堕棿 duration
+ Integer duration = CsvToSQLiteUtils.getDuration(tableName);
+ log.info("浠跨湡鏃堕棿 duration = {}", duration);
+ vo.setDuration(duration);
+
+ // 鑾峰彇闄嶉洦鎬婚噺 total
+ Double total = CsvToSQLiteUtils.getTotal(tableName);
+ log.info("闄嶉洦鎬婚噺 total = {}", total);
+ vo.setTotal(total);
+
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽绔欑偣闆ㄩ噺CSV鏂囦欢澶辫触");
+ }
+ // TODO: 2024/12/24 鏍规嵁杩欎簺鏂囦欢鐨勫湴鍧�锛岃幏鍙栨枃浠跺唴瀹癸紝鍒涘缓浠跨湡瑙嗗浘
+ try {
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);
@@ -204,12 +301,10 @@
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) {
@@ -231,6 +326,7 @@
return fail("闃叉睕鑼冨洿涓嶈兘涓虹┖", false);
}
}
+ // 寮�濮嬫ā鎷熻绠�
boolean flag = simuFilesService.createByfiles(vo);
return success(flag, flag ? "鎴愬姛" : "澶辫触");
} catch (Exception ex) {
--
Gitblit v1.9.3