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()); }