From befdcdd0e9c89bc9be3a69fc3033c3cf7afd2ee2 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 07 九月 2023 16:15:56 +0800
Subject: [PATCH] 修改图层获取接口、数据发布接口
---
src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java b/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java
index dbf398f..3079d70 100644
--- a/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java
+++ b/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java
@@ -46,10 +46,6 @@
create_service = 0;
layer = new Layer();
image_ovr = new ImageOvr();
- }
-
- public CreateLayerEntity(int pathCount, int imageCount) {
- this();
image_list = new ArrayList<>();
image_path_list = new ArrayList<>();
}
@@ -106,7 +102,7 @@
/**
* nodata璁剧疆锛屾暟缁勶紝鏁扮粍澶у皬鍜屾尝娈垫暟绛夊悓
*/
- private String[] nodata;
+ private List<Integer> nodata;
/**
* 鎶曞奖鎴栬�呭潗鏍囷細EPSG:4326
@@ -119,7 +115,7 @@
private String trans_color;
/**
- * 杈撳嚭娉㈡锛岄粯璁わ細"1,2,3"
+ * 杈撳嚭娉㈡锛岄粯璁わ細"1,2,3"锛屾垨涓�"3,2,1"
*/
private String tile_rgb;
@@ -151,7 +147,7 @@
/**
* 鍙戝竷淇℃伅锛岄粯璁や负"{}"
*/
- private Object pub_config;
+ private String pub_config;
/**
* 鍥惧眰鍜屽奖鍍忕浉鍏崇殑閰嶇疆锛岄粯璁�"{}"锛岄厤缃唴瀹瑰寘鎷絾涓嶉檺浜庯細澶勭悊杩囩▼銆佽竟鐣屾帶鍒舵柟娉�
@@ -161,7 +157,7 @@
/**
* 鎷変几鍥犲瓙锛岄厤鍚� enhance_factor浣跨敤
*/
- private String enhance_factor;
+ private Double enhance_factor;
/**
* 杈圭晫璁＄畻鏂瑰紡 0澶栧寘锛�1锛� 鍐呮帴锛� 2 绮惧噯
@@ -169,12 +165,13 @@
private Integer boundary_cal_mode;
public Layer() {
+ trans_color = "-1,-1,-1";
end_scale = 1.0;
start_scale = 1000000000.0;
stats_type = 1;
enhance_type = 0;
+ enhance_factor = 0.02;
boundary_cal_mode = 0;
- pub_config = new Object();
}
public String getName() {
@@ -185,11 +182,11 @@
this.name = name;
}
- public String[] getNodata() {
+ public List<Integer> getNodata() {
return nodata;
}
- public void setNodata(String[] nodata) {
+ public void setNodata(List<Integer> nodata) {
this.nodata = nodata;
}
@@ -257,11 +254,11 @@
this.end_scale = end_scale;
}
- public Object getPub_config() {
+ public String getPub_config() {
return pub_config;
}
- public void setPub_config(Object pub_config) {
+ public void setPub_config(String pub_config) {
this.pub_config = pub_config;
}
@@ -273,11 +270,11 @@
this.config = config;
}
- public String getEnhance_factor() {
+ public Double getEnhance_factor() {
return enhance_factor;
}
- public void setEnhance_factor(String enhance_factor) {
+ public void setEnhance_factor(Double enhance_factor) {
this.enhance_factor = enhance_factor;
}
@@ -317,7 +314,7 @@
/**
* 杩囨护鍣ㄧ粍鍒楄〃锛歔"a.tif|b.tif"]
*/
- private String[] filter;
+ private List<String> filter;
/**
* 灞炴�ц繃婊�
@@ -327,7 +324,6 @@
public ImagePathList() {
datasource = "Local";
recursion = 0;
- image_time = null;
}
public String getDatasource() {
@@ -362,11 +358,11 @@
this.image_time = image_time;
}
- public String[] getFilter() {
+ public List<String> getFilter() {
return filter;
}
- public void setFilter(String[] filter) {
+ public void setFilter(List<String> filter) {
this.filter = filter;
}
@@ -401,9 +397,10 @@
/**
* 灞炴�ц繃婊�
*/
- private Object attr_filter;
+ private String attr_filter;
public ImageList() {
+ datasource = "Local";
}
public String getDatasource() {
@@ -430,11 +427,11 @@
this.image_time = image_time;
}
- public Object getAttr_filter() {
+ public String getAttr_filter() {
return attr_filter;
}
- public void setAttr_filter(Object attr_filter) {
+ public void setAttr_filter(String attr_filter) {
this.attr_filter = attr_filter;
}
}
@@ -495,7 +492,7 @@
public class Config {
private Process process;
- public Config(Integer type, List<GradientColorTableEntity> levels) {
+ public Config(Integer type, List<?> levels) {
process = new Process(type, levels);
}
@@ -518,18 +515,30 @@
private Map<String, Object> config;
+ public Process() {
+ uuid = StringHelper.getGuid();
+ name = "color_table";
+
+ config = new HashMap<>();
+ config.put("default", new Default());
+ }
+
/**
* 澶勭悊杩囩▼
*
* @param type 0-榛樿鑹叉澘锛�1-娓愬彉鑹叉澘
* @param levels 灞傜骇
*/
- public Process(Integer type, List<GradientColorTableEntity> levels) {
- uuid = StringHelper.getGuid();
- name = "color_table";
+ public Process(Integer type, List<?> levels) {
+ this();
+ config.put("type", type);
+ config.put("levels", levels);
+ }
- config = new HashMap<>();
- config.put("default", new Default());
+ /**
+ * 璁剧疆棰滆壊琛�
+ */
+ public void SetColorTable(Integer type, List<?> levels) {
config.put("type", type);
config.put("levels", levels);
}
--
Gitblit v1.9.3