From 303058307780d49e2ae4c815669f34b866206d86 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期四, 19 六月 2025 15:42:45 +0800
Subject: [PATCH] 根据位置查询，不提供时间则返回服务中所有符合条件的列表
---
src/main/java/com/se/nsl/controller/TestController.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/TestController.java b/src/main/java/com/se/nsl/controller/TestController.java
index 192fefc..45418e8 100644
--- a/src/main/java/com/se/nsl/controller/TestController.java
+++ b/src/main/java/com/se/nsl/controller/TestController.java
@@ -1,8 +1,11 @@
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;
import com.se.nsl.helper.ShpHelper;
@@ -64,6 +67,9 @@
@Resource
PropertiesConfig config;
+
+ @Resource
+ SimuService simuService;
@Resource
ResolveService resolveService;
@@ -227,7 +233,7 @@
})
public R<Object> testNsl(String inPath, String startTime, Integer epsg) {
try {
- DataPo data = new DataPo();
+ SimuData data = new SimuData();
data.setInPath(inPath);
data.setStartTime(StringHelper.YMDHMS_FORMAT.parse(startTime));
data.setEpsg(epsg);
@@ -250,7 +256,7 @@
})
public R<Object> testCreateNsl(String tifPath, String inPath, String startTime, Integer epsg) {
try {
- DataPo data = new DataPo();
+ SimuData data = new SimuData();
data.setInPath(inPath);
data.setStartTime(StringHelper.YMDHMS_FORMAT.parse(startTime));
data.setEpsg(epsg);
@@ -313,11 +319,33 @@
@ApiOperation(value = "10.褰撳墠鏃堕棿 *")
@GetMapping("/getTime")
- public Object getTime() {
- String rs = resolveService.createRainfallCsv("D:\\360\\zt.csv", "姝ｆ�佸垎甯�", 100, 10, 1);
+ public Object getTime() throws Exception {
+ /*String rs = resolveService.createRainfallCsv("D:\\360\\zt.csv", "姝ｆ�佸垎甯�", 100, 10, 1);
rs = resolveService.createRainfallCsv("D:\\360\\pj.csv", "骞冲潎鍒嗗竷", 100, 10, 1);
rs = resolveService.createRainfallCsv("D:\\360\\bdpj.csv", "娉㈠姩骞冲潎鍒嗗竷", 100, 10, 1);
- rs = resolveService.createRainfallCsv("D:\\360\\cxss.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");
+ 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);*/
+
+ /*SimuData data = new SimuData();
+ data.setStartTime(new Date(1748747454000L));
+ data.setInPath("20250515143948");
+ data.setOutPath(data.getInPath());
+ data.setEpsg(4548);
+ testService.test(data);*/
+
+ Simu simu = simuService.selectById(17);
+ SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
+ resolveService.initArgs(simu, data);
return (Object) System.currentTimeMillis();
}
--
Gitblit v1.9.3