From ebeb43ea497fafc448c827d1de6796bcaa4e0b52 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 13:59:46 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java | 10 ++++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdTaskResultWrapper.java | 14 ++++++++++----
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
index 4f4c6be..69b7309 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
@@ -137,6 +137,16 @@
}
/**
+ * 事件表（线索事件） 新增或修改-对外接口
+ */
+ @PostMapping("/submitExternal")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入gdClueEvent")
+ public R submitExternal(@Valid @RequestBody GdClueEventEntity gdClueEvent) {
+ return R.status(gdClueEventService.saveOrUpdate(gdClueEvent));
+ }
+
+ /**
* 事件表（线索事件） 删除
*/
@PostMapping("/remove")
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java
index 9d7b7f8..624d51f 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java
@@ -89,7 +89,7 @@
/**
* 附件类型：1媒体文件； 2ai文件； 3主视频
*/
- @ApiModelProperty(value = "附件类型：1媒体文件； 2ai文件； 3主视频")
+ @ApiModelProperty(value = "附件类型：1媒体文件； 2ai文件； 3主视频 4视频文件mp4")
private Integer attachmentType;
/**
* 附件URL
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 7d7f468..9bc4f1a 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
@@ -70,10 +70,16 @@
GdTaskResultEntity entity = BeanUtil.copy(dto, GdTaskResultEntity.class);
// 步骤1：设置附件类型
- if (dto.getAttachmentType() != null) {
- entity.setAttachmentType(dto.getAttachmentType());
- } else if (dto.getDateType() != null) {
- entity.setAttachmentType(dto.getDateType());
+ if (dto.getDateType() != null) {
+ if (dto.getDateType().equals(1) && dto.getFileType().equals("视频")) {
+ // 录像的视频
+ entity.setAttachmentType(3);
+ } else if (dto.getDateType().equals(3) && dto.getFileType().equals("视频")) {
+ // 机巢+无人机录像视频
+ entity.setAttachmentType(4);
+ } else {
+ entity.setAttachmentType(dto.getDateType());
+ }
}
// 步骤2：处理geojson字段，将字符串数组转换为正确的JSON格式
--
Gitblit v1.9.3