From 043d1bd4860bbee636b3935e94a71246091cbf3f Mon Sep 17 00:00:00 2001 From: dcb <xgybdcb@163.com> Date: 星期二, 24 六月 2025 15:29:24 +0800 Subject: [PATCH] 实时模拟功能实现 --- src/main/java/com/se/nsl/controller/SimuController.java | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java index fc5389d..f4d0076 100644 --- a/src/main/java/com/se/nsl/controller/SimuController.java +++ b/src/main/java/com/se/nsl/controller/SimuController.java @@ -9,9 +9,8 @@ import com.se.nsl.service.RealTimeSimulationService; import com.se.nsl.service.ResolveService; import com.se.nsl.service.SimuService; +import com.se.nsl.utils.SimulateType; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.gdal.ogr.Geometry; @@ -20,10 +19,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.io.IOException; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Arrays; import java.util.List; @Api(tags = "03锛嶆帹婕旀ā鎷�") @@ -105,10 +100,13 @@ int rows = simuService.insert(simu); System.out.println(String.format("id:%s", simu.getId())); - - if (rows > 0 && (null == data.getRainfalls() || data.getRainfalls().size() < 2)) { - resolveService.createRainfall(simu); - simuService.updateById(simu); + Integer type = data.getType(); + SimulateType simulateType = SimulateType.of(type); + if (simulateType == SimulateType.HISTORY) { + if (rows > 0 && (null == data.getRainfalls() || data.getRainfalls().size() < 2)) { + resolveService.createRainfall(simu); + simuService.updateById(simu); + } } JSONObject json = new JSONObject(); json.put("id", simu.getId()); @@ -134,9 +132,16 @@ //if (simu.getStatus() != 0) return fail("鏂规姝e湪杩愯鎴栧凡瀹屾垚"); if (StringUtils.isEmpty(simu.getGeom())) return fail("鏂规鐨勫浘褰负绌�"); - int rows = resolveService.start(simu); - - return success("ok"); + Short type = simu.getType(); + SimulateType simulateType = SimulateType.of(type); + if (simulateType == SimulateType.HISTORY) { + int rows = resolveService.start(simu); + return success("ok"); + } else if (simulateType == SimulateType.REAL_TIME) { + String s = rts.realTimeSimulate(simu); + return success(s); + } + return fail("妯℃嫙绫诲瀷鏆備笉鏀寔"); } catch (Exception ex) { return fail(ex, null); } -- Gitblit v1.9.3