From 926c4e010eae5ed33fce7ebd9ac8a430e1155894 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jun 2026 11:10:58 +0800
Subject: [PATCH] refactor(workorder): 修改巡查任务数据传输结构
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java | 3 ++-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java | 4 +++-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 7 +++++--
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java
index 9b1516f..bf61ca6 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java
@@ -46,7 +46,7 @@
private String inspectionType;
@ApiModelProperty("巡检类型，字典-数组格式")
- private String inspectionTypeArr;
+ private String patrolTaskType;
@ApiModelProperty("任务类型：定时飞行、航线飞行")
private String taskType;
@@ -57,6 +57,8 @@
@ApiModelProperty("单次任务执行时间")
private String singleTime;
+ private String executeTime;
+
@ApiModelProperty("周期（自定义）执行开始日期")
private String startDate;
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
index 505f475..701fcd8 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -89,7 +89,7 @@
SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment}
</select>
- <select id="getPatrolTaskIdById" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
+ <select id="getPatrolTaskIdById" resultMap="gdPatrolTaskResultMap">
SELECT
pt.*,
md.airport_id as airport_id
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 cf58391..ed9fdaf 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
@@ -644,7 +644,9 @@
return R.fail("巡查任务不存在");
}
GdXingtuFlyTaskSaveDTO param = buildXingtuFlyTask(taskEntity);
- return jianXingtuApiService.saveFlyTask(param);
+ List<GdXingtuFlyTaskSaveDTO> paramList = new ArrayList<>();
+ paramList.add(param);
+ return jianXingtuApiService.saveFlyTask(paramList);
}
/**
@@ -672,6 +674,7 @@
}
if (gdPatrolTaskVO.getExecuteTime() != null) {
param.setSingleTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
+ param.setExecuteTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
}
if (StringUtil.isNotBlank(gdPatrolTaskVO.getAreaCode())) {
param.setRegionCode(gdPatrolTaskVO.getAreaCode());
@@ -688,7 +691,7 @@
// 机构
param.setDeptId(gdPatrolTaskVO.getCreateDept());
// 巡检类型
- param.setInspectionTypeArr(gdPatrolTaskVO.getPatrolTaskType());
+ param.setPatrolTaskType(gdPatrolTaskVO.getPatrolTaskType());
param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
// 机巢名称
param.setAirportName(gdPatrolTaskVO.getDeviceName());
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java
index 7b77853..f506251 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java
@@ -15,6 +15,7 @@
import org.sxkj.gd.workorder.dto.GdXingtuFlyTaskSaveDTO;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -109,7 +110,7 @@
* @param param 请求参数
* @return 接口响应
*/
- public R saveFlyTask(GdXingtuFlyTaskSaveDTO param) {
+ public R saveFlyTask(List<GdXingtuFlyTaskSaveDTO> param) {
String url = JianXingTuApiClient.getFlyTaskSaveUrl();
return postWithAuthHeader(url, param);
}
--
Gitblit v1.9.3