From fc03f5f8be1d34080f484022153bb615bcdc8c8f Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 21 Jan 2026 17:08:04 +0800
Subject: [PATCH] update-上报飞行成果接口-对外

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdTaskResultController.java |   68 +++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdTaskResultController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdTaskResultController.java
index 7d37858..9e028f6 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdTaskResultController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdTaskResultController.java
@@ -31,10 +31,14 @@
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.gd.common.GenericConverter;
+import org.sxkj.gd.workorder.dto.GdTaskResultDTO;
 import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
 import org.sxkj.gd.workorder.vo.GdTaskResultVO;
 import org.sxkj.gd.workorder.excel.GdTaskResultExcel;
 import org.sxkj.gd.workorder.wrapper.GdTaskResultWrapper;
+import org.sxkj.gd.workorder.param.GdClueEventDistributeParam;
+import org.sxkj.gd.workorder.service.IGdClueEventService;
 import org.sxkj.gd.workorder.service.IGdTaskResultService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
@@ -58,6 +62,7 @@
 public class GdTaskResultController extends BladeController {
 
 	private final IGdTaskResultService gdTaskResultService;
+	private final IGdClueEventService gdClueEventService;
 
 	/**
 	 * 成果表 详情
@@ -99,26 +104,26 @@
 		IPage<GdTaskResultVO> pages = gdTaskResultService.selectGdTaskResultPage(Condition.getPage(query), gdTaskResult);
 		return R.data(pages);
 	}
-
-	/**
-	 * 成果表 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入gdTaskResult")
-	public R save(@Valid @RequestBody GdTaskResultEntity gdTaskResult) {
-		return R.status(gdTaskResultService.save(gdTaskResult));
-	}
-
-	/**
-	 * 成果表 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入gdTaskResult")
-	public R update(@Valid @RequestBody GdTaskResultEntity gdTaskResult) {
-		return R.status(gdTaskResultService.updateById(gdTaskResult));
-	}
+//
+//	/**
+//	 * 成果表 新增
+//	 */
+//	@PostMapping("/save")
+//	@ApiOperationSupport(order = 4)
+//	@ApiOperation(value = "新增", notes = "传入gdTaskResult")
+//	public R save(@Valid @RequestBody GdTaskResultEntity gdTaskResult) {
+//		return R.status(gdTaskResultService.save(gdTaskResult));
+//	}
+//
+//	/**
+//	 * 成果表 修改
+//	 */
+//	@PostMapping("/update")
+//	@ApiOperationSupport(order = 5)
+//	@ApiOperation(value = "修改", notes = "传入gdTaskResult")
+//	public R update(@Valid @RequestBody GdTaskResultEntity gdTaskResult) {
+//		return R.status(gdTaskResultService.updateById(gdTaskResult));
+//	}
 
 	/**
 	 * 成果表 新增或修改
@@ -126,8 +131,18 @@
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入gdTaskResult")
-	public R submit(@Valid @RequestBody GdTaskResultEntity gdTaskResult) {
-		return R.status(gdTaskResultService.saveOrUpdate(gdTaskResult));
+	public R submit(@Valid @RequestBody GdTaskResultDTO gdTaskResult) {
+		return R.status(gdTaskResultService.saveOrUpdate(GenericConverter.convert(gdTaskResult, GdTaskResultEntity.class)));
+	}
+
+	/**
+	 * 成果表批量新增-对外接口
+	 */
+	@PostMapping("/batchSave")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "批量新增", notes = "传入gdTaskResult")
+	public R batchSave(@Valid @RequestBody List<GdTaskResultDTO> gdTaskResults) {
+		return R.status(gdTaskResultService.saveBatch(GdTaskResultWrapper.build().listEntity(gdTaskResults)));
 	}
 
 	/**
@@ -140,6 +155,15 @@
 		return R.status(gdTaskResultService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 成果分发事件
+	 */
+	@PostMapping("/distribute")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "分发事件", notes = "传入分发参数")
+	public R distribute(@Valid @RequestBody GdClueEventDistributeParam distributeParam) {
+		return R.status(gdClueEventService.distributeClueEvent(distributeParam));
+	}
 
 	/**
 	 * 导出数据

--
Gitblit v1.9.3