From 77e38d8665ccebaa3ae9ed0db3dd822190d68878 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jun 2026 11:19:58 +0800
Subject: [PATCH] refactor(workorder): 回滚代码
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
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 8ac2f76..545fb39 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
@@ -16,6 +16,7 @@
*/
package org.sxkj.gd.workorder.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -643,7 +644,7 @@
return R.fail("巡查任务不存在");
}
GdXingtuFlyTaskSaveDTO param = buildXingtuFlyTask(taskEntity);
- return jianXingtuApiService.saveFlyTask(param);
+ return jianXingtuApiService.saveFlyTask(param);
}
/**
@@ -671,7 +672,7 @@
}
if (gdPatrolTaskVO.getExecuteTime() != null) {
param.setSingleTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
- }
+ }
if (StringUtil.isNotBlank(gdPatrolTaskVO.getAreaCode())) {
param.setRegionCode(gdPatrolTaskVO.getAreaCode());
}
@@ -681,6 +682,16 @@
if (StringUtil.isNotBlank(gdPatrolTaskVO.getDeviceFlyerId())) {
param.setDeviceFlyerId(gdPatrolTaskVO.getDeviceFlyerId());
}
+ if (StringUtil.isNotBlank(JSON.toJSONString(gdPatrolTaskVO.getAlgorithmIds()))) {
+ param.setAlgorithmId(JSON.toJSONString(gdPatrolTaskVO.getAlgorithmIds()));
+ }
+ // 机构
+ param.setDeptId(gdPatrolTaskVO.getCreateDept());
+ // 巡检类型
+ param.setInspectionTypeArr(gdPatrolTaskVO.getPatrolTaskType());
+ param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
+ // 机巢名称
+ param.setAirportName(gdPatrolTaskVO.getDeviceName());
param.setStatus("待执行");
param.setTaskType("定时飞行");
return param;
--
Gitblit v1.9.3