From 495292b588949bcb2cb15eaa9657619aca7f5579 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 30 十月 2024 16:18:41 +0800
Subject: [PATCH] 修改降雨文件的jar
---
src/main/java/com/se/simu/controller/SimuController.java | 80 +++++----------------------------------
1 files changed, 11 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index f0c40b4..274004c 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -9,7 +9,6 @@
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;
@@ -57,17 +56,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);
@@ -152,71 +148,15 @@
}
}
- @ApiOperation(value = "褰撳墠鏃堕棿 *")
- @GetMapping("/getTime")
- public Object getTime() {
- return System.currentTimeMillis();
- }
-
- @ApiOperation(value = "testCallExe *")
- @GetMapping("/testCallExe")
- public R<Object> testCallExe() {
- try {
- DataPo data = new DataPo();
- data.setInPath("20241010095328");
-
- String str = uwService.callExe(data);
-
- return success(str);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "testResuslt *")
- @GetMapping("/testResuslt")
- public R<Object> testResuslt() {
- try {
- DataPo data = new DataPo();
- data.setEpsg(4548);
- data.setInPath("20241010095328");
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
-
- resultService.process(data);
-
- return success("ok");
- } 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);
- }
- }
-
-
/**
* 浣跨敤绌洪棿鑼冨洿鏌ヨ 绠＄偣,绠＄嚎,寤虹瓚鐗� 3涓浘灞傦紝涓旀瘡涓浘灞傜殑鏁伴噺澶т簬0锛岃繑鍥� true銆�
*/
@ApiOperation(value = "闄嶆按鑼冨洿鏍￠獙")
- @GetMapping("/rangeVerif")
- public R<Object> rangeVerif(@RequestParam @ApiParam("鏈�灏廥") Double minx,
- @RequestParam @ApiParam("鏈�灏弝") Double miny,
- @RequestParam @ApiParam("鏈�澶") Double maxx,
- @RequestParam @ApiParam("鏈�澶") Double maxy) {
+ @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.setMinx(minx);
@@ -224,12 +164,14 @@
data.setMaxx(maxx);
data.setMaxy(maxy);
data.setEpsg(4326);
+
String token = gedbService.getToken();
GeDb db = gedbService.connectGedb(token, data);
List<GeLayer> layers = gedbService.getLayers(token, db);
- return success(gedbService.queryBboxCount(token,db, layers));
+
+ return success(gedbService.queryBboxCount(token, db, layers));
} catch (Exception ex) {
- return fail(ex, null);
+ return fail(ex, false);
}
}
}
--
Gitblit v1.9.3