diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java index 77e76a1..8873b7b 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileDTO.java @@ -64,6 +64,6 @@ public class MediaFileDTO { private Double relativeAltitude; private String jobId; - + private Integer fileIndex; private String url; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java index b5e02fc..38b2c30 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java @@ -221,6 +221,7 @@ public class FileServiceImpl implements IFileService { .objectKey(entity.getObjectKey()) .tinnyFingerprint(entity.getTinnyFingerprint()) .payload(entity.getPayload()) + .fileIndex(entity.getFileIndex()) .createTime(entity.getCreateTime()) .drone(entity.getDrone()) .lat(entity.getLat()) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java index f37b206..fd46240 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java @@ -189,7 +189,7 @@ public class AiCompareController extends BaseController { * 提交 */ @PostMapping("/commit") - public R commitAlert(@RequestBody List> alertList) { - return R.ok(aiCompareService.commitAlert(alertList)); + public R commitAlert(@RequestBody MapcompareMap) { + return R.ok(aiCompareService.commitAlert(compareMap)); } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java index 6027e6b..b650bcd 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java @@ -33,5 +33,5 @@ public interface IAiCompareService { List alertList(String jobId); Boolean delAlertList(Listids); - Boolean commitAlert(List> alertList); + Boolean commitAlert(Map compareMap); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java index 69bb9e5..953872a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java @@ -247,11 +247,14 @@ public class AiCompareServiceImpl implements IAiCompareService { @Transactional(rollbackFor = Exception.class) @Override - public Boolean commitAlert(List> alertList) { + public Boolean commitAlert(MapcompareMap) { + + Long compareId = Convert.toLong(compareMap.get("compareId")); + List>alertList = (List>)compareMap.get("commitAlert"); + if (ObjectUtil.isEmpty(alertList)) { throw new ServiceException("预警信息为空!"); } - List startProcessList = alertList.stream().map(map -> { String flowCode = remoteWorkflowService.getFlowCode(map.get("labelEn").toString()); RemoteStartProcess remoteStartProcess = new RemoteStartProcess(); @@ -259,10 +262,12 @@ public class AiCompareServiceImpl implements IAiCompareService { remoteStartProcess.setFlowCode(flowCode); return remoteStartProcess; }).toList(); - //更新部门信息 businessAlertService.batchUpdateDept(alertList); - + AiCompareEntity aiCompareEntity=new AiCompareEntity(); + aiCompareEntity.setId(compareId); + aiCompareEntity.setStatus(AiCompareStatusConstants.COMPARE_STATUS_4); + aiCompareMapper.updateById(aiCompareEntity); return remoteWorkflowService.startWorkFlowBatch(startProcessList); }