From 98bcf3cc626642d0f0c28fcf3c5de61394dcad44 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Wed, 4 Jun 2025 14:17:41 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E6=8F=90=E4=BA=A4:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=AE=BE=E5=A4=87sn=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=88=AA=E7=BA=BFid=E8=88=AA=E7=BA=BF=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/wayline/service/IWaylineJobService.java | 2 +- .../wayline/service/impl/WaylineJobServiceImpl.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java index f95e213..36e4064 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java @@ -88,5 +88,5 @@ public interface IWaylineJobService { * */ List getMediaFileDTO(String jobId, String fileType); - Optional getJobByDockSn(String dockSn); + WaylineJobDTO getJobByDockSn(String dockSn); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java index e1a475e..98f03eb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java @@ -268,7 +268,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService { } @Override - public Optional getJobByDockSn(String dockSn) { + public WaylineJobDTO getJobByDockSn(String dockSn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(WaylineJobEntity::getStatus, 2) @@ -277,7 +277,13 @@ public class WaylineJobServiceImpl implements IWaylineJobService { //降序查询 queryWrapper.orderByDesc(WaylineJobEntity::getCreateTime); - return Optional.ofNullable(entity2Dto(mapper.selectList(queryWrapper).stream().findFirst().orElse(null))); + List waylineJobEntities = mapper.selectList(queryWrapper); + + if (ObjectUtil.isEmpty(waylineJobEntities)){ + return new WaylineJobDTO(); + } + + return entity2Dto(waylineJobEntities.getFirst()); }