From 4e3faa7a23d88ed782625dd6603066c88d732f2c Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Tue, 2 Dec 2025 16:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PgsProgressPlanDetailServiceImpl.java     | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java
index 71d5f92d..0e03ffbf 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java
@@ -1220,7 +1220,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
     @Override
     public CompletableFuture<Boolean> recognizeAsync(Long bigPictureId, String fileUrl, String tifUrl, List<Long> projectIds) {
         // 调用识别算法
-        RecognizeVo recognizeVo = null;
+        RecognizeVo recognizeVo;
         try {
             recognizeVo = recognizerManager.recognize(fileUrl);
         } catch (Exception e) {
@@ -1278,18 +1278,20 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
         }
         // 将识别数据同步到图片上
         Long recognizePic = null;
-        try {
-            RecognizeImageStreamResult drawnImage = RecognizerManager.drawImageToStream(fileUrl, targets);
-            InputStream inputStream = drawnImage.getInputStream();
-            String contentType = drawnImage.getContentType();
-            long length = drawnImage.getLength();
-            SysOssVo drawnVo = ossService.upload(inputStream, fileName, contentType, length);
-            if (drawnVo != null) {
-                recognizePic = drawnVo.getOssId();
+        if (CollUtil.isNotEmpty(recognizerVoList)) {
+            try {
+                RecognizeImageStreamResult drawnImage = RecognizerManager.drawImageToStream(fileUrl, targets);
+                InputStream inputStream = drawnImage.getInputStream();
+                String contentType = drawnImage.getContentType();
+                long length = drawnImage.getLength();
+                SysOssVo drawnVo = ossService.upload(inputStream, fileName, contentType, length);
+                if (drawnVo != null) {
+                    recognizePic = drawnVo.getOssId();
+                }
+            } catch (IOException | URISyntaxException e) {
+                log.error("将识别数据同步到图片上失败", e);
+                return CompletableFuture.completedFuture(false);
             }
-        } catch (IOException | URISyntaxException e) {
-            log.error("将识别数据同步到图片上失败", e);
-            return CompletableFuture.completedFuture(false);
         }
         String recognizerStr = JSONUtil.toJsonStr(recognizerVoList);
         // 更新数据和状态
@@ -1299,10 +1301,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
             .set(DroDroneBigPicture::getRecognizePic, recognizePic)
             .set(DroDroneBigPicture::getRecognizeResult, recognizerStr)
             .update();
-        if (!update) {
-            return CompletableFuture.completedFuture(false);
-        }
-        return CompletableFuture.completedFuture(true);
+        return CompletableFuture.completedFuture(update);
     }
 
     /**