From 76b02d2dea2a77d1746ce02c733f60c2f17d1a5f Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期四, 01 五月 2025 11:14:41 +0800
Subject: [PATCH] 修改Simu属性
---
src/main/java/com/se/nsl/controller/SimuController.java | 12 +++++++++++-
src/main/java/com/se/nsl/controller/TestController.java | 4 ++--
src/main/java/com/se/nsl/domain/po/RainGauge.java | 4 +++-
src/main/java/com/se/nsl/domain/po/SimuData.java | 9 +++++++++
src/main/java/com/se/nsl/domain/po/Rainfall.java | 3 ++-
5 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index 3d05b26..ff0abec 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -1,13 +1,16 @@
package com.se.nsl.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.domain.vo.SimuVo;
import com.se.nsl.service.SimuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -74,7 +77,14 @@
@PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
public R<Object> insert(@RequestBody Simu simu) {
try {
- return success(simuService.insert(simu));
+ if (StringUtils.isEmpty(simu.getData())) return fail("data is null");
+
+ SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
+ if (null == data) return fail("data is null");
+
+ int rows = simuService.insert(simu);
+
+ return success(rows);
} catch (Exception ex) {
return fail(ex, null);
}
diff --git a/src/main/java/com/se/nsl/controller/TestController.java b/src/main/java/com/se/nsl/controller/TestController.java
index a306916..e167351 100644
--- a/src/main/java/com/se/nsl/controller/TestController.java
+++ b/src/main/java/com/se/nsl/controller/TestController.java
@@ -53,8 +53,8 @@
@Resource
SimuPoService simuPoService;
- @Resource
- Hdf5Service hdf5Service;
+ //@Resource
+ //Hdf5Service hdf5Service;
@Resource
ResultService resultService;
diff --git a/src/main/java/com/se/nsl/domain/po/RainGauge.java b/src/main/java/com/se/nsl/domain/po/RainGauge.java
index 06140a9..19e8d64 100644
--- a/src/main/java/com/se/nsl/domain/po/RainGauge.java
+++ b/src/main/java/com/se/nsl/domain/po/RainGauge.java
@@ -2,8 +2,10 @@
import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
@SuppressWarnings("ALL")
-public class RainGauge {
+public class RainGauge implements Serializable {
@ApiModelProperty("闆ㄩ噺璁D")
private String id;
diff --git a/src/main/java/com/se/nsl/domain/po/Rainfall.java b/src/main/java/com/se/nsl/domain/po/Rainfall.java
index 853e3b0..93433bc 100644
--- a/src/main/java/com/se/nsl/domain/po/Rainfall.java
+++ b/src/main/java/com/se/nsl/domain/po/Rainfall.java
@@ -4,10 +4,11 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
import java.util.Date;
@SuppressWarnings("ALL")
-public class Rainfall {
+public class Rainfall implements Serializable {
@ApiModelProperty("鏃堕棿(yyyy-MM-dd HH:mm:ss)")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
diff --git a/src/main/java/com/se/nsl/domain/po/SimuData.java b/src/main/java/com/se/nsl/domain/po/SimuData.java
index 6589508..842bc46 100644
--- a/src/main/java/com/se/nsl/domain/po/SimuData.java
+++ b/src/main/java/com/se/nsl/domain/po/SimuData.java
@@ -70,6 +70,7 @@
public SimuData() {
gauges = new ArrayList<>();
+ rainfalls = new ArrayList<>();
}
public SimuData(String inPath, String outPath, Date startTime, Double minx, Double miny, Double maxx, Double maxy, Integer epsg, Integer type, Double total, Integer duration, Double intensity) {
@@ -237,4 +238,12 @@
public void setGauges(List<RainGauge> gauges) {
this.gauges = gauges;
}
+
+ public List<Rainfall> getRainfalls() {
+ return rainfalls;
+ }
+
+ public void setRainfalls(List<Rainfall> rainfalls) {
+ this.rainfalls = rainfalls;
+ }
}
--
Gitblit v1.9.3