From 60494b2aa2d720a98c421dc732ca2636b273e10c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 30 九月 2024 17:02:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/controller/SimuController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index c91ac75..8ee0441 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -8,6 +8,7 @@
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 io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
@@ -35,6 +36,9 @@
GedbService gedbService;
@Resource
+ ResultService resultService;
+
+ @Resource
SimuService simuService;
private final List<String> FLOOD_TYPE = new ArrayList<>(Arrays.asList("娌欒", "闃叉按鏉�"));
@@ -52,8 +56,8 @@
if (null == vo.getMinx() || null == vo.getMiny() || null == vo.getMaxx() || null == vo.getMaxy()) {
return fail("閫夋嫨鑼冨洿涓嶈兘涓虹┖", false);
}
- if (null == vo.getIsFlood() || vo.getIsFlood() < 0) {
- vo.setIsFlood(0);
+ if (null == vo.getPid() || vo.getPid() < 0) {
+ vo.setPid(0);
}
if (StringHelper.isEmpty(vo.getName())) {
vo.setName(StringHelper.YMDHMS2_FORMAT.format(new Date()));
@@ -61,8 +65,17 @@
if (null == vo.getNum() || vo.getNum() < 1) {
vo.setNum(simuService.getMaxId() + 1);
}
- if (vo.getIsFlood() > 0) {
- vo.setIsFlood(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) + "涔嬮棿");
}
@@ -136,10 +149,10 @@
@GetMapping("/test")
public R<Object> test() {
try {
- // 469538.6536261877,4416744.922022615,469853.14714664617,4417049.378602433
- //String bbox = "116.64388473935195,39.884315914604464,116.64754729082588,39.887069143903496";
- DataPo data = new DataPo("20240913", "20240913", "20240913", 116.64388473935195, 39.884315914604464, 116.64754729082588, 39.887069143903496, 50.0, 25);
- Object rs = gedbService.test(data);
+ //DataPo data = new DataPo("20240913", "20240913", "20240913", 116.64388473935195, 39.884315914604464, 116.64754729082588, 39.887069143903496, 50.0, 25);
+ //Object rs = gedbService.test(data);
+
+ Object rs = resultService.test();
return success(rs);
} catch (Exception ex) {
--
Gitblit v1.9.3