From 926c4e010eae5ed33fce7ebd9ac8a430e1155894 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jun 2026 11:10:58 +0800
Subject: [PATCH] refactor(workorder): 修改巡查任务数据传输结构
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java
index 1e506ec..f506251 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java
@@ -1,6 +1,7 @@
package org.sxkj.gd.xingtu;
import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
@@ -14,6 +15,7 @@
import org.sxkj.gd.workorder.dto.GdXingtuFlyTaskSaveDTO;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -23,6 +25,7 @@
* @Date 2026/1/26 15:22
* @Version 1.0
*/
+@Slf4j
@Service
public class JianXingtuApiService {
@@ -38,7 +41,8 @@
/**
* 获取星图登录token
- * @return token
+ *
+ * @return token
*/
@SneakyThrows
public String getToken() {
@@ -80,6 +84,7 @@
/**
* 设备列表-无人机
+ *
* @param name 名称
* @return 接口响应
*/
@@ -90,6 +95,7 @@
/**
* 设备列表-机巢
+ *
* @param name 名称
* @return 接口响应
*/
@@ -100,10 +106,11 @@
/**
* 新增飞行任务
+ *
* @param param 请求参数
* @return 接口响应
*/
- public R saveFlyTask(GdXingtuFlyTaskSaveDTO param) {
+ public R saveFlyTask(List<GdXingtuFlyTaskSaveDTO> param) {
String url = JianXingTuApiClient.getFlyTaskSaveUrl();
return postWithAuthHeader(url, param);
}
@@ -121,23 +128,30 @@
if (StringUtil.isBlank(token) || "获取token失败".equals(token)) {
return R.fail("获取token失败");
}
- HttpHeaders headers = new HttpHeaders();
- headers.set("authorization", token);
-
- HttpEntity<Object> entity = new HttpEntity<>(body, headers);
- ResponseEntity<R> response = restTemplate.exchange(url, HttpMethod.POST, entity, R.class);
- if (response.getStatusCode().is2xxSuccessful()) {
- R responseBody = response.getBody();
- if (responseBody != null) {
- return responseBody;
+ try {
+ HttpHeaders headers = new HttpHeaders();
+ headers.set("authorization", token);
+ log.info("请求外部接口: {} {}", url, body);
+ HttpEntity<Object> entity = new HttpEntity<>(body, headers);
+ ResponseEntity<R> response = restTemplate.exchange(url, HttpMethod.POST, entity, R.class);
+ log.info("响应外部接口: {}", response);
+ if (response.getStatusCode().is2xxSuccessful()) {
+ R responseBody = response.getBody();
+ if (responseBody != null) {
+ return responseBody;
+ }
+ return R.fail("接口返回为空");
}
- return R.fail("接口返回为空");
+ return R.fail("请求外部接口失败");
+ } catch (Exception e) {
+ log.error("请求外部接口异常: ", e);
+ return R.fail("请求外部接口异常: " + e.getMessage());
}
- return R.fail("请求外部接口失败");
}
/**
* 解析JSON字符串为Map
+ *
* @param input JSON字符串
* @return 解析后的Map
*/
--
Gitblit v1.9.3