From 1496b8be8ab2dbc621fef048db7fd84abc8dafda Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 03 九月 2023 09:53:50 +0800
Subject: [PATCH] 修改Post方法
---
src/main/java/com/moon/server/service/data/ShuJianService.java | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
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 891c410..ae919da 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -112,12 +112,7 @@
Map<String, Object> map = getMapData(layerEntity);
String url = String.format("%s/sj_raster/sj_raster/v6/api/layer?%s", sjUrl, ak);
- String str = RestHelper.postForRest(url, map);
- if (StringHelper.isEmpty(str)) {
- return null;
- }
-
- LayerResultEntity rs = JSON.parseObject(str, LayerResultEntity.class);
+ LayerResultEntity rs = postForRest(url, map, LayerResultEntity.class);
boolean flag = null == rs || !StaticData.SUCCESS.equals(rs.getStatus()) || null == rs.getResult().getLayer_id();
return flag ? null : rs.getResult().getLayer_id();
@@ -153,12 +148,7 @@
Map<String, Object> map = getMapData(serviceEntity);
String url = String.format("%s/sj_raster/v6/api/service?op=create_ex&%s", sjUrl, ak);
- String str = RestHelper.postForRest(url, map);
- if (StringHelper.isEmpty(str)) {
- return null;
- }
-
- ServiceResultEntity rs = JSON.parseObject(str, ServiceResultEntity.class);
+ ServiceResultEntity rs = postForRest(url, map, ServiceResultEntity.class);
boolean flag = null == rs || !StaticData.SUCCESS.equals(rs.getStatus()) || null == rs.getResult();
return flag ? null : rs.getResult();
@@ -168,13 +158,20 @@
* 鍒涘缓鍙戝竷瀹炰綋绫�
*/
public PublishEntity createPublishEntity(PubEntity pub, Integer layerId, Integer serviceId) {
+ String epsg = (StaticData.I104903 == pub.getEpsgCode() ? "ESRI:" : "EPSG:") + pub.getEpsgCode();
+
PublishEntity entity = new PublishEntity();
entity.setType(pub.getType());
entity.setName(pub.getName());
entity.setMin(pub.getMin());
entity.setMax(pub.getMax());
- entity.setBak((StaticData.I104903 == pub.getEpsgCode() ? "ESRI:" : "EPSG:") + pub.getEpsgCode());
+ entity.setBak(epsg);
entity.setCreateUser(pub.getUserId());
+ entity.setDirid(pub.getDircode());
+ entity.setDepid(pub.getDepcode());
+ entity.setStatus(3);
+ entity.setLayerid(layerId);
+ entity.setServiceid(serviceId);
return entity;
}
@@ -182,8 +179,17 @@
/**
* 鎻掑叆鏁扮畝鏈嶅姟
*/
- public Integer updateSjService(PubEntity pubEntity, HttpServletRequest req, HttpServletResponse res) {
- //
+ public Integer updateSjService(PubEntity pub, HttpServletRequest req, HttpServletResponse res) {
+ PublishEntity entity = publishService.selectById(pub.getPubid());
+ if (null == entity) {
+ return 0;
+ }
+ if (null != entity.getLayerid()) {
+ deleteLayer(entity.getLayerid());
+ }
+ if (null != entity.getServiceid()) {
+ deleteService(entity.getServiceid());
+ }
return 1;
}
@@ -222,7 +228,7 @@
Map<String, Object> map = getMapData(entity);
String url = String.format("%s/sj_raster/sj_raster/v6/api/layer?%s", sjUrl, ak);
- DeleteResultEntity rs = deleteObject(url, map);
+ DeleteResultEntity rs = deleteForRest(url, map);
return null != rs && StaticData.SUCCESS.equals(rs.getStatus());
} catch (Exception ex) {
@@ -242,7 +248,7 @@
Map<String, Object> map = getMapData(entity);
String url = String.format("%s/sj_raster/sj_raster/v6/api/service?%s", sjUrl, ak);
- DeleteResultEntity rs = deleteObject(url, map);
+ DeleteResultEntity rs = deleteForRest(url, map);
return null != rs && StaticData.SUCCESS.equals(rs.getStatus());
} catch (Exception ex) {
@@ -251,9 +257,20 @@
}
}
- public DeleteResultEntity deleteObject(String url, Map<String, Object> map) {
+ /**
+ * post璇锋眰锛圧est锛�
+ */
+ public <T> T postForRest(String url, Map<String, Object> map, Class<T> clazz) {
RestTemplate rest = RestHelper.getRestTemplate();
+ return rest.postForObject(url, map, clazz);
+ }
+
+ /**
+ * delete璇锋眰锛圧est锛�
+ */
+ public DeleteResultEntity deleteForRest(String url, Map<String, Object> map) {
+ RestTemplate rest = RestHelper.getRestTemplate();
ResponseEntity<DeleteResultEntity> rs = rest.exchange(url, HttpMethod.DELETE, null, DeleteResultEntity.class, map);
return rs.getBody();
--
Gitblit v1.9.3