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 | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index 2b113d3..274004c 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -1,19 +1,25 @@
package com.se.simu.controller;
+import cn.hutool.json.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
+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.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 io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -30,10 +36,18 @@
@SuppressWarnings("ALL")
public class SimuController extends BaseController {
@Resource
+ UwService uwService;
+
+ @Resource
GedbService gedbService;
@Resource
SimuService simuService;
+
+ @Resource
+ ResultService resultService;
+
+ private final List<String> FLOOD_TYPE = new ArrayList<>(Arrays.asList("娌欒", "闃叉按鏉�"));
@ApiOperation(value = "鍒涘缓")
@PostMapping(value = "/create", produces = "application/json; charset=UTF-8")
@@ -42,17 +56,44 @@
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 (StringHelper.isEmpty(vo.getName())) {
- vo.setName(StringHelper.YMDHMS2_FORMAT.format(new Date()));
+ 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 = simuService.create(vo);
@@ -107,18 +148,30 @@
}
}
- @ApiOperation(value = "* Test *")
- @GetMapping("/test")
- public R<Object> test(@ApiParam("浠跨湡瑙嗗浘绫�") SimuVo vo) {
+ /**
+ * 浣跨敤绌洪棿鑼冨洿鏌ヨ 绠＄偣,绠＄嚎,寤虹瓚鐗� 3涓浘灞傦紝涓旀瘡涓浘灞傜殑鏁伴噺澶т簬0锛岃繑鍥� true銆�
+ */
+ @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 {
- // 469538.6536261877,4416744.922022615,469853.14714664617,4417049.378602433
- String bbox = "116.64388473935195,39.884315914604464,116.64754729082588,39.887069143903496";
- String taskName = "20240913";
- Object rs = gedbService.test(bbox, taskName);
+ DataPo data = new DataPo();
+ data.setMinx(minx);
+ data.setMiny(miny);
+ data.setMaxx(maxx);
+ data.setMaxy(maxy);
+ data.setEpsg(4326);
- return success(rs);
+ String token = gedbService.getToken();
+ GeDb db = gedbService.connectGedb(token, data);
+ List<GeLayer> layers = gedbService.getLayers(token, db);
+
+ return success(gedbService.queryBboxCount(token, db, layers));
} catch (Exception ex) {
- return fail(ex, null);
+ return fail(ex, false);
}
}
}
--
Gitblit v1.9.3