From d9ecee1ebe8b6e61561f28ccd4236b7e114cda84 Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Mon, 31 Mar 2025 18:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/sample/media/model/MediaFileDTO.java    |  2 +-
 .../sample/media/service/impl/FileServiceImpl.java  |  1 +
 .../wayline/controller/AiCompareController.java     |  4 ++--
 .../sample/wayline/service/IAiCompareService.java   |  2 +-
 .../wayline/service/impl/AiCompareServiceImpl.java  | 13 +++++++++----
 5 files changed, 14 insertions(+), 8 deletions(-)

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<Boolean> commitAlert(@RequestBody  List<Map<String,Object>>  alertList) {
-        return R.ok(aiCompareService.commitAlert(alertList));
+    public R<Boolean> commitAlert(@RequestBody Map<String,Object>compareMap) {
+        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<RemoteBusinessAlertVo> alertList(String jobId);
     Boolean delAlertList(List<Long>ids);
 
-    Boolean commitAlert(List<Map<String, Object>> alertList);
+    Boolean commitAlert(Map<String, Object> 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<Map<String, Object>> alertList) {
+    public Boolean commitAlert(Map<String,Object>compareMap) {
+
+        Long compareId = Convert.toLong(compareMap.get("compareId"));
+        List<Map<String, Object>>alertList = (List<Map<String, Object>>)compareMap.get("commitAlert");
+
         if (ObjectUtil.isEmpty(alertList)) {
             throw new ServiceException("预警信息为空!");
         }
-
         List<RemoteStartProcess> 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);
     }