From 39217027e80fdb178243986c03d136419039ee86 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 05 九月 2023 20:58:50 +0800
Subject: [PATCH] 修改发布实体类的设置
---
src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java | 13 ++++++-------
src/main/java/com/moon/server/service/data/ShuJianService.java | 40 ++++++++++++++++++++++++++++++----------
2 files changed, 36 insertions(+), 17 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 2e9292e..7c7493b 100644
--- a/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java
+++ b/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java
@@ -147,7 +147,7 @@
/**
* 鍙戝竷淇℃伅锛岄粯璁や负"{}"
*/
- private Object pub_config;
+ private String pub_config;
/**
* 鍥惧眰鍜屽奖鍍忕浉鍏崇殑閰嶇疆锛岄粯璁�"{}"锛岄厤缃唴瀹瑰寘鎷絾涓嶉檺浜庯細澶勭悊杩囩▼銆佽竟鐣屾帶鍒舵柟娉�
@@ -170,7 +170,6 @@
stats_type = 1;
enhance_type = 0;
boundary_cal_mode = 0;
- pub_config = new Object();
}
public String getName() {
@@ -253,11 +252,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;
}
@@ -396,7 +395,7 @@
/**
* 灞炴�ц繃婊�
*/
- private Object attr_filter;
+ private String attr_filter;
public ImageList() {
datasource = "Local";
@@ -426,11 +425,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;
}
}
diff --git a/src/main/java/com/moon/server/service/data/ShuJianService.java b/src/main/java/com/moon/server/service/data/ShuJianService.java
index 849e091..c2459f2 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -80,7 +80,8 @@
*/
public Integer insertSjService(PubEntity pub) {
CreateLayerEntity layerEntity = createLayerEntity(pub);
- Integer layerId = postLayerEntity(layerEntity);
+ // Integer layerId = postLayerEntity(layerEntity)
+ Integer layerId = 10002101;
if (null == layerId) {
return 0;
}
@@ -229,20 +230,25 @@
*/
public PublishEntity createPublishEntity(PubEntity pub, Integer layerId, Integer serviceId) {
PublishEntity entity = new PublishEntity();
- entity.setType(pub.getType());
+ entity.setLayerid(layerId);
+ entity.setServiceid(serviceId);
+ entity.setEventid(pub.getUuid());
entity.setName(pub.getName());
+ entity.setUrl(String.format(TYPES.get(0).equals(pub.getType()) ? DOM_FORMAT : DEM_FORMAT, sjUrl, serviceId, StaticData.I0));
+ entity.setPath(null);
+ entity.setType(pub.getType());
+ entity.setStatus(3);
+ entity.setDirid(pub.getDircode());
+ entity.setDepid(pub.getDepcode());
+ entity.setEnhanceType(pub.getEnhanceType());
entity.setMin(pub.getMin());
entity.setMax(pub.getMax());
entity.setEpsg(pub.getEpsg());
entity.setCreateUser(pub.getUserId());
- entity.setDirid(pub.getDircode());
- entity.setDepid(pub.getDepcode());
- entity.setStatus(3);
- entity.setLayerid(layerId);
- entity.setServiceid(serviceId);
- entity.setEventid(pub.getUuid());
- entity.setJson(getColorTableJson(pub));
- entity.setUrl(String.format(TYPES.get(0).equals(pub.getType()) ? DOM_FORMAT : DEM_FORMAT, sjUrl, serviceId, StaticData.I0));
+ entity.setCtType(getColorTableType(pub));
+ entity.setCtJson(getColorTableJson(pub));
+ entity.setCreateUser(pub.getUserId());
+ entity.setGeom("null");
return entity;
}
@@ -273,6 +279,20 @@
}
/**
+ * 鑾峰彇棰滆壊琛ㄧ被鍨�
+ */
+ private String getColorTableType(PubEntity pub) {
+ if (null == pub.getColorTable() && null == pub.getGradientColorTable()) {
+ return null;
+ }
+ if (null != pub.getGradientColorTable()) {
+ return "娓愬彉棰滆壊琛�";
+ }
+
+ return "鏅�氶鑹茶〃";
+ }
+
+ /**
* 鑾峰彇棰滆壊琛ㄧ殑JSON瀛楃涓�
*/
public String getColorTableJson(PubEntity pub) {
--
Gitblit v1.9.3