From 8a116ffbb7e4e6af1502a841b811b8108cdeb359 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 04 Feb 2026 20:08:40 +0800
Subject: [PATCH] 工单优化

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
index 8ef24fa..c5c8ed5 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
@@ -79,8 +79,8 @@
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入gdPatrolTask")
 	public R<GdPatrolTaskVO> detail(GdPatrolTaskEntity gdPatrolTask) {
-		GdPatrolTaskEntity detail = gdPatrolTaskService.getOne(Condition.getQueryWrapper(gdPatrolTask));
-		return R.data(GdPatrolTaskWrapper.build().entityVO(detail));
+		GdPatrolTaskVO detail = gdPatrolTaskService.getPatrolTaskDetail(gdPatrolTask);
+		return R.data(detail);
 	}
 
 	/**
@@ -162,7 +162,7 @@
 		GdPatrolTaskEntity auditParam = new GdPatrolTaskEntity();
 		auditParam.setId(param.getId());
 		auditParam.setTaskStatus(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue());
-		return R.status(gdPatrolTaskService.updateById(auditParam));
+		return R.status(gdPatrolTaskService.updatePatrolTaskById(auditParam));
 	}
 
 	/**
@@ -187,4 +187,14 @@
 		boolean saved = gdPatrolTaskService.exportPatrolReport(id);
 		return R.data(saved);
 	}
+
+	@PostMapping("/push-xingtu")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "推送星图任务", notes = "传入巡查任务id")
+	public R pushXingtuTask(@RequestParam Long id) {
+		if (id == null) {
+			return R.fail("巡查任务id不能为空");
+		}
+		return gdPatrolTaskService.pushXingtuFlyTask(id);
+	}
 }

--
Gitblit v1.9.3