diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 5a1065d..484705f 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -118,7 +118,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { public BusinessAlert addBusinessAlert(BusinessAlertVo param) { BusinessAlert alert = MapstructUtils.convert(param, BusinessAlert.class); alert.setCreateTime(new Date()); - alert.setJobName(alert.getLabelCn()+ DateUtils.getTime()); +// alert.setJobName(alert.getLabelCn()+ DateUtils.getTime()); //创建案件号 try { incrementalAlertCount(alert); @@ -180,11 +180,11 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { log.info("flowCode:{}",flowCode); startProcess.setFlowCode(flowCode); - map.put("deptId",alertVo.getDeptId()); - map.put("deptName",alertVo.getDeptName()); - map.put("labelCn",alertVo.getLabelCn()); - map.put("labelEn",alertVo.getLabelEn()); - map.put("jobName",alertVo.getJobName()); + map.put("deptId",alert.getDeptId()); + map.put("deptName",alert.getDeptName()); + map.put("labelCn",alert.getLabelCn()); + map.put("labelEn",alert.getLabelEn()); + map.put("jobName",alert.getJobName()); noticeList.add(map); remoteStartProcessList.add(startProcess); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java index 70c2321..7edd719 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java @@ -154,4 +154,11 @@ public class WaylineJobController { } } + //根据设备sn查询jobname + @GetMapping("/{workspace_id}/getJobByDockSn") + @Operation(summary = "根据设备sn查询jobname。", description = "根据设备sn查询jobname。") + public HttpResultResponse getJobByDockSn( @RequestParam(name = "device_sn") String deviceSn) { + return HttpResultResponse.success(waylineJobService.getJobByDockSn(deviceSn)); + } + } 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 6b2532b..f95e213 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 @@ -87,4 +87,6 @@ public interface IWaylineJobService { * @param fileType 图片类型 ("jpeg,mp4") * */ List getMediaFileDTO(String jobId, String fileType); + + Optional 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 4c7fd40..e1a475e 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 @@ -267,6 +267,20 @@ public class WaylineJobServiceImpl implements IWaylineJobService { return fileService.getMediaFileDTO(jobId,fileType); } + @Override + public Optional getJobByDockSn(String dockSn) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(WaylineJobEntity::getStatus, 2) + .eq(WaylineJobEntity::getDockSn, dockSn); + + //降序查询 + queryWrapper.orderByDesc(WaylineJobEntity::getCreateTime); + + return Optional.ofNullable(entity2Dto(mapper.selectList(queryWrapper).stream().findFirst().orElse(null))); + + } + private WaylineJobDTO entity2Dto(WaylineJobEntity entity) { if (entity == null) { return null;