From 3a983cdaefa6e8092d535eab79c3097c600ad804 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 18 七月 2024 10:23:41 +0800
Subject: [PATCH] 11
---
/dev/null | 251 ---------------------------
src/main/java/com/se/simu/domain/Water.java | 28 +++
src/main/java/com/se/simu/domain/Duration.java | 37 ++++
src/main/java/com/se/simu/controller/WaterController.java | 4
src/main/java/com/se/simu/domain/Layer.java | 70 +++++++
src/main/java/com/se/simu/domain/Terrain.java | 31 +++
src/main/java/com/se/simu/service/WaterService.java | 24 +
src/main/java/com/se/simu/domain/Extension.java | 93 ++++++++++
8 files changed, 277 insertions(+), 261 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index bbe6232..21959c2 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -1,6 +1,6 @@
package com.se.simu.controller;
-import com.se.simu.domain.LayerVo;
+import com.se.simu.domain.Layer;
import com.se.simu.helper.WebHelper;
import com.se.simu.service.WaterService;
import lombok.extern.slf4j.Slf4j;
@@ -51,7 +51,7 @@
return;
}
- LayerVo layer = waterService.getLayer(serviceName);
+ Layer layer = waterService.getLayer(serviceName);
WebHelper.writeJson2Page(res, HttpStatus.OK, layer);
} catch (Exception ex) {
diff --git a/src/main/java/com/se/simu/domain/Duration.java b/src/main/java/com/se/simu/domain/Duration.java
new file mode 100644
index 0000000..8b3685d
--- /dev/null
+++ b/src/main/java/com/se/simu/domain/Duration.java
@@ -0,0 +1,37 @@
+package com.se.simu.domain;
+
+/**
+ * 鎸佺画鏃堕棿瀹炰綋绫�
+ *
+ * @author WWW
+ * @date 2024-07-18
+ */
+public class Duration {
+ long start;
+
+ long end;
+
+ public Duration() {
+ }
+
+ public Duration(long start, long end) {
+ this.start = start;
+ this.end = end;
+ }
+
+ public long getStart() {
+ return start;
+ }
+
+ public void setStart(long start) {
+ this.start = start;
+ }
+
+ public long getEnd() {
+ return end;
+ }
+
+ public void setEnd(long end) {
+ this.end = end;
+ }
+}
diff --git a/src/main/java/com/se/simu/domain/Extension.java b/src/main/java/com/se/simu/domain/Extension.java
new file mode 100644
index 0000000..703e108
--- /dev/null
+++ b/src/main/java/com/se/simu/domain/Extension.java
@@ -0,0 +1,93 @@
+package com.se.simu.domain;
+
+/**
+ * 鎸佺画鏃堕棿瀹炰綋绫�
+ *
+ * @author WWW
+ * @date 2024-07-18
+ */
+public class Extension {
+ double minx;
+
+ double miny;
+
+ double maxx;
+
+ double maxy;
+
+ double minHeight;
+
+ double maxHeight;
+
+ public Extension() {
+ }
+
+ public Extension(double minx, double miny, double maxx, double maxy) {
+ this.minx = minx;
+ this.miny = miny;
+ this.maxx = maxx;
+ this.maxy = maxy;
+ }
+
+ public Extension(double minHeight, double maxHeight) {
+ this.minHeight = minHeight;
+ this.maxHeight = maxHeight;
+ }
+
+ public Extension(double minx, double miny, double maxx, double maxy, double minHeight, double maxHeight) {
+ this.minx = minx;
+ this.miny = miny;
+ this.maxx = maxx;
+ this.maxy = maxy;
+ this.minHeight = minHeight;
+ this.maxHeight = maxHeight;
+ }
+
+ public double getMinx() {
+ return minx;
+ }
+
+ public void setMinx(double minx) {
+ this.minx = minx;
+ }
+
+ public double getMiny() {
+ return miny;
+ }
+
+ public void setMiny(double miny) {
+ this.miny = miny;
+ }
+
+ public double getMaxx() {
+ return maxx;
+ }
+
+ public void setMaxx(double maxx) {
+ this.maxx = maxx;
+ }
+
+ public double getMaxy() {
+ return maxy;
+ }
+
+ public void setMaxy(double maxy) {
+ this.maxy = maxy;
+ }
+
+ public double getMinHeight() {
+ return minHeight;
+ }
+
+ public void setMinHeight(double minHeight) {
+ this.minHeight = minHeight;
+ }
+
+ public double getMaxHeight() {
+ return maxHeight;
+ }
+
+ public void setMaxHeight(double maxHeight) {
+ this.maxHeight = maxHeight;
+ }
+}
diff --git a/src/main/java/com/se/simu/domain/Layer.java b/src/main/java/com/se/simu/domain/Layer.java
new file mode 100644
index 0000000..b6542bf
--- /dev/null
+++ b/src/main/java/com/se/simu/domain/Layer.java
@@ -0,0 +1,70 @@
+package com.se.simu.domain;
+
+/**
+ * 鍥惧眰瀹炰綋绫�
+ *
+ * @author WWW
+ * @date 2024-07-16
+ */
+public class Layer {
+ String version;
+
+ Duration duration;
+
+ Extension extension;
+
+ Terrain terrain;
+
+ Water waters;
+
+ public Layer() {
+ }
+
+ public Layer(String version, Duration duration, Extension extension, Terrain terrain, Water waters) {
+ this.version = version;
+ this.duration = duration;
+ this.extension = extension;
+ this.terrain = terrain;
+ this.waters = waters;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public Duration getDuration() {
+ return duration;
+ }
+
+ public void setDuration(Duration duration) {
+ this.duration = duration;
+ }
+
+ public Extension getExtension() {
+ return extension;
+ }
+
+ public void setExtension(Extension extension) {
+ this.extension = extension;
+ }
+
+ public Terrain getTerrain() {
+ return terrain;
+ }
+
+ public void setTerrain(Terrain terrain) {
+ this.terrain = terrain;
+ }
+
+ public Water getWaters() {
+ return waters;
+ }
+
+ public void setWaters(Water waters) {
+ this.waters = waters;
+ }
+}
diff --git a/src/main/java/com/se/simu/domain/LayerVo.java b/src/main/java/com/se/simu/domain/LayerVo.java
deleted file mode 100644
index 3f67707..0000000
--- a/src/main/java/com/se/simu/domain/LayerVo.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package com.se.simu.domain;
-
-import java.util.List;
-
-/**
- * 鍥惧眰瑙嗗浘绫�
- *
- * @author WWW
- * @date 2024-07-16
- */
-public class LayerVo {
- String ver;
-
- Duration duration;
-
- Extension extension;
-
- Terrain terrain;
-
- Water water;
-
- public static class Duration {
- long start;
-
- long end;
-
- public Duration() {
- }
-
- public Duration(long start, long end) {
- this.start = start;
- this.end = end;
- }
-
- public long getStart() {
- return start;
- }
-
- public void setStart(long start) {
- this.start = start;
- }
-
- public long getEnd() {
- return end;
- }
-
- public void setEnd(long end) {
- this.end = end;
- }
- }
-
- public static class Extension {
- double minx;
-
- double miny;
-
- double maxx;
-
- double maxy;
-
- double minHeight;
-
- double maxHeight;
-
- public Extension() {
- }
-
- public Extension(double minx, double miny, double maxx, double maxy) {
- this.minx = minx;
- this.miny = miny;
- this.maxx = maxx;
- this.maxy = maxy;
- }
-
- public Extension(double minHeight, double maxHeight) {
- this.minHeight = minHeight;
- this.maxHeight = maxHeight;
- }
-
- public Extension(double minx, double miny, double maxx, double maxy, double minHeight, double maxHeight) {
- this.minx = minx;
- this.miny = miny;
- this.maxx = maxx;
- this.maxy = maxy;
- this.minHeight = minHeight;
- this.maxHeight = maxHeight;
- }
-
- public double getMinx() {
- return minx;
- }
-
- public void setMinx(double minx) {
- this.minx = minx;
- }
-
- public double getMiny() {
- return miny;
- }
-
- public void setMiny(double miny) {
- this.miny = miny;
- }
-
- public double getMaxx() {
- return maxx;
- }
-
- public void setMaxx(double maxx) {
- this.maxx = maxx;
- }
-
- public double getMaxy() {
- return maxy;
- }
-
- public void setMaxy(double maxy) {
- this.maxy = maxy;
- }
-
- public double getMinHeight() {
- return minHeight;
- }
-
- public void setMinHeight(double minHeight) {
- this.minHeight = minHeight;
- }
-
- public double getMaxHeight() {
- return maxHeight;
- }
-
- public void setMaxHeight(double maxHeight) {
- this.maxHeight = maxHeight;
- }
- }
-
- public static class Terrain {
- int maxWidth;
-
- int maxHeight;
-
- public Terrain() {
- }
-
- public Terrain(int maxWidth, int maxHeight) {
- this.maxWidth = maxWidth;
- this.maxHeight = maxHeight;
- }
-
- public int getMaxHeight() {
- return maxHeight;
- }
-
- public void setMaxHeight(int maxHeight) {
- this.maxHeight = maxHeight;
- }
-
- public int getMaxWidth() {
- return maxWidth;
- }
-
- public void setMaxWidth(int maxWidth) {
- this.maxWidth = maxWidth;
- }
- }
-
- public static class Water {
- int maxWidth;
-
- int maxHeight;
-
- List<Long> data;
-
- public Water() {
- }
-
- public Water(int maxWidth, int maxHeight, List<Long> data) {
- this.maxWidth = maxWidth;
- this.maxHeight = maxHeight;
- this.data = data;
- }
-
- public int getMaxHeight() {
- return maxHeight;
- }
-
- public void setMaxHeight(int maxHeight) {
- this.maxHeight = maxHeight;
- }
-
- public int getMaxWidth() {
- return maxWidth;
- }
-
- public void setMaxWidth(int maxWidth) {
- this.maxWidth = maxWidth;
- }
-
- public List<Long> getData() {
- return data;
- }
-
- public void setData(List<Long> data) {
- this.data = data;
- }
- }
-
- public LayerVo() {
- }
-
- public String getVer() {
- return ver;
- }
-
- public void setVer(String ver) {
- this.ver = ver;
- }
-
- public Duration getDuration() {
- return duration;
- }
-
- public void setDuration(Duration duration) {
- this.duration = duration;
- }
-
- public Extension getExtension() {
- return extension;
- }
-
- public void setExtension(Extension extension) {
- this.extension = extension;
- }
-
- public Terrain getTerrain() {
- return terrain;
- }
-
- public void setTerrain(Terrain terrain) {
- this.terrain = terrain;
- }
-
- public Water getWater() {
- return water;
- }
-
- public void setWater(Water water) {
- this.water = water;
- }
-}
diff --git a/src/main/java/com/se/simu/domain/Terrain.java b/src/main/java/com/se/simu/domain/Terrain.java
new file mode 100644
index 0000000..1c534de
--- /dev/null
+++ b/src/main/java/com/se/simu/domain/Terrain.java
@@ -0,0 +1,31 @@
+package com.se.simu.domain;
+
+import java.util.List;
+
+/**
+ * 鍦板舰瀹炰綋绫�
+ *
+ * @author WWW
+ * @date 2024-07-18
+ */
+public class Terrain {
+ /**
+ * 灏哄锛�64*64 ... 2048*2048
+ */
+ List<Integer[]> size;
+
+ public Terrain() {
+ }
+
+ public Terrain(List<Integer[]> size) {
+ this.size = size;
+ }
+
+ public List<Integer[]> getSize() {
+ return size;
+ }
+
+ public void setSize(List<Integer[]> size) {
+ this.size = size;
+ }
+}
diff --git a/src/main/java/com/se/simu/domain/Water.java b/src/main/java/com/se/simu/domain/Water.java
new file mode 100644
index 0000000..1d9bf0b
--- /dev/null
+++ b/src/main/java/com/se/simu/domain/Water.java
@@ -0,0 +1,28 @@
+package com.se.simu.domain;
+
+import java.util.List;
+
+/**
+ * 姘撮潰瀹炰綋绫�
+ *
+ * @author WWW
+ * @date 2024-07-18
+ */
+public class Water {
+ List<Long> data;
+
+ public Water() {
+ }
+
+ public Water(List<Long> data) {
+ this.data = data;
+ }
+
+ public List<Long> getData() {
+ return data;
+ }
+
+ public void setData(List<Long> data) {
+ this.data = data;
+ }
+}
diff --git a/src/main/java/com/se/simu/service/WaterService.java b/src/main/java/com/se/simu/service/WaterService.java
index af77c40..9e44a25 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.LayerVo;
+import com.se.simu.domain.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -24,15 +24,23 @@
@Value("${sys.path.data}")
String dataPath;
- public LayerVo getLayer(String serviceName) {
- LayerVo layer = new LayerVo();
- layer.setVer(ver);
- layer.setDuration(new LayerVo.Duration(1719812810225L, 1719812810225L));
- layer.setExtension(new LayerVo.Extension(2.11062743358, 0.53812160220, 2.11070827834, 0.53819799453, 1.151, 38.83));
- layer.setTerrain(new LayerVo.Terrain(10000, 10000));
+ public Layer getLayer(String serviceName) {
+ Layer layer = new Layer();
+ layer.setVersion(ver);
+ layer.setDuration(new Duration(1719812810225L, 1719812810225L));
+ layer.setExtension(new Extension(2.11062743358, 0.53812160220, 2.11070827834, 0.53819799453, 1.151, 38.83));
+
+ List<Integer[]> sizes = new ArrayList<>();
+ sizes.add(new Integer[]{64, 64});
+ sizes.add(new Integer[]{128, 128});
+ sizes.add(new Integer[]{256, 256});
+ sizes.add(new Integer[]{512, 512});
+ sizes.add(new Integer[]{1024, 1024});
+ sizes.add(new Integer[]{2048, 2048});
+ layer.setTerrain(new Terrain(sizes));
List<Long> data = new ArrayList<>(Arrays.asList(1719812812225L, 1719812812225L, 1719812812225L, 1719812812225L, 1719812812225L, 1719812812225L));
- layer.setWater(new LayerVo.Water(10000, 10000, data));
+ layer.setWaters(new Water(data));
return layer;
}
--
Gitblit v1.9.3