From c79309477f6fa17009aeb1f0a2ced6a31781c63a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 16:28:10 +0800
Subject: [PATCH] fix(xingtu): 完善星图接口调用的错误处理机制
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index e18d80d..9a39f36 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -256,7 +256,13 @@
// 6. 判断是否审核成功，如果是，需要判断是否整个订单的子任务都审核成功了，除了被撤回和验收拒绝的
if (auditStatus == 4) {
// 将审核后的任务信息推送到星图
- pushXingtuFlyTask(auditParam.getId());
+ R pushResult = pushXingtuFlyTask(auditParam.getId());
+ // 检查推送结果，如果失败则抛出异常回滚事务
+ if (pushResult != null && !pushResult.isSuccess()) {
+ String errorMsg = pushResult.getMsg();
+ log.error("推送星图飞行任务失败: {}", errorMsg);
+ throw new RuntimeException("推送星图飞行任务失败: " + errorMsg);
+ }
// 查询同一个工单下的所有子任务
List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
.eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
@@ -603,7 +609,7 @@
attach.setOriginalName(bladeFile.getOriginalName());
attach.setAttachSize(reportFile.length());
attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
- attach.setResultType(JSON.toJSONString(resultType));
+ attach.setResultType(resultType);
attach.setPatrolTaskId(String.valueOf(taskEntity != null ? taskEntity.getId() : null));
Long createUser = taskEntity != null ? taskEntity.getCreateUser() : null;
Long updateUser = taskEntity != null ? taskEntity.getUpdateUser() : null;
@@ -801,6 +807,11 @@
// 去除空格并确保长度为6位
String cleanCode = areaCode.trim();
+ // 如果长度大于6位，只取前6位
+ if (cleanCode.length() > 6) {
+ log.warn("区域编码长度超过6位，截取前6位: {}", cleanCode);
+ cleanCode = cleanCode.substring(0, 6);
+ }
if (cleanCode.length() != 6) {
log.warn("区域编码格式不正确，期望6位数字，实际为: {}", cleanCode);
return cleanCode;
@@ -809,7 +820,7 @@
try {
// 提取省、市、区三级编码
String provinceCode = cleanCode.substring(0, 2) + "00"; // 省级编码（如：3600）
- String cityCode = cleanCode.substring(0, 4) + "0"; // 市级编码（如：3608）
+ String cityCode = cleanCode.substring(0, 4); // 市级编码（如：3608）
String districtCode = cleanCode; // 区级编码（如：360802）
return provinceCode + "," + cityCode + "," + districtCode;
--
Gitblit v1.9.3