From af9146497f3fc7ab7b7bd96a7b86946c0dd8d802 Mon Sep 17 00:00:00 2001
From: xingjinshuang <xingjs@qq.com>
Date: 星期二, 24 十二月 2024 16:52:19 +0800
Subject: [PATCH] @xingjs@20241224@添加解析CSV文件相关实体类、方法；添加文件上传配置;添加开发文件上传相关工具类
---
src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java | 85 ++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/se/simu/controller/SimuController.java | 13 +++++-
src/main/java/com/se/simu/service/SimuFilesService.java | 3 +
3 files changed, 98 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index de8fccf..4b8410a 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -6,6 +6,7 @@
import com.se.simu.domain.dto.GeLayer;
import com.se.simu.domain.po.DataPo;
import com.se.simu.domain.po.SimuPo;
+import com.se.simu.domain.vo.CreateFilesSimuVo;
import com.se.simu.domain.vo.CreateSimuVo;
import com.se.simu.domain.vo.R;
import com.se.simu.domain.vo.SimuVo;
@@ -183,10 +184,18 @@
*/
@ApiOperation(value = "鏂囦欢鍒涘缓")
@PostMapping(value = "/file_create", produces = "application/json; charset=UTF-8")
- public R<Object> fileCreate(@RequestBody @ApiParam("鍒涘缓浠跨湡瑙嗗浘绫�") CreateSimuVo vo) throws IOException {
+ public R<Object> fileCreate(@RequestBody @ApiParam("鍒涘缓浠跨湡瑙嗗浘绫�") CreateFilesSimuVo vo) throws IOException {
// 鑾峰彇涓婁紶鏂囦欢璺緞
String targetDir = uploadedFolder;
-
+ log.info("涓婁紶鏂囦欢璺緞锛歿}", targetDir);
+ // 鑾峰彇鍚勪釜鏂囦欢鐨勫湴鍧�
+ String floodFile = vo.getFloodFile();
+ log.info("鑼冨洿鏂囦欢鍦板潃锛歿}", floodFile);
+ String stationFile = vo.getStationFile();
+ log.info("绔欑偣鏂囦欢shp鍦板潃锛歿}", floodFile);
+ String stationRainFile = vo.getStationRainFile();
+ log.info("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃锛歿}", floodFile);
+ // TODO: 2024/12/24 鏍规嵁杩欎簺鏂囦欢鐨勫湴鍧�锛岃幏鍙栨枃浠跺唴瀹癸紝鍒涘缓浠跨湡瑙嗗浘
try {
if (null == vo.getTotal() || vo.getTotal() < 1 || vo.getTotal() > 1000) {
diff --git a/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java b/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java
new file mode 100644
index 0000000..51af3c2
--- /dev/null
+++ b/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java
@@ -0,0 +1,85 @@
+package com.se.simu.domain.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "CreateFilesSimuVo", description = "")
+public class CreateFilesSimuVo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ @ApiModelProperty("鏈�灏廥")
+ private Double minx;
+
+ @ApiModelProperty("鏈�灏廦")
+ private Double miny;
+
+ @ApiModelProperty("鏈�澶")
+ private Double maxx;
+
+ @ApiModelProperty("鏈�澶")
+ private Double maxy;
+
+ @ApiModelProperty("搴忓彿")
+ private Integer num;
+
+ @ApiModelProperty("闄嶉洦閲�(mm)")
+ private Double total;
+
+ @ApiModelProperty("鏃堕暱(min)")
+ private Integer duration;
+
+ @ApiModelProperty("浠跨湡鍚嶇О")
+ private String name;
+
+ @ApiModelProperty("寮�濮嬫椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("浠跨湡澶囨敞")
+ private String bak;
+
+ @ApiModelProperty("鐖禝D(澶т簬0涓洪槻姹�)")
+ private Integer pid;
+
+ @ApiModelProperty("闃叉睕寮�濮嬫椂闂�(绉�)")
+ private Integer floodStart;
+
+ @ApiModelProperty("闃叉睕缁撴潫鏃堕棿(绉�)")
+ private Integer floodEnd;
+
+ @ApiModelProperty("闃叉睕楂樺害(mm)")
+ private Double floodHeight;
+
+ @ApiModelProperty("闃叉睕绫诲瀷(娌欒锛岄槻姘存澘)")
+ private String floodType;
+
+ @ApiModelProperty("闃叉睕鏈�灏廥")
+ private Double floodMinx;
+
+ @ApiModelProperty("闃叉睕鏈�灏廦")
+ private Double floodMiny;
+
+ @ApiModelProperty("闃叉睕鏈�澶")
+ private Double floodMaxx;
+
+ @ApiModelProperty("闃叉睕鏈�澶")
+ private Double floodMaxy;
+
+ @ApiModelProperty("鑼冨洿鏂囦欢鍦板潃")
+ private String floodFile;
+
+ @ApiModelProperty("绔欑偣鏂囦欢shp鍦板潃")
+ private String stationFile;
+
+ @ApiModelProperty("绔欑偣闆ㄩ噺CSV鏂囦欢鍦板潃")
+ private String stationRainFile;
+
+}
diff --git a/src/main/java/com/se/simu/service/SimuFilesService.java b/src/main/java/com/se/simu/service/SimuFilesService.java
index 35f52f7..9fb8d56 100644
--- a/src/main/java/com/se/simu/service/SimuFilesService.java
+++ b/src/main/java/com/se/simu/service/SimuFilesService.java
@@ -12,6 +12,7 @@
import com.se.simu.domain.dto.GeDb;
import com.se.simu.domain.po.DataPo;
import com.se.simu.domain.po.SimuPo;
+import com.se.simu.domain.vo.CreateFilesSimuVo;
import com.se.simu.domain.vo.CreateSimuVo;
import com.se.simu.domain.vo.SimuVo;
import com.se.simu.helper.StringHelper;
@@ -97,7 +98,7 @@
}
- public boolean createByfiles(CreateSimuVo vo) {
+ public boolean createByfiles(CreateFilesSimuVo vo) {
Date now = new Date();
String date = StringHelper.YMDHMS2_FORMAT.format(now);
if (StringHelper.isEmpty(vo.getName())) {
--
Gitblit v1.9.3