From 9fb83c303143e1efa0fc397adae1f58e426bd5dc Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期四, 01 五月 2025 16:28:31 +0800
Subject: [PATCH] 修改Simu属性
---
src/main/java/com/se/nsl/controller/SimuController.java | 31 ++++++++++++++-
src/main/java/com/se/nsl/config/PropertiesConfig.java | 24 ++++++++++++
src/main/java/com/se/nsl/domain/po/Simu.java | 11 +++++
src/main/resources/application-dev.yml | 4 +
src/main/java/com/se/nsl/service/SimuService.java | 10 +++++
5 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/se/nsl/config/PropertiesConfig.java b/src/main/java/com/se/nsl/config/PropertiesConfig.java
index 5aa4cce..5ad97c5 100644
--- a/src/main/java/com/se/nsl/config/PropertiesConfig.java
+++ b/src/main/java/com/se/nsl/config/PropertiesConfig.java
@@ -58,6 +58,10 @@
private String sww2tifBat;
+ private String uwSolverBat;
+
+ private String zarr2tifBat;
+
private List<Integer> sizes;
private String terrainFile;
@@ -242,6 +246,26 @@
this.solverBat = solverBat;
}
+ public String getUwSolverBat() {
+ return uwSolverBat;
+ }
+
+ public void setUwSolverBat(String uwSolverBat) {
+ this.uwSolverBat = uwSolverBat;
+ }
+
+ public String getZarr2tifBat() {
+ return zarr2tifBat;
+ }
+
+ public void setZarr2tifBat(String zarr2tifBat) {
+ this.zarr2tifBat = zarr2tifBat;
+ }
+
+ public boolean isCopyTif() {
+ return copyTif;
+ }
+
public String getRainStation() {
return rainStation;
}
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index ff0abec..f4df136 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -6,6 +6,7 @@
import com.se.nsl.domain.po.SimuData;
import com.se.nsl.domain.vo.R;
import com.se.nsl.domain.vo.SimuVo;
+import com.se.nsl.service.ResolveService;
import com.se.nsl.service.SimuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,6 +25,9 @@
public class SimuController extends BaseController {
@Resource
SimuService simuService;
+
+ @Resource
+ ResolveService resolveService;
/**
* 鍒嗛〉鏌ヨ鎺ㄦ紨妯℃嫙
@@ -77,10 +81,10 @@
@PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
public R<Object> insert(@RequestBody Simu simu) {
try {
- if (StringUtils.isEmpty(simu.getData())) return fail("data is null");
+ if (StringUtils.isEmpty(simu.getData())) return fail("data涓虹┖");
SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
- if (null == data) return fail("data is null");
+ if (null == data) return fail("data鏁版嵁鏍煎紡(JSON)涓嶆纭�");
int rows = simuService.insert(simu);
@@ -90,6 +94,29 @@
}
}
+ @ApiOperation(value = "start")
+ @GetMapping(value = "/start", produces = "application/json; charset=UTF-8")
+ public R<Object> start(Integer id) {
+ try {
+ if (null == id || id < 1) return fail("id涓虹┖");
+
+ Simu simu = simuService.selectById(id);
+ if (null == simu) return fail("鏂规鎵句笉鍒�");
+ if (StringUtils.isEmpty(simu.getData())) return fail("鏂规鏁版嵁(JSON)涓虹┖");
+
+ SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
+ if (null == data) return fail("鏂规鏁版嵁鏍煎紡(JSON)涓嶆纭�");
+
+ if (simu.getStatus() != 0) return fail("鏂规姝ｅ湪杩愯鎴栧凡瀹屾垚");
+
+ int rows = resolveService.start(simu);
+
+ return success("ok");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
/**
* 淇敼鎺ㄦ紨妯℃嫙
*
diff --git a/src/main/java/com/se/nsl/domain/po/Simu.java b/src/main/java/com/se/nsl/domain/po/Simu.java
index 5a23188..2273e27 100644
--- a/src/main/java/com/se/nsl/domain/po/Simu.java
+++ b/src/main/java/com/se/nsl/domain/po/Simu.java
@@ -22,6 +22,9 @@
@ApiModelProperty("鍚嶇О")
private String name;
+ @ApiModelProperty("鍖哄煙鍚嶇О")
+ private String areaName;
+
@ApiModelProperty("鏈嶅姟鍚嶇О")
private String serviceName;
@@ -90,6 +93,14 @@
this.name = name;
}
+ public String getAreaName() {
+ return areaName;
+ }
+
+ public void setAreaName(String areaName) {
+ this.areaName = areaName;
+ }
+
public String getServiceName() {
return serviceName;
}
diff --git a/src/main/java/com/se/nsl/service/SimuService.java b/src/main/java/com/se/nsl/service/SimuService.java
index 7365e6e..6dc5dad 100644
--- a/src/main/java/com/se/nsl/service/SimuService.java
+++ b/src/main/java/com/se/nsl/service/SimuService.java
@@ -86,6 +86,16 @@
}
/**
+ * 鏍规嵁ID鏌ヨ
+ *
+ * @param id ID
+ * @return Simu
+ */
+ public Simu selectById(Integer id) {
+ return simuMapper.selectById(id);
+ }
+
+ /**
* 淇敼鎺ㄦ紨妯℃嫙
*
* @param Simu 鎺ㄦ紨妯℃嫙瀵硅薄
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index da1f26e..b4ed133 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8079
+ port: 8078
servlet:
context-path: /api
@@ -141,6 +141,8 @@
flowUnits: CMS
solverBat: D:\other\simu\uwsolver\run_solver.bat
sww2tifBat: D:\other\simu\uwsolver\sww2tif.bat
+ uwSolverBat: D:\other\simu\uwsolver\CudaUWSolver.Demo.NoVis.20250430\start.bat
+ zarr2tifBat: D:\other\simu\uwsolver\zarr2tif 1.0\CudaUWSolver.Demo.NoVis.20250430\start.bat
#sizes: 64,128,256,512,1024,2048,4096
sizes: 1024
# 杈撳嚭鏂囦欢
--
Gitblit v1.9.3