wanger 1 сар өмнө
parent
commit
de862a44e1

+ 7 - 2
onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/utils/StringUtils.java

@@ -945,14 +945,18 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
                             foldername = name;
                             System.out.println("first folder === " + name);
                             break; // 找到第一个文件夹后退出循环
+                        } else {
+                            System.out.println("The directory name length <= 6  === " + name);
                         }
+                    } else {
+                        System.out.println("The file is not a directory === " + file.getName());
                     }
                 }
             } else {
-                System.out.println("该目录为空或无法访问。");
+                System.out.println("The directory is empty or cannot be accessed.。");
             }
         } else {
-            System.out.println("指定的路径不是一个有效的目录。");
+            System.out.println("The specified path is not a valid directory。");
         }
         return foldername;
     }
@@ -971,6 +975,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 
     /**
      * 判断字符串是否为整型
+     *
      * @param str
      * @return
      */

+ 2 - 2
onemap-modules/onemap-api/src/main/java/com/onemap/api/service/impl/ResultsServiceImpl.java

@@ -244,7 +244,7 @@ public class ResultsServiceImpl implements ResultsService {
             return RequestResult.error(String.format("成果分片总数(%s)与上传片文件数量(%s)不符", qxsbcg.getTotal(), fplist.size()));
         }
         String folder = String.format("%s旗县成果上报\\%s\\%s\\%s\\", tempfolder, user.getXzqdm(), qxsbcg.getGhlx(), md5);
-        loginfo("准备合包:" + folder);
+        loginfo("ready merge:" + folder);
         List<String> filelist = new ArrayList<>();
         for (Qxcgsbrwfp cur : fplist) {
             filelist.add(cur.getPath());
@@ -252,7 +252,7 @@ public class ResultsServiceImpl implements ResultsService {
         String targetfilepath = folder + "" + filename;
         try {
             mergeZipFiles(filelist, targetfilepath);
-            loginfo("完成合包:" + folder);
+            loginfo("complate merge:" + targetfilepath);
         } catch (IOException e) {
             e.printStackTrace();
 //            qxsbcg.setRwzt(rwzt.getHbsb());