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 | 16 ++++++++++++++--
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdTaskResultDTO.java | 6 +++---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java | 14 +++++++-------
3 files changed, 24 insertions(+), 12 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 fa6fc63..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,6 +31,8 @@
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;
@@ -129,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)));
}
/**
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdTaskResultDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdTaskResultDTO.java
index a9506a2..2b7babd 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdTaskResultDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdTaskResultDTO.java
@@ -58,17 +58,17 @@
/**
* 照片数据（JSON格式）
*/
- @ApiModelProperty(value = "照片数据（JSON格式）")
+ @ApiModelProperty(value = "照片数据（JSON字符串格式,无人机高度、偏航角、云台俯仰角、云台偏航角等信息）")
private String photoData;
/**
* 经度
*/
- @ApiModelProperty(value = "经度")
+ @ApiModelProperty(value = "拍照经度")
private Double longitude;
/**
* 纬度
*/
- @ApiModelProperty(value = "纬度")
+ @ApiModelProperty(value = "拍照纬度")
private Double latitude;
/**
* 分发事件状态：0未分发、1已分发、2已驳回
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java
index 120168c..32b7fb1 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java
@@ -18,8 +18,11 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.sxkj.gd.workorder.dto.GdTaskResultDTO;
import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
import org.sxkj.gd.workorder.vo.GdTaskResultVO;
+
+import java.util.List;
import java.util.Objects;
/**
@@ -36,15 +39,12 @@
@Override
public GdTaskResultVO entityVO(GdTaskResultEntity gdTaskResult) {
- GdTaskResultVO gdTaskResultVO = Objects.requireNonNull(BeanUtil.copy(gdTaskResult, GdTaskResultVO.class));
- //User createUser = UserCache.getUser(gdTaskResult.getCreateUser());
- //User updateUser = UserCache.getUser(gdTaskResult.getUpdateUser());
- //gdTaskResultVO.setCreateUserName(createUser.getName());
- //gdTaskResultVO.setUpdateUserName(updateUser.getName());
-
- return gdTaskResultVO;
+ return Objects.requireNonNull(BeanUtil.copy(gdTaskResult, GdTaskResultVO.class));
}
+ public List<GdTaskResultEntity> listEntity(List<GdTaskResultDTO> gdTaskResultDTOList) {
+ return BeanUtil.copyWithConvert(gdTaskResultDTOList, GdTaskResultEntity.class);
+ }
}
--
Gitblit v1.9.3