From 495292b588949bcb2cb15eaa9657619aca7f5579 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 30 十月 2024 16:18:41 +0800
Subject: [PATCH] 修改降雨文件的jar
---
src/main/java/com/se/simu/service/ResultService.java | 24 +++---
libs/simu.jar | 0
src/main/java/com/se/simu/controller/TestController.java | 115 ++++++++++++++++++++++++++++
src/main/java/com/se/simu/controller/SimuController.java | 60 --------------
4 files changed, 129 insertions(+), 70 deletions(-)
diff --git a/libs/simu.jar b/libs/simu.jar
index dc785c9..adc6616 100644
--- a/libs/simu.jar
+++ b/libs/simu.jar
Binary files differ
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index 265cb39..274004c 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -9,7 +9,6 @@
import com.se.simu.domain.vo.CreateSimuVo;
import com.se.simu.domain.vo.R;
import com.se.simu.domain.vo.SimuVo;
-import com.se.simu.helper.StringHelper;
import com.se.simu.service.GedbService;
import com.se.simu.service.ResultService;
import com.se.simu.service.SimuService;
@@ -57,8 +56,8 @@
if (null == vo.getTotal() || vo.getTotal() < 1 || vo.getTotal() > 1000) {
return fail("闄嶉洦閲忎笉鑳戒负绌猴紝涓斿彇鍊煎湪1~1000涔嬮棿");
}
- if (null == vo.getDuration() || vo.getDuration() < 1 || vo.getDuration() > 120) {
- return fail("浠跨湡鏃堕暱涓嶈兘涓虹┖锛屼笖鍙栧�煎湪1~120涔嬮棿");
+ if (null == vo.getDuration() || vo.getDuration() < 1 || vo.getDuration() > 10080) {
+ return fail("浠跨湡鏃堕暱涓嶈兘涓虹┖锛屼笖鍙栧�煎湪1~10080涔嬮棿");
}
if (null == vo.getMinx() || null == vo.getMiny() || null == vo.getMaxx() || null == vo.getMaxy()) {
return fail("閫夋嫨鑼冨洿涓嶈兘涓虹┖", false);
@@ -144,61 +143,6 @@
}
return success(paged.getRecords(), paged.getTotal());
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "褰撳墠鏃堕棿 *")
- @GetMapping("/getTime")
- public Object getTime() {
- return System.currentTimeMillis();
- }
-
- @ApiOperation(value = "testCallExe *")
- @GetMapping("/testCallExe")
- public R<Object> testCallExe() {
- try {
- DataPo data = new DataPo();
- data.setInPath("20241010095328");
-
- String str = uwService.callExe(data);
-
- return success(str);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "testResuslt *")
- @GetMapping("/testResuslt")
- public R<Object> testResuslt() {
- try {
- DataPo data = new DataPo();
- data.setEpsg(4548);
- data.setInPath("20241010095328");
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
-
- resultService.process(data);
-
- return success("ok");
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "testSww2Tif *")
- @GetMapping("/testSww2Tif")
- public R<Object> testSww2Tif() {
- try {
- DataPo data = new DataPo();
- data.setEpsg(4548);
- data.setInPath("20241010095328");
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
-
- Object rs = uwService.copeDrainFiles(data);
-
- return success(rs);
} catch (Exception ex) {
return fail(ex, null);
}
diff --git a/src/main/java/com/se/simu/controller/TestController.java b/src/main/java/com/se/simu/controller/TestController.java
new file mode 100644
index 0000000..303c543
--- /dev/null
+++ b/src/main/java/com/se/simu/controller/TestController.java
@@ -0,0 +1,115 @@
+package com.se.simu.controller;
+
+import com.se.simu.domain.po.DataPo;
+import com.se.simu.domain.vo.R;
+import com.se.simu.helper.StringHelper;
+import com.se.simu.service.GedbService;
+import com.se.simu.service.ResultService;
+import com.se.simu.service.SimuService;
+import com.se.simu.service.UwService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * Test鎺у埗鍣�
+ *
+ * @author WWW
+ * @date 2024-10-30
+ */
+@Api(tags = "Test")
+@Slf4j
+@RestController
+@RequestMapping("/test")
+@SuppressWarnings("ALL")
+public class TestController extends BaseController {
+ @Resource
+ UwService uwService;
+
+ @Resource
+ GedbService gedbService;
+
+ @Resource
+ SimuService simuService;
+
+ @Resource
+ ResultService resultService;
+
+ @ApiOperation(value = "褰撳墠鏃堕棿 *")
+ @GetMapping("/getTime")
+ public Object getTime() {
+ return System.currentTimeMillis();
+ }
+
+ @ApiOperation(value = "testCallExe *")
+ @GetMapping("/testCallExe")
+ public R<Object> testCallExe() {
+ try {
+ DataPo data = new DataPo();
+ data.setInPath("20241010095328");
+
+ String str = uwService.callExe(data);
+
+ return success(str);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "testResuslt *")
+ @GetMapping("/testResuslt")
+ public R<Object> testResuslt() {
+ try {
+ DataPo data = new DataPo();
+ data.setEpsg(4548);
+ data.setInPath("20241010095328");
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
+
+ resultService.process(data);
+
+ return success("ok");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "testSww2Tif *")
+ @GetMapping("/testSww2Tif")
+ public R<Object> testSww2Tif() {
+ try {
+ DataPo data = new DataPo();
+ data.setEpsg(4548);
+ data.setInPath("20241010095328");
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
+
+ Object rs = uwService.copeDrainFiles(data);
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "testRainfall *")
+ @GetMapping("/testRainfall")
+ public R<Object> testRainfall() {
+ try {
+ DataPo data = new DataPo();
+ data.setEpsg(4548);
+ data.setInPath("20241010095328");
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
+
+ Object rs = uwService.copeDrainFiles(data);
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+}
diff --git a/src/main/java/com/se/simu/service/ResultService.java b/src/main/java/com/se/simu/service/ResultService.java
index e1da3df..f7796cb 100644
--- a/src/main/java/com/se/simu/service/ResultService.java
+++ b/src/main/java/com/se/simu/service/ResultService.java
@@ -532,30 +532,30 @@
}
/**
- * 澶勭悊闄嶆按鏇茬嚎鏂囦欢鏇茬嚎鍥�
+ * 澶勭悊闄嶆按鏇茬嚎鏂囦欢鏇茬嚎鍥�
*/
public void copeRainFallJson(ResultDto dto, LayerDto layer) throws IOException, ParseException {
String rainGageFilePath = config.getInPath() + File.separator + dto.getServiceName() + File.separator + "RainGage.dat";
String filePath = dto.getOutPath() + File.separator + "rainfall.json";
String line;
- Map<Long,Double> rainFallJsons = new LinkedHashMap<>();
+ Map<String, Double> rainFallJsons = new LinkedHashMap<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
BufferedReader br = new BufferedReader(new FileReader(rainGageFilePath));
- //澶勭悊绗竴琛屾暟鎹�
- if ((line = br.readLine()) != null) {
- while ((line = br.readLine()) != null) {
- // 澶勭悊姣忎竴琛屾暟鎹�
- String[] rainFall = line.split(" ");
+ // 澶勭悊绗竴琛屾暟鎹�
+ if ((line = br.readLine()) != null) {
+ while ((line = br.readLine()) != null) {
+ // 澶勭悊姣忎竴琛屾暟鎹�
+ String[] rainFall = line.split(" ");
- if (rainFall.length < 7) continue;
+ if (rainFall.length < 7) continue;
- String sdt = rainFall[1]+"-"+rainFall[2]+"-"+rainFall[3]+" "+rainFall[4]+":"+rainFall[5];
- BigDecimal num = new BigDecimal(rainFall[6]);
- rainFallJsons.put(sdf.parse(sdt).getTime()/1000,num.setScale(2, RoundingMode.HALF_UP).doubleValue());
- }
+ String sdt = rainFall[1] + "-" + rainFall[2] + "-" + rainFall[3] + " " + rainFall[4] + ":" + rainFall[5];
+ BigDecimal num = new BigDecimal(rainFall[6]);
+ rainFallJsons.put("" + sdf.parse(sdt).getTime(), num.setScale(2, RoundingMode.HALF_UP).doubleValue());
}
+ }
FileWriter fw = new FileWriter(filePath);
BufferedWriter bw = new BufferedWriter(fw);
--
Gitblit v1.9.3