From 9d26a531d6aaad86500e04cc750da15d292e9beb Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期五, 25 四月 2025 14:18:14 +0800
Subject: [PATCH] 修改controller序号
---
src/main/java/com/se/nsl/controller/SimuController.java | 2
src/main/java/com/se/nsl/controller/WaterController.java | 2
src/main/java/com/se/nsl/controller/TestController.java | 354 ++++++++++++++++++++++++++++---------------------
src/main/java/com/se/nsl/controller/RegionController.java | 2
src/main/java/com/se/nsl/controller/DbController.java | 2
src/main/java/com/se/nsl/controller/FilesUploadController.java | 2
src/main/java/com/se/nsl/controller/SwwFilesDealController.java | 2
src/main/java/com/se/nsl/controller/ProjectRelatedController.java | 2
src/main/java/com/se/nsl/controller/SemFilesSimuController.java | 2
src/main/java/com/se/nsl/controller/BizH5FileParserController.java | 2
src/main/java/com/se/nsl/controller/SimuPoController.java | 2
11 files changed, 212 insertions(+), 162 deletions(-)
diff --git a/src/main/java/com/se/nsl/controller/BizH5FileParserController.java b/src/main/java/com/se/nsl/controller/BizH5FileParserController.java
index a3d4fec..046a199 100644
--- a/src/main/java/com/se/nsl/controller/BizH5FileParserController.java
+++ b/src/main/java/com/se/nsl/controller/BizH5FileParserController.java
@@ -16,7 +16,7 @@
* @author xingjinshuang@smartearth.cn
* @date 2024/12/06
*/
-@Api(tags = "H5 鏂囦欢瑙ｆ瀽鍣ㄦ帶鍒跺櫒")
+@Api(tags = "05-H5鏂囦欢瑙ｆ瀽鍣ㄦ帶鍒跺櫒")
@Slf4j
@CrossOrigin(origins = "*", maxAge = 3600)
@RestController
diff --git a/src/main/java/com/se/nsl/controller/DbController.java b/src/main/java/com/se/nsl/controller/DbController.java
index 465f8d5..08b4046 100644
--- a/src/main/java/com/se/nsl/controller/DbController.java
+++ b/src/main/java/com/se/nsl/controller/DbController.java
@@ -16,7 +16,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-@Api(tags = "鏁版嵁绠＄悊")
+@Api(tags = "10-鏁版嵁绠＄悊")
@Slf4j
@RestController
@RequestMapping("/db")
diff --git a/src/main/java/com/se/nsl/controller/FilesUploadController.java b/src/main/java/com/se/nsl/controller/FilesUploadController.java
index 66551cf..082261b 100644
--- a/src/main/java/com/se/nsl/controller/FilesUploadController.java
+++ b/src/main/java/com/se/nsl/controller/FilesUploadController.java
@@ -27,7 +27,7 @@
import java.util.concurrent.ExecutionException;
import java.util.zip.ZipEntry;
-@Api(tags = "0-鏂囦欢鐩稿叧鎺ュ彛")
+@Api(tags = "11-鏂囦欢鐩稿叧鎺ュ彛")
@Slf4j
@CrossOrigin(origins = "*")
@RestController
diff --git a/src/main/java/com/se/nsl/controller/ProjectRelatedController.java b/src/main/java/com/se/nsl/controller/ProjectRelatedController.java
index d026de5..ed1ed9e 100644
--- a/src/main/java/com/se/nsl/controller/ProjectRelatedController.java
+++ b/src/main/java/com/se/nsl/controller/ProjectRelatedController.java
@@ -12,7 +12,7 @@
import javax.annotation.Resource;
-@Api(tags = "瀹炰綋搴撶浉鍏虫帴鍙�")
+@Api(tags = "09-瀹炰綋搴撶浉鍏虫帴鍙�")
@CrossOrigin(origins = "*")
@RequiredArgsConstructor
@RestController
diff --git a/src/main/java/com/se/nsl/controller/RegionController.java b/src/main/java/com/se/nsl/controller/RegionController.java
index 34fea98..dfa63b9 100644
--- a/src/main/java/com/se/nsl/controller/RegionController.java
+++ b/src/main/java/com/se/nsl/controller/RegionController.java
@@ -13,7 +13,7 @@
import javax.annotation.Resource;
import java.util.List;
-@Api(tags = "1锛嶆帹婕斿尯鍩�")
+@Api(tags = "02锛嶆帹婕斿尯鍩�")
@Slf4j
@RestController
@RequestMapping("/region")
diff --git a/src/main/java/com/se/nsl/controller/SemFilesSimuController.java b/src/main/java/com/se/nsl/controller/SemFilesSimuController.java
index c67fbde..a129261 100644
--- a/src/main/java/com/se/nsl/controller/SemFilesSimuController.java
+++ b/src/main/java/com/se/nsl/controller/SemFilesSimuController.java
@@ -16,7 +16,7 @@
* @author xingjinshuang@smartearth.cn
* @date 2024/12/30
*/
-@Api(tags = "SEM鐩稿叧鎺ュ彛")
+@Api(tags = "06-SEM鐩稿叧鎺ュ彛")
@CrossOrigin(origins = "*")
@RequiredArgsConstructor
@RestController
diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index 4a4a662..3d05b26 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -13,7 +13,7 @@
import javax.annotation.Resource;
import java.util.List;
-@Api(tags = "2锛嶆帹婕旀ā鎷�")
+@Api(tags = "03锛嶆帹婕旀ā鎷�")
@Slf4j
@RestController
@RequestMapping("/simu")
diff --git a/src/main/java/com/se/nsl/controller/SimuPoController.java b/src/main/java/com/se/nsl/controller/SimuPoController.java
index b009d88..3a59c6a 100644
--- a/src/main/java/com/se/nsl/controller/SimuPoController.java
+++ b/src/main/java/com/se/nsl/controller/SimuPoController.java
@@ -40,7 +40,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-@Api(tags = "浠跨湡绠＄悊")
+@Api(tags = "07-浠跨湡绠＄悊")
@Slf4j
@RestController
@RequestMapping("/simuPo")
diff --git a/src/main/java/com/se/nsl/controller/SwwFilesDealController.java b/src/main/java/com/se/nsl/controller/SwwFilesDealController.java
index 5e0d26b..cabb39b 100644
--- a/src/main/java/com/se/nsl/controller/SwwFilesDealController.java
+++ b/src/main/java/com/se/nsl/controller/SwwFilesDealController.java
@@ -19,7 +19,7 @@
* @author xingjinshuang@smartearth.cn
* @date 2025/02/20
*/
-@Api(tags = " Sww 鐩稿叧鎺ュ彛")
+@Api(tags = "04-Sww鐩稿叧鎺ュ彛")
@CrossOrigin(origins = "*")
@RequiredArgsConstructor
@RestController
diff --git a/src/main/java/com/se/nsl/controller/TestController.java b/src/main/java/com/se/nsl/controller/TestController.java
index d19efa9..3f4a6c4 100644
--- a/src/main/java/com/se/nsl/controller/TestController.java
+++ b/src/main/java/com/se/nsl/controller/TestController.java
@@ -1,5 +1,6 @@
package com.se.nsl.controller;
+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.vo.R;
@@ -8,11 +9,13 @@
import com.se.nsl.helper.StringHelper;
import com.se.nsl.mapper.RegionMapper;
import com.se.nsl.service.*;
+import io.netty.util.internal.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.axis.utils.StringUtils;
import org.gdal.ogr.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,7 +35,7 @@
import java.util.Date;
import java.util.List;
-@Api(tags = "Test")
+@Api(tags = "01-Test")
@Slf4j
@RestController
@RequestMapping("/test")
@@ -59,161 +62,16 @@
@Resource
RegionMapper regionMapper;
- @ApiOperation(value = "褰撳墠鏃堕棿 *")
- @GetMapping("/getTime")
- public Object getTime() {
- return (Object) System.currentTimeMillis();
- }
+ @Resource
+ PropertiesConfig config;
- @ApiOperation(value = "testCallExe *")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20241010095328")
- })
- @GetMapping("/testCallExe")
- public R<Object> testCallExe(String path) {
- try {
- DataPo data = new DataPo();
- data.setInPath(path);
-
- String str = uwService.callExe(data);
-
- return success(str);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "testResuslt *")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20241107092342"),
- @ApiImplicitParam(name = "time", value = "鏃堕棿", dataType = "String", paramType = "query", example = "2024-11-07 09:23:42")
- })
- @GetMapping("/testResuslt")
- public R<Object> testResuslt(String path, String time) {
- try {
- DataPo data = new DataPo();
- data.setEpsg(Integer.valueOf(4548));
- data.setInPath(path);
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse(time));
-
- 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(Integer.valueOf(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(Integer.valueOf(4548));
- data.setTotal(Double.valueOf(60.0));
- data.setDuration(Integer.valueOf(60));
- data.setInPath("20241010095328");
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-07-01 00:00:00"));
-
- uwService.createRainFile(data);
-
- return success("ok");
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "testToken *")
- @GetMapping("/testToken")
- public R<Object> testToken() {
- try {
- String token = gedbService.getToken();
-
- return success(token);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "testPolygonize *")
- @GetMapping("/testPolygonize")
- public R<Object> testPolygonize() {
- try {
- ShpHelper.test();
-
- return success("ok");
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "testH5 *")
- @GetMapping("/testH5")
- public R<Object> testH5() {
- try {
- DataPo data = new DataPo();
- data.setEpsg(Integer.valueOf(4548));
- data.setInPath("20241010095328");
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
-
- hdf5Service.test(data);
-
- return success("ok");
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "testNsl <")
- @GetMapping("/testNsl")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "inPath", value = "杈撳叆璺緞", dataType = "String", paramType = "query", example = "20250412"),
- @ApiImplicitParam(name = "startTime", value = "寮�濮嬫椂闂�", dataType = "Integer", paramType = "query", example = "2025-04-12 00:00:00"),
- @ApiImplicitParam(name = "epsg", value = "鍧愭爣绯籌D", dataType = "Integer", paramType = "query", example = "4548")
- })
- public R<Object> testNsl(String inPath, String startTime, Integer epsg) {
- try {
- DataPo data = new DataPo();
- data.setInPath(inPath);
- data.setStartTime(StringHelper.YMDHMS_FORMAT.parse(startTime));
- data.setEpsg(epsg);
-
- testService.test(data);
-
- return success("ok");
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @ApiOperation(value = "insertRegion <")
+ @ApiOperation(value = "01.insertRegion <")
@GetMapping("/insertRegion")
@ApiImplicitParams({
@ApiImplicitParam(name = "fileName", value = "鏂囦欢鍚�", dataType = "String", paramType = "query", example = "5.beijing.geoJson"),
@ApiImplicitParam(name = "type", value = "绫诲瀷", dataType = "Integer", paramType = "query", example = "1")
})
public R<Object> insertRegion(String fileName, Integer type) {
- return insertNsl(fileName, type);
- }
-
- private R<Object> insertNsl(String fileName, Integer type) {
// 瀛欒儭娌焔eometry.json锛�7.nsl_area.geojson锛�4.10000.geoJson锛�5.beijing.geoJson
String path = "D:\\terrait\\NslServer\\data\\" + fileName;
if (!new File(path).exists()) return fail(path + "锛屾枃浠朵笉瀛樺湪", null);
@@ -245,7 +103,7 @@
return success(list.size() > 0 ? regionMapper.inserts(list) : 0);
}
- @ApiOperation(value = "testDepthFiles <")
+ @ApiOperation(value = "02.testDepthFiles <")
@GetMapping("/testDepthFiles")
@ApiImplicitParams({
@ApiImplicitParam(name = "oldPath", value = "杈撳叆璺緞", dataType = "String", paramType = "query", example = "D:\\other\\simu\\uwsolver\\chicago"),
@@ -286,7 +144,7 @@
}
}
- @ApiOperation(value = "testTifFiles <")
+ @ApiOperation(value = "03.testTifFiles <")
@GetMapping("/testTifFiles")
@ApiImplicitParams({
@ApiImplicitParam(name = "oldPath", value = "杈撳叆璺緞", dataType = "String", paramType = "query", example = "D:\\other\\simu\\uwsolver\\chicago\\depth"),
@@ -314,7 +172,7 @@
}
}
- @ApiOperation(value = "testPngList <")
+ @ApiOperation(value = "04.testPngList <")
@GetMapping("/testPngList")
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "D:\\other\\simu\\out\\chicago\\waters"),
@@ -346,4 +204,196 @@
return fail(ex, null);
}
}
+
+ @ApiOperation(value = "5.testNsl <")
+ @GetMapping("/testNsl")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "inPath", value = "杈撳叆璺緞", dataType = "String", paramType = "query", example = "20250412"),
+ @ApiImplicitParam(name = "startTime", value = "寮�濮嬫椂闂�", dataType = "Integer", paramType = "query", example = "2025-04-12 00:00:00"),
+ @ApiImplicitParam(name = "epsg", value = "鍧愭爣绯籌D", dataType = "Integer", paramType = "query", example = "4548")
+ })
+ public R<Object> testNsl(String inPath, String startTime, Integer epsg) {
+ try {
+ DataPo data = new DataPo();
+ data.setInPath(inPath);
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse(startTime));
+ data.setEpsg(epsg);
+
+ testService.test(data);
+
+ return success("ok");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "09.testCreateNsl <")
+ @GetMapping("/testCreateNsl")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tifPath", value = "Tif璺緞", dataType = "String", paramType = "query", example = "D:\\other\\simu\\uwsolver\\chicago"),
+ @ApiImplicitParam(name = "inPath", value = "杈撳叆璺緞", dataType = "String", paramType = "query", example = "20250425"),
+ @ApiImplicitParam(name = "startTime", value = "寮�濮嬫椂闂�", dataType = "Integer", paramType = "query", example = "2025-04-25 00:00:00"),
+ @ApiImplicitParam(name = "epsg", value = "鍧愭爣绯籌D", dataType = "Integer", paramType = "query", example = "4548")
+ })
+ public R<Object> testCreateNsl(String tifPath, String inPath, String startTime, Integer epsg) {
+ try {
+ DataPo data = new DataPo();
+ data.setInPath(inPath);
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse(startTime));
+ data.setEpsg(epsg);
+
+ procTifs(tifPath, data.getStartTime());
+ testService.test(data);
+
+ return success("ok");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ private void procTifs(String tifPath, Date startTime) {
+ if (StringUtils.isEmpty(tifPath)) return;
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date(startTime.getYear() - 1900, startTime.getMonth() - 1, startTime.getDay(), 0, 0, 0));
+ SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+ String newPath = config.getInPath() + File.separator + "depth";
+
+ for (File file : new File(tifPath).listFiles()) {
+ if (!file.exists() || !file.isDirectory()) continue;
+
+ File tif = new File(tifPath + "\\" + file.getName() + File.separator + "depth.tif");
+ if (!tif.exists() || tif.isDirectory()) continue;
+
+ calendar.add(Calendar.SECOND, 1);
+ String newName = df.format(calendar.getTime());
+ String newFile = newPath + File.separator + newName + ".tif";
+
+ System.out.println(newFile);
+ tif.renameTo(new File(newFile));
+ file.delete();
+ }
+ }
+
+ @ApiOperation(value = "10.褰撳墠鏃堕棿 *")
+ @GetMapping("/getTime")
+ public Object getTime() {
+ return (Object) System.currentTimeMillis();
+ }
+
+ /*@ApiOperation(value = "12.testCallExe *")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20241010095328")
+ })
+ @GetMapping("/testCallExe")
+ public R<Object> testCallExe(String path) {
+ try {
+ DataPo data = new DataPo();
+ data.setInPath(path);
+
+ String str = uwService.callExe(data);
+
+ return success(str);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "13.testResuslt *")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20241107092342"),
+ @ApiImplicitParam(name = "time", value = "鏃堕棿", dataType = "String", paramType = "query", example = "2024-11-07 09:23:42")
+ })
+ @GetMapping("/testResuslt")
+ public R<Object> testResuslt(String path, String time) {
+ try {
+ DataPo data = new DataPo();
+ data.setEpsg(Integer.valueOf(4548));
+ data.setInPath(path);
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse(time));
+
+ resultService.process(data);
+
+ return success("ok");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "14.testSww2Tif *")
+ @GetMapping("/testSww2Tif")
+ public R<Object> testSww2Tif() {
+ try {
+ DataPo data = new DataPo();
+ data.setEpsg(Integer.valueOf(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 = "15.testRainfall *")
+ @GetMapping("/testRainfall")
+ public R<Object> testRainfall() {
+ try {
+ DataPo data = new DataPo();
+ data.setEpsg(Integer.valueOf(4548));
+ data.setTotal(Double.valueOf(60.0));
+ data.setDuration(Integer.valueOf(60));
+ data.setInPath("20241010095328");
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-07-01 00:00:00"));
+
+ uwService.createRainFile(data);
+
+ return success("ok");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "16.testToken *")
+ @GetMapping("/testToken")
+ public R<Object> testToken() {
+ try {
+ String token = gedbService.getToken();
+
+ return success(token);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "17.testPolygonize *")
+ @GetMapping("/testPolygonize")
+ public R<Object> testPolygonize() {
+ try {
+ ShpHelper.test();
+
+ return success("ok");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "18.testH5 *")
+ @GetMapping("/testH5")
+ public R<Object> testH5() {
+ try {
+ DataPo data = new DataPo();
+ data.setEpsg(Integer.valueOf(4548));
+ data.setInPath("20241010095328");
+ data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
+
+ hdf5Service.test(data);
+
+ return success("ok");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }*/
}
diff --git a/src/main/java/com/se/nsl/controller/WaterController.java b/src/main/java/com/se/nsl/controller/WaterController.java
index 6ae60a2..d782c37 100644
--- a/src/main/java/com/se/nsl/controller/WaterController.java
+++ b/src/main/java/com/se/nsl/controller/WaterController.java
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
-@Api(tags = "鍐呮稘绠＄悊")
+@Api(tags = "08-鍐呮稘绠＄悊")
@Slf4j
@RestController
@SuppressWarnings("ALL")
--
Gitblit v1.9.3