From 72e77bc65c51717c86b98305f51efcd1df364c39 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 8 Apr 2025 15:15:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E4=BF=9D=E5=85=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/sync/SpsSyncDownloadService.java  | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
index 777fb3b5..9108d046 100644
--- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
+++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
@@ -1000,6 +1000,11 @@ public class SpsSyncDownloadService {
                 if (CollectionUtil.isNotEmpty(deviceCheckDetailEntities)) {
                     remark.append("巡检管理明细信息:").append(deviceCheckDetailEntities.size()).append("条\n");
                     jsonMap.put(DeviceCheckDetailEntity.class.getSimpleName(), deviceCheckDetailEntities);
+                    for (DeviceCheckDetailEntity entity : deviceCheckDetailEntities) {
+                        if (StrUtil.isNotEmpty(entity.getLivePath())) {
+                            syncFiles.add(entity.getLivePath());
+                        }
+                    }
                 }
                 List<DeviceCheckDetailItemEntity> deviceCheckDetailItemEntities = deviceCheckDetailItemService.list(Wrappers.lambdaQuery(DeviceCheckDetailItemEntity.class)
                         .le(!ge && (boolean) map.get("isNew"), DeviceCheckDetailItemEntity::getUpdateTime, now)
@@ -1024,6 +1029,11 @@ public class SpsSyncDownloadService {
                     jsonMap.put(DeviceCheckItemDictEntity.class.getSimpleName(), deviceCheckItemDictEntities);
                 }
 
+                log.error("接收到的各种图片集合{}",syncFiles);
+                if (CollUtil.isNotEmpty(syncFiles)) {
+                    jsonMap.put("syncFiles", syncFiles);
+                }
+
             }
 
             if (jsonMap.size() > 0) {
@@ -1137,10 +1147,6 @@ public class SpsSyncDownloadService {
                         }
                     }
                 }
-               log.error("接收到的各种图片集合{}",syncFiles);
-                if (CollUtil.isNotEmpty(syncFiles)) {
-                    jsonMap.put("syncFiles", syncFiles);
-                }
 
                 List<DeviceAssetCertEntity> deviceAssetCertEntities = deviceAssetCertService.list(Wrappers.lambdaQuery(DeviceAssetCertEntity.class)
                         .le(!ge && (boolean) map.get("isNew"), DeviceAssetCertEntity::getUpdateTime, now)
@@ -1243,6 +1249,11 @@ public class SpsSyncDownloadService {
                 if (CollectionUtil.isNotEmpty(deviceUpkeepDetailEntities)) {
                     remark.append("设备保养单明细信息:").append(deviceUpkeepDetailEntities.size()).append("条\n");
                     jsonMap.put(DeviceUpkeepDetailEntity.class.getSimpleName(), deviceUpkeepDetailEntities);
+                    for (DeviceUpkeepDetailEntity entity : deviceUpkeepDetailEntities) {
+                        if (StrUtil.isNotEmpty(entity.getLivePath())) {
+                            syncFiles.add(entity.getLivePath());
+                        }
+                    }
                 }
 
                 log.error("开始设备保养项目信息");
@@ -1257,6 +1268,11 @@ public class SpsSyncDownloadService {
                     jsonMap.put(DeviceUpkeepDetailItemEntity.class.getSimpleName(), deviceUpkeepDetailItemEntities);
                 }
 
+                log.error("接收到的各种图片集合{}",syncFiles);
+                if (CollUtil.isNotEmpty(syncFiles)) {
+                    jsonMap.put("syncFiles", syncFiles);
+                }
+
             }
             if (jsonMap.size() > 0) {
                 jsonMap.put(SYNC_REMARK, remark.toString());