xqj před 1 rokem
rodič
revize
4c136ff437

+ 1 - 1
blade-service/blade-business/src/main/java/org/springblade/business/controller/ImageClassificationFileController.java

@@ -740,7 +740,7 @@ public class ImageClassificationFileController extends BladeController {
      * @throws IOException
      */
     public long getResourceLength(String urlStr) throws IOException {
-        urlStr = replaceOssUrl(urlStr);
+        //urlStr = replaceOssUrl(urlStr);
         URL url = new URL(urlStr);
         URLConnection urlConnection = url.openConnection();
         urlConnection.connect();

+ 4 - 4
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -1076,10 +1076,10 @@ public class ArchiveTreeContractSyncImpl {
                                   Map<Long, ArchiveTreeContract> newDateArchiveTreeContractMap, List<ArchiveTreeContract> insertions,
                                   List<ArchiveTreeContract> deletions, List<Map> modifications) {
         for (ArchiveTreeContract originalDateArchiveTreeContract : originalDateArchiveTreeContractList) {
-            if (!newDateArchiveTreeContractMap.containsKey(originalDateArchiveTreeContract.getFullName())) {
+            if (!newDateArchiveTreeContractMap.containsKey(Long.valueOf(originalDateArchiveTreeContract.getFullName()))) {
                 deletions.add(originalDateArchiveTreeContract);
             } else {
-                ArchiveTreeContract node2 = newDateArchiveTreeContractMap.get(originalDateArchiveTreeContract.getFullName());
+                ArchiveTreeContract node2 = newDateArchiveTreeContractMap.get(Long.valueOf(originalDateArchiveTreeContract.getFullName()));
                 if (originalDateArchiveTreeContract.getFullName().equals(node2.getFullName())) {
                     Map map = new HashMap();
                     map.put("id", originalDateArchiveTreeContract.getId());
@@ -1094,7 +1094,7 @@ public class ArchiveTreeContractSyncImpl {
             }
         }
         for (ArchiveTreeContract newArchiveTreeContract : newDateArchiveTreeContractList) {
-            if (!originalDateArchiveTreeContractMap.containsKey(newArchiveTreeContract.getFullName())) {
+            if (!originalDateArchiveTreeContractMap.containsKey(Long.valueOf(newArchiveTreeContract.getFullName()))) {
                 insertions.add(newArchiveTreeContract);
             }
         }
@@ -1350,7 +1350,7 @@ public class ArchiveTreeContractSyncImpl {
             if(treeStructureEnum.getCode() == TreeStructureEnum.ORDINARY_TREE.getCode()){
                 archiveTreeContract = archiveTreeContractMap.get(archiveTreeContractVO.getExtKeyId());
             } else if(treeStructureEnum.getCode() == TreeStructureEnum.DATE_TREE.getCode()) {
-                archiveTreeContract = archiveTreeContractMap.get(archiveTreeContractVO.getFullName());
+                archiveTreeContract = archiveTreeContractMap.get(Long.valueOf(archiveTreeContractVO.getFullName()));
             }
             if(ObjectUtil.isNotEmpty(archiveTreeContract)){
                 archiveTreeContractVO.setId(archiveTreeContract.getId());