|
@@ -191,7 +191,14 @@ public class ExternalDataArchiveFileService {
|
|
boolean pdfUrlDifferent = external.getPdfPageUrl() != null &&
|
|
boolean pdfUrlDifferent = external.getPdfPageUrl() != null &&
|
|
!Objects.equals(external.getPdfPageUrl(), local.getPdfPageUrl());
|
|
!Objects.equals(external.getPdfPageUrl(), local.getPdfPageUrl());
|
|
|
|
|
|
- return !Objects.equals(extUtimeStr, localUtimeStr) || pdfUrlDifferent;
|
|
|
|
|
|
+ // 新增nodeId比较:当external的nodeId非空时,与local的nodeId比较
|
|
|
|
+ boolean nodeIdDifferent = external.getNodeId() != null &&
|
|
|
|
+ !Objects.equals(external.getNodeId(), local.getNodeId());
|
|
|
|
+
|
|
|
|
+ // 任意字段不同即需要更新
|
|
|
|
+ return !Objects.equals(extUtimeStr, localUtimeStr)
|
|
|
|
+ || pdfUrlDifferent
|
|
|
|
+ || nodeIdDifferent; // 新增nodeId判断
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -210,6 +217,7 @@ public class ExternalDataArchiveFileService {
|
|
local.setFilePage(external.getFilePage());
|
|
local.setFilePage(external.getFilePage());
|
|
local.setFileSize(external.getFileSize());
|
|
local.setFileSize(external.getFileSize());
|
|
local.setUtime(external.getUtime());
|
|
local.setUtime(external.getUtime());
|
|
|
|
+ local.setNodeId(external.getNodeId());
|
|
//local.setArchiveId(external.getArchiveId());
|
|
//local.setArchiveId(external.getArchiveId());
|
|
}
|
|
}
|
|
|
|
|