From 13e97232b9f06e1b18955c1c9b84daffe4f21d71 Mon Sep 17 00:00:00 2001
From: xingjinshuang <xingjs@qq.com>
Date: 星期二, 24 十二月 2024 17:02:19 +0800
Subject: [PATCH] @xingjs@20241224@添加解析CSV文件相关实体类、方法；添加文件上传配置;添加开发文件上传相关工具类
---
src/main/java/com/se/simu/controller/SimuController.java | 171 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 126 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index e36c989..0f3d346 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -1,32 +1,28 @@
package com.se.simu.controller;
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.helper.StringHelper;
-import com.se.simu.service.GedbService;
-import com.se.simu.service.ResultService;
-import com.se.simu.service.SimuService;
-import com.se.simu.service.UwService;
+import com.se.simu.service.*;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-/**
- * 浠跨湡绠＄悊
- *
- * @author WWW
- * @date 2024-09-18
- */
@Api(tags = "浠跨湡绠＄悊")
@Slf4j
@RestController
@@ -43,6 +39,16 @@
SimuService simuService;
@Resource
+ SimuFilesService simuFilesService;
+
+ @Resource
+ PropertiesConfig config;
+
+ @Value("${simu-app.filePath}")
+ private String uploadedFolder;
+
+
+ @Resource
ResultService resultService;
private final List<String> FLOOD_TYPE = new ArrayList<>(Arrays.asList("娌欒", "闃叉按鏉�"));
@@ -54,17 +60,14 @@
if (null == vo.getTotal() || vo.getTotal() < 1 || vo.getTotal() > 1000) {
return fail("闄嶉洦閲忎笉鑳戒负绌猴紝涓斿彇鍊煎湪1~1000涔嬮棿");
}
- if (null == vo.getDuration() || vo.getDuration() < 1 || vo.getDuration() > 120) {
- return fail("浠跨湡鏃堕暱涓嶈兘涓虹┖锛屼笖鍙栧�煎湪1~120涔嬮棿");
+ 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 (StringHelper.isEmpty(vo.getName())) {
- vo.setName(StringHelper.YMDHMS2_FORMAT.format(new Date()));
}
if (null == vo.getNum() || vo.getNum() < 1) {
vo.setNum(simuService.getMaxId() + 1);
@@ -149,43 +152,121 @@
}
}
- @ApiOperation(value = "褰撳墠鏃堕棿 *")
- @GetMapping("/getTime")
- public Object getTime() {
- return System.currentTimeMillis();
- }
-
- @ApiOperation(value = "testResuslt *")
- @GetMapping("/testResuslt")
- public R<Object> testResuslt() {
+ @ApiOperation(value = "闄嶆按鑼冨洿鏍￠獙")
+ @GetMapping("/rangeVerify")
+ public R<Object> rangeVerify(@RequestParam @ApiParam("鏈�灏廥") double minx,
+ @RequestParam @ApiParam("鏈�灏弝") double miny,
+ @RequestParam @ApiParam("鏈�澶") double maxx,
+ @RequestParam @ApiParam("鏈�澶") double maxy) {
try {
DataPo data = new DataPo();
- data.setEpsg(4548);
- data.setInPath("20241010095328");
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
+ data.setMinx(minx);
+ data.setMiny(miny);
+ data.setMaxx(maxx);
+ data.setMaxy(maxy);
+ data.setEpsg(4326);
- resultService.process(data);
+ String token = gedbService.getToken();
+ GeDb db = gedbService.connectGedb(token, data);
+ List<GeLayer> layers = gedbService.getLayers(token, db);
- return success("ok");
+ return success(gedbService.queryBboxCount(token, db, layers));
+ } catch (Exception ex) {
+ return fail(ex, false);
+ }
+ }
+
+ /**
+ * 鏂囦欢鍒涘缓妯℃嫙
+ * <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("鍒涘缓浠跨湡瑙嗗浘绫�") CreateFilesSimuVo vo) throws IOException {
+ // 鑾峰彇涓婁紶鏂囦欢璺緞
+ String targetDir = uploadedFolder;
+ log.info("涓婁紶鏂囦欢璺緞锛歿}", targetDir);
+ // 鑾峰彇鍚勪釜鏂囦欢鐨勫湴鍧�
+ String floodFile = vo.getFloodFile();
+ log.info("鑼冨洿鏂囦欢鍦板潃锛歿}", floodFile);
+ try {
+ // todo: 瑙ｆ瀽鑼冨洿鏂囦欢 鏍规嵁涓嶅悓鐨勭殑鏍煎紡鏂囦欢杩涜涓嶅悓鐨勮В鏋愶紝鑾峰彇闇�瑕佽绠楃殑鑼冨洿鍊�
+ // 涓婁紶鏍煎紡锛�.shp/.tiff/.img/.geojson
+ // 閲嶆柊缁檝o璧嬪��
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽鑼冨洿鏂囦欢澶辫触");
+ }
+
+ String stationFile = vo.getStationFile();
+ log.info("绔欑偣鏂囦欢shp鍦板潃锛歿}", floodFile);
+ String stationRainFile = vo.getStationRainFile();
+ log.info("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃锛歿}", floodFile);
+ // TODO: 2024/12/24 鏍规嵁杩欎簺鏂囦欢鐨勫湴鍧�锛岃幏鍙栨枃浠跺唴瀹癸紝鍒涘缓浠跨湡瑙嗗浘
+
+ try {
+ if (null == vo.getTotal() || vo.getTotal() < 1 || vo.getTotal() > 1000) {
+ return fail("闄嶉洦閲忎笉鑳戒负绌猴紝涓斿彇鍊煎湪1~1000涔嬮棿");
+ }
+ 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) {
+ return fail("pid涓嶅瓨鍦�");
+ }
+ if (null == vo.getFloodStart() || vo.getFloodStart() < 1 || vo.getFloodStart() > vo.getDuration() * 60) {
+ return fail("闃叉睕寮�濮嬫椂闂翠笉鑳戒负绌猴紝涓斿彇鍊煎湪1~" + (vo.getDuration() * 60) + "涔嬮棿");
+ }
+ if (null == vo.getFloodEnd() || vo.getFloodEnd() < vo.getFloodStart() || vo.getFloodEnd() > vo.getDuration() * 60) {
+ return fail("闃叉睕缁撴潫鏃堕棿涓嶈兘涓虹┖锛屼笖鍙栧�煎湪" + vo.getFloodStart() + "~" + (vo.getDuration() * 60) + "涔嬮棿");
+ }
+ if (null == vo.getFloodHeight() || vo.getFloodHeight() < 1 || vo.getFloodHeight() > 2000) {
+ return fail("闃叉睕楂樺害涓嶈兘涓虹┖锛屼笖鍙栧�煎湪1~2000涔嬮棿");
+ }
+ if (!FLOOD_TYPE.contains(vo.getFloodType())) {
+ return fail("闃叉睕绫诲瀷涓嶈兘涓虹┖锛屼笖鍙兘鏄矙琚嬪拰闃叉按鏉�");
+ }
+ if (null == vo.getFloodMinx() || null == vo.getFloodMiny() || null == vo.getFloodMaxx() || null == vo.getFloodMaxy()) {
+ return fail("闃叉睕鑼冨洿涓嶈兘涓虹┖", false);
+ }
+ }
+ boolean flag = simuFilesService.createByfiles(vo);
+ return success(flag, flag ? "鎴愬姛" : "澶辫触");
} catch (Exception ex) {
return fail(ex, null);
}
}
- @ApiOperation(value = "testSww2Tif *")
- @GetMapping("/testSww2Tif")
- public R<Object> testSww2Tif() {
- try {
- DataPo data = new DataPo();
- data.setEpsg(4548);
- data.setInPath("20241010095328");
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
- Object rs = uwService.copeDrainFiles(data);
-
- return success(rs);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
}
--
Gitblit v1.9.3