From 10de15e1f14bc5b0401321136f5629adb4b0074f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 06 九月 2023 15:43:11 +0800
Subject: [PATCH] 解决数简服务删除问题
---
src/main/java/com/moon/server/service/data/ShuJianService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 7ef3af4..deb7494 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -16,8 +16,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -415,8 +414,9 @@
deleteService(entity.getServiceid());
}
}
+ publishService.deletes(strs);
- return publishService.deletes(strs);
+ return list.size();
}
/**
@@ -428,7 +428,7 @@
entity.getId_list().add(id);
Map<String, Object> map = getMapData(entity);
- String url = String.format("%s/sj_raster/sj_raster/v6/api/layer?%s", sjUrl, ak);
+ String url = String.format("%s/sj_raster/v6/api/layer?%s", sjUrl, ak);
DeleteResultEntity rs = deleteForRest(url, map);
@@ -448,7 +448,7 @@
entity.getId_list().add(id);
Map<String, Object> map = getMapData(entity);
- String url = String.format("%s/sj_raster/sj_raster/v6/api/service?%s", sjUrl, ak);
+ String url = String.format("%s/sj_raster/v6/api/service?%s", sjUrl, ak);
DeleteResultEntity rs = deleteForRest(url, map);
@@ -472,8 +472,13 @@
* delete璇锋眰锛圧est锛�
*/
public DeleteResultEntity deleteForRest(String url, Map<String, Object> map) {
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+
+ HttpEntity<?> entity = new HttpEntity<>(map, headers);
+
RestTemplate rest = RestHelper.getRestTemplate();
- ResponseEntity<DeleteResultEntity> rs = rest.exchange(url, HttpMethod.DELETE, null, DeleteResultEntity.class, map);
+ ResponseEntity<DeleteResultEntity> rs = rest.exchange(url, HttpMethod.DELETE, entity, DeleteResultEntity.class);
return rs.getBody();
}
--
Gitblit v1.9.3