feat: 设备巡检保养

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