From 14e8093d5c4ef75bd6cd3b5d929d71aa9fa417f5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 18 九月 2024 14:52:25 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/domain/vo/Water.java | 2 +-
src/main/java/com/se/simu/controller/BaseController.java | 2 +-
src/main/java/com/se/simu/domain/vo/Duration.java | 2 +-
src/main/java/com/se/simu/domain/vo/Extension.java | 2 +-
src/main/java/com/se/simu/service/GedbService.java | 26 +++++++++++++-------------
src/main/java/com/se/simu/domain/vo/Layer.java | 7 ++++++-
src/main/java/com/se/simu/domain/vo/Terrain.java | 2 +-
src/main/java/com/se/simu/service/WaterService.java | 2 +-
src/main/java/com/se/simu/controller/TaskController.java | 8 ++++----
src/main/java/com/se/simu/domain/vo/R.java | 2 +-
src/main/resources/application.yml | 2 +-
11 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/BaseController.java b/src/main/java/com/se/simu/controller/BaseController.java
index fbcb2fd..07b1db8 100644
--- a/src/main/java/com/se/simu/controller/BaseController.java
+++ b/src/main/java/com/se/simu/controller/BaseController.java
@@ -1,6 +1,6 @@
package com.se.simu.controller;
-import com.se.simu.domain.R;
+import com.se.simu.domain.vo.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
diff --git a/src/main/java/com/se/simu/controller/TaskController.java b/src/main/java/com/se/simu/controller/TaskController.java
index 6813989..d14a7c7 100644
--- a/src/main/java/com/se/simu/controller/TaskController.java
+++ b/src/main/java/com/se/simu/controller/TaskController.java
@@ -1,7 +1,7 @@
package com.se.simu.controller;
-import com.se.simu.domain.R;
-import com.se.simu.service.SedbService;
+import com.se.simu.domain.vo.R;
+import com.se.simu.service.GedbService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@
@SuppressWarnings("ALL")
public class TaskController extends BaseController {
@Resource
- SedbService sedbService;
+ GedbService gedbService;
@ApiOperation(value = "鍒涘缓浠诲姟")
@PostMapping(value = "/createTask", produces = "application/json; charset=UTF-8")
@@ -31,7 +31,7 @@
// 469538.6536261877,4416744.922022615,469853.14714664617,4417049.378602433
String bbox = "116.64388473935195,39.884315914604464,116.64754729082588,39.887069143903496";
String taskName = "20240913";
- Object rs = sedbService.test(bbox, taskName);
+ Object rs = gedbService.test(bbox, taskName);
return success(rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/se/simu/domain/Duration.java b/src/main/java/com/se/simu/domain/vo/Duration.java
similarity index 94%
rename from src/main/java/com/se/simu/domain/Duration.java
rename to src/main/java/com/se/simu/domain/vo/Duration.java
index 8b3685d..d380cdc 100644
--- a/src/main/java/com/se/simu/domain/Duration.java
+++ b/src/main/java/com/se/simu/domain/vo/Duration.java
@@ -1,4 +1,4 @@
-package com.se.simu.domain;
+package com.se.simu.domain.vo;
/**
* 鎸佺画鏃堕棿瀹炰綋绫�
diff --git a/src/main/java/com/se/simu/domain/Extension.java b/src/main/java/com/se/simu/domain/vo/Extension.java
similarity index 97%
rename from src/main/java/com/se/simu/domain/Extension.java
rename to src/main/java/com/se/simu/domain/vo/Extension.java
index 703e108..c34225a 100644
--- a/src/main/java/com/se/simu/domain/Extension.java
+++ b/src/main/java/com/se/simu/domain/vo/Extension.java
@@ -1,4 +1,4 @@
-package com.se.simu.domain;
+package com.se.simu.domain.vo;
/**
* 鎸佺画鏃堕棿瀹炰綋绫�
diff --git a/src/main/java/com/se/simu/domain/Layer.java b/src/main/java/com/se/simu/domain/vo/Layer.java
similarity index 87%
rename from src/main/java/com/se/simu/domain/Layer.java
rename to src/main/java/com/se/simu/domain/vo/Layer.java
index b6542bf..e7be027 100644
--- a/src/main/java/com/se/simu/domain/Layer.java
+++ b/src/main/java/com/se/simu/domain/vo/Layer.java
@@ -1,4 +1,9 @@
-package com.se.simu.domain;
+package com.se.simu.domain.vo;
+
+import com.se.simu.domain.vo.Duration;
+import com.se.simu.domain.vo.Extension;
+import com.se.simu.domain.vo.Terrain;
+import com.se.simu.domain.vo.Water;
/**
* 鍥惧眰瀹炰綋绫�
diff --git a/src/main/java/com/se/simu/domain/R.java b/src/main/java/com/se/simu/domain/vo/R.java
similarity index 98%
rename from src/main/java/com/se/simu/domain/R.java
rename to src/main/java/com/se/simu/domain/vo/R.java
index 46ac9f5..1897406 100644
--- a/src/main/java/com/se/simu/domain/R.java
+++ b/src/main/java/com/se/simu/domain/vo/R.java
@@ -1,4 +1,4 @@
-package com.se.simu.domain;
+package com.se.simu.domain.vo;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.http.HttpStatus;
diff --git a/src/main/java/com/se/simu/domain/Terrain.java b/src/main/java/com/se/simu/domain/vo/Terrain.java
similarity index 93%
rename from src/main/java/com/se/simu/domain/Terrain.java
rename to src/main/java/com/se/simu/domain/vo/Terrain.java
index 1c534de..1df5e36 100644
--- a/src/main/java/com/se/simu/domain/Terrain.java
+++ b/src/main/java/com/se/simu/domain/vo/Terrain.java
@@ -1,4 +1,4 @@
-package com.se.simu.domain;
+package com.se.simu.domain.vo;
import java.util.List;
diff --git a/src/main/java/com/se/simu/domain/Water.java b/src/main/java/com/se/simu/domain/vo/Water.java
similarity index 92%
rename from src/main/java/com/se/simu/domain/Water.java
rename to src/main/java/com/se/simu/domain/vo/Water.java
index 1d9bf0b..08c6500 100644
--- a/src/main/java/com/se/simu/domain/Water.java
+++ b/src/main/java/com/se/simu/domain/vo/Water.java
@@ -1,4 +1,4 @@
-package com.se.simu.domain;
+package com.se.simu.domain.vo;
import java.util.List;
diff --git a/src/main/java/com/se/simu/service/SedbService.java b/src/main/java/com/se/simu/service/GedbService.java
similarity index 96%
rename from src/main/java/com/se/simu/service/SedbService.java
rename to src/main/java/com/se/simu/service/GedbService.java
index 648523d..ca95b92 100644
--- a/src/main/java/com/se/simu/service/SedbService.java
+++ b/src/main/java/com/se/simu/service/GedbService.java
@@ -31,7 +31,7 @@
import java.util.stream.Collectors;
/**
- * SDDB鏈嶅姟绫�
+ * GEDB鏈嶅姟绫�
*
* @author WWW
* @date 2024-09-12
@@ -39,41 +39,41 @@
@Slf4j
@Service
@SuppressWarnings("ALL")
-public class SedbService {
+public class GedbService {
@Value("${sys.path.in}")
String inPath;
- @Value("${sedb.host}")
+ @Value("${gedb.host}")
String host;
- @Value("${sedb.user}")
+ @Value("${gedb.user}")
String user;
- @Value("${sedb.pwd}")
+ @Value("${gedb.pwd}")
String pwd;
- @Value("${sedb.dbName}")
+ @Value("${gedb.dbName}")
String dbName;
- @Value("${sedb.pageSize}")
+ @Value("${gedb.pageSize}")
Integer pageSize;
- @Value("#{'${sedb.layerNames}'}")
+ @Value("#{'${gedb.layerNames}'}")
List<String> layerNames;
- @Value("#{'${sedb.shpNames}'}")
+ @Value("#{'${gedb.shpNames}'}")
List<String> shpNames;
- @Value("#{'${sedb.sysFields}'}")
+ @Value("#{'${gedb.sysFields}'}")
List<String> sysFields;
- @Value("${sedb.demFile}")
+ @Value("${gedb.demFile}")
String demFile;
- @Value("${sedb.demType}")
+ @Value("${gedb.demType}")
String demType;
- @Value("${sedb.demName}")
+ @Value("${gedb.demName}")
String demName;
String password;
diff --git a/src/main/java/com/se/simu/service/WaterService.java b/src/main/java/com/se/simu/service/WaterService.java
index 474706e..4cb4571 100644
--- a/src/main/java/com/se/simu/service/WaterService.java
+++ b/src/main/java/com/se/simu/service/WaterService.java
@@ -1,6 +1,6 @@
package com.se.simu.service;
-import com.se.simu.domain.*;
+import com.se.simu.domain.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 42d5fab..932fb79 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,7 +42,7 @@
in: D:\simu\in
out: D:\simu\out
-sedb:
+gedb:
host: http://106.120.22.26:8013/
user: WUWEIWEI
pwd: WUWEIWEI
--
Gitblit v1.9.3