Browse Source

[feat]提交:增加根据设备sn查询航线id航线名称

pull/7/head
杨威 3 weeks ago
parent
commit
b9f222e1e2
  1. 12
      dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
  2. 7
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java
  3. 2
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java
  4. 14
      dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java

12
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) { public BusinessAlert addBusinessAlert(BusinessAlertVo param) {
BusinessAlert alert = MapstructUtils.convert(param, BusinessAlert.class); BusinessAlert alert = MapstructUtils.convert(param, BusinessAlert.class);
alert.setCreateTime(new Date()); alert.setCreateTime(new Date());
alert.setJobName(alert.getLabelCn()+ DateUtils.getTime()); // alert.setJobName(alert.getLabelCn()+ DateUtils.getTime());
//创建案件号 //创建案件号
try { try {
incrementalAlertCount(alert); incrementalAlertCount(alert);
@ -180,11 +180,11 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
log.info("flowCode:{}",flowCode); log.info("flowCode:{}",flowCode);
startProcess.setFlowCode(flowCode); startProcess.setFlowCode(flowCode);
map.put("deptId",alertVo.getDeptId()); map.put("deptId",alert.getDeptId());
map.put("deptName",alertVo.getDeptName()); map.put("deptName",alert.getDeptName());
map.put("labelCn",alertVo.getLabelCn()); map.put("labelCn",alert.getLabelCn());
map.put("labelEn",alertVo.getLabelEn()); map.put("labelEn",alert.getLabelEn());
map.put("jobName",alertVo.getJobName()); map.put("jobName",alert.getJobName());
noticeList.add(map); noticeList.add(map);
remoteStartProcessList.add(startProcess); remoteStartProcessList.add(startProcess);
} }

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

2
dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java

@ -87,4 +87,6 @@ public interface IWaylineJobService {
* @param fileType 图片类型 "jpeg,mp4" * @param fileType 图片类型 "jpeg,mp4"
* */ * */
List<MediaFileDTO> getMediaFileDTO(String jobId, String fileType); List<MediaFileDTO> getMediaFileDTO(String jobId, String fileType);
Optional<WaylineJobDTO> getJobByDockSn(String dockSn);
} }

14
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); return fileService.getMediaFileDTO(jobId,fileType);
} }
@Override
public Optional<WaylineJobDTO> getJobByDockSn(String dockSn) {
LambdaQueryWrapper<WaylineJobEntity> queryWrapper = new LambdaQueryWrapper<WaylineJobEntity>()
.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) { private WaylineJobDTO entity2Dto(WaylineJobEntity entity) {
if (entity == null) { if (entity == null) {
return null; return null;

Loading…
Cancel
Save