From 3ff3de60e9274da9601fba4d2165fe46be4d7f07 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 22 Jun 2026 16:31:37 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java
index 95b874f..a70bd6a 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java
@@ -67,13 +67,16 @@
// 保存设备调用
GdPatrolTaskEntity patrolTask = gdPatrolTaskService.getById(dtos.get(0).getPatrolTaskId());
if (patrolTask == null) {
+ log.warn("巡查任务不存在：" + dtos.get(0).getPatrolTaskId());
return false;
}
GdDeviceCallEntity callEntity = new GdDeviceCallEntity();
callEntity.setId(patrolTask.getId());
callEntity.setPatrolTaskName(patrolTask.getPatrolTaskName());
callEntity.setTaskDepartment(SysCache.getDeptName(patrolTask.getCreateDept()));
+ callEntity.setTaskDepartmentId(patrolTask.getCreateDept());
callEntity.setTaskInitiator(UserCache.getUser(patrolTask.getCreateUser()).getName());
+ callEntity.setTaskInitiatorId(patrolTask.getCreateUser());
callEntity.setPlanExecuteTime(patrolTask.getExecuteTime());
callEntity.setActualExecuteTime(dtos.get(0).getOccurTime());// 第一条数据的发生时间
@@ -109,6 +112,11 @@
.eq(GdManageDeviceEntity::getDeviceSn, deviceSn),
false
);
+
+ if (gdManageDevice == null) {
+ log.warn("设备不存在：" + deviceSn);
+ return false;
+ }
deviceId = gdManageDevice.getId();
deviceName = gdManageDevice.getDeviceName();
}
--
Gitblit v1.9.3