From b725463a09193f689795201854a237d269299163 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Wed, 26 Mar 2025 21:12:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90u=E5=8F=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/model/entity/DeviceQrtzFileEntity.java | 3 +-- .../org/dromara/sample/manage/service/IDeviceQrtzService.java | 2 +- .../sample/manage/service/impl/DeviceQrtzServiceImpl.java | 3 ++- .../dromara/sample/wayline/model/entity/WaylineFileEntity.java | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java index e3df59e..77a4773 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceQrtzFileEntity.java @@ -44,8 +44,7 @@ public class DeviceQrtzFileEntity implements Serializable { private Integer status; - - + private String deviceSn; /** * 飞行时间 diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java index 86acb27..f40df20 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceQrtzService.java @@ -53,5 +53,5 @@ public interface IDeviceQrtzService { Boolean fileSort(Long id ,Integer sort); //通知启用飞行任务 - DeviceQrtzFileEntity getDeviceQrtzFileEntity(Long id); + DeviceQrtzFileEntity getDeviceQrtzFileEntity(String deviceSn); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index 36a3ab8..3585a50 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java @@ -191,6 +191,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { DeviceQrtzFileEntity entity = new DeviceQrtzFileEntity(); QueryWrapper queryWrapper = new QueryWrapper().eq("wayline_id", waylineId); WaylineFileEntity fileEntity = waylineFileMapper.selectOne(queryWrapper); + entity.setDeviceSn(fileEntity.getDeviceSn()); entity.setQrtzId(qrtzId); entity.setWaylineId(waylineId); entity.setWaylineName(fileEntity.getName()); @@ -251,7 +252,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { } @Override - public DeviceQrtzFileEntity getDeviceQrtzFileEntity(Long id) { + public DeviceQrtzFileEntity getDeviceQrtzFileEntity(String deviceSn) { return null; } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java index 81b6221..9df75d7 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java @@ -30,6 +30,8 @@ public class WaylineFileEntity implements Serializable { @TableField("wayline_id") private String waylineId; + @TableField("device_sn") + private String deviceSn; @TableField("drone_model_key") private String droneModelKey;