From ddee792c3e8991a72990dbb485bde26bdb968c93 Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期三, 14 五月 2025 14:07:42 +0800
Subject: [PATCH] 升级求解器至2.0
---
src/main/java/com/se/nsl/controller/TestController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/TestController.java b/src/main/java/com/se/nsl/controller/TestController.java
index ebb9106..7cea5b6 100644
--- a/src/main/java/com/se/nsl/controller/TestController.java
+++ b/src/main/java/com/se/nsl/controller/TestController.java
@@ -1,8 +1,10 @@
package com.se.nsl.controller;
+import com.alibaba.fastjson.JSON;
import com.se.nsl.config.PropertiesConfig;
import com.se.nsl.domain.po.DataPo;
import com.se.nsl.domain.po.Region;
+import com.se.nsl.domain.po.Simu;
import com.se.nsl.domain.po.SimuData;
import com.se.nsl.domain.vo.R;
import com.se.nsl.helper.GdalHelper;
@@ -65,6 +67,9 @@
@Resource
PropertiesConfig config;
+
+ @Resource
+ SimuService simuService;
@Resource
ResolveService resolveService;
@@ -320,11 +325,16 @@
//rs = resolveService.createRainfallCsv("D:\\360\\bdpj.csv", "娉㈠姩骞冲潎鍒嗗竷", 100, 10, 1);
//rs = resolveService.createRainfallCsv("D:\\360\\cxss.csv", "鎸佺画涓婂崌", 100, 10, 1);
- SimuData data = new SimuData();
- data.setStartTime(new Date());
- data.setInPath("20250504203823");
+ //SimuData data = new SimuData();
+ //data.setStartTime(new Date());
+ //data.setInPath("20250504203823");
+ //String rs = resolveService.callZarr2tif(data);
- String rs = resolveService.callZarr2tif(data);
+ Simu simu = simuService.selectById(17);
+ SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
+ resolveService.initArgs(data);
+ resolveService.createRainfallFile(simu, data);
+ resolveService.callUwSolver(data);
return (Object) System.currentTimeMillis();
}
--
Gitblit v1.9.3