From f31f0991c0d2036e563b886f57de4cf45d3c72cb Mon Sep 17 00:00:00 2001 From: dcb <xgybdcb@163.com> Date: 星期二, 01 七月 2025 14:51:59 +0800 Subject: [PATCH] 实时模拟异步功能实现 --- src/main/java/com/se/nsl/controller/SimuController.java | 127 +++++++++++++++++++++++------------------- 1 files changed, 70 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java index c790ff9..f289da9 100644 --- a/src/main/java/com/se/nsl/controller/SimuController.java +++ b/src/main/java/com/se/nsl/controller/SimuController.java @@ -6,12 +6,9 @@ import com.se.nsl.domain.po.Simu; import com.se.nsl.domain.po.SimuData; import com.se.nsl.domain.vo.*; -import com.se.nsl.service.RealTimeSimulationService; -import com.se.nsl.service.ResolveService; -import com.se.nsl.service.SimuService; +import com.se.nsl.service.*; +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 +17,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锛嶆帹婕旀ā鎷�") @@ -39,7 +32,10 @@ ResolveService resolveService; @Resource - RealTimeSimulationService rts; + RealTimeSimulationAsyncService rtsas; + + @Resource + CrossSectionAnalysisService scas; /** * 鍒嗛〉鏌ヨ鎺ㄦ紨妯℃嫙 @@ -105,10 +101,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()); @@ -125,7 +124,7 @@ if (null == id || id < 1) return fail("id涓虹┖"); Simu simu = simuService.selectById(id); - if (null == simu) return fail("鏂规鎵句笉鍒�"); + if (null == simu) return notFound("鏂规鎵句笉鍒�"); if (StringUtils.isEmpty(simu.getData())) return fail("鏂规鏁版嵁(JSON)涓虹┖"); SimuData data = JSON.parseObject(simu.getData(), SimuData.class); @@ -134,9 +133,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) { + rtsas.startSimulation(simu); + return success(null, "瀹炴椂妯℃嫙浠诲姟宸叉彁浜�"); + } + return fail("妯℃嫙绫诲瀷鏆備笉鏀寔"); } catch (Exception ex) { return fail(ex, null); } @@ -197,48 +203,55 @@ } } - @ApiOperation(value = "realTime") - @ApiImplicitParams({ - @ApiImplicitParam(name = "date1", value = "5鍒嗛挓鍓嶇殑鏃堕棿锛屾牸寮忎负2025-05-31 14:15:20"), - @ApiImplicitParam(name = "rainfall1", value = "5鍒嗛挓鍓嶇殑闄嶉洦寮哄害"), - @ApiImplicitParam(name = "date2", value = "褰撳墠鏃堕棿锛屾牸寮忎负2025-05-31 14:20:20"), - @ApiImplicitParam(name = "rainfall2", value = "褰撳墠鐨勯檷闆ㄥ己搴�"), - @ApiImplicitParam(name = "serviceName", value = "鏈嶅姟鍚�") - }) - @GetMapping("/realTime") - public R<Object> realTimeSimulate(String date1, double rainfall1, - String date2, double rainfall2, String serviceName) { - RealTimeInput input = new RealTimeInput(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - LocalDateTime t1 = LocalDateTime.parse(date1, formatter); - LocalDateTime t2 = LocalDateTime.parse(date2, formatter); - RealTimeInput.RealTimeData d1 = new RealTimeInput.RealTimeData(); - d1.setDateTime(t1); - d1.setIntensity(rainfall1); - RealTimeInput.RealTimeData d2 = new RealTimeInput.RealTimeData(); - d2.setDateTime(t2); - d2.setIntensity(rainfall2); - input.setData(Arrays.asList(d1, d2)); - input.setServiceName(serviceName); - - try { - String layerJsonName = resolveService.realTimeSimulate(input); - return success(layerJsonName); - } catch (IOException e) { - log.error("real-time simulate exception:", e); - return fail("瀹炴椂妯℃嫙寮傚父"); + @ApiOperation(value = "crossSection") + @GetMapping("/crossSection") + public R<Object> crossSection(String serviceName, double[] startPoint, double[] endPoint) { + if (serviceName == null) { + return clientError("鏈嶅姟鍚嶄笉鑳戒负绌�"); } + if (startPoint == null) { + return clientError("璧风偣涓嶈兘涓虹┖"); + } + if (startPoint.length < 2) { + return clientError("璧风偣鑷冲皯鍖呭惈x,y涓や釜鍊�"); + } + if (endPoint == null) { + return clientError("缁堢偣涓嶈兘涓虹┖"); + } + if (endPoint.length < 2) { + return clientError("缁堢偣鑷冲皯鍖呭惈x,y涓や釜鍊�"); + } + List<CrossSectionAnalysisResult> result = scas.crossSectionAnalysis(serviceName, startPoint, endPoint); + return success(result); } - @ApiOperation(value = "realTime") - @PostMapping("/realTime2") - public R<Object> realTimeSimulate(@RequestBody RealTimeSimuParam param) { - try { - String layerJsonName = rts.realTimeSimulate(param); - return success(layerJsonName); - } catch (IOException e) { - log.error("real-time simulate exception:", e); - return fail("瀹炴椂妯℃嫙寮傚父"); + @ApiOperation(value = "stop") + @GetMapping("/stop") + public R<Object> stop(Integer id) { + if (id == null) { + return fail("id涓嶈兘涓虹┖"); } + try { + rtsas.stopSimulation(id); + } catch (IllegalArgumentException e) { + return notFound(e.getMessage()); + } + return success(null, "姝e湪鍋滄id涓�" + id + "鐨勬ā鎷熶换鍔�"); + } + + @ApiOperation(value = "results") + @GetMapping("/results") + public R<Object> querySimulationResult(Integer id) { + if (null == id || id < 1) return clientError("id涓嶈兘涓虹┖"); + Simu simu = simuService.selectById(id); + if (simu == null) { + return clientError("鎵句笉鍒板搴旂殑鏈嶅姟"); + } + String serviceName = simu.getServiceName(); + if (serviceName == null) { + return fail("鎵句笉鍒板搴旂殑鏈嶅姟"); + } + List<String> results = resolveService.simulationResults(serviceName); + return success(results, results.size()); } } -- Gitblit v1.9.3