suntianwu vor 3 Jahren
Ursprung
Commit
5849b4c309

+ 4 - 6
src/main/java/com/iden/bms/face/FaceIdenService.java

@@ -83,10 +83,8 @@ public class FaceIdenService {
                 String personImageDir = idenRoot + "data/final/person/image";
 
                 //递归获取人员图像目录下的图像文件
-                List<File> imgPersonFileList = new ArrayList<>();
-                imgPersonFileList = FileUtil.getFiles(new File(personImageDir),imgPersonFileList);
-                File[] imgPersonFiles = new File[imgPersonFileList.size()];
-                imgPersonFiles = imgPersonFileList.toArray(imgPersonFiles);
+                File[] imgPersonFiles = FileUtil.getFiles(personImageDir);
+
                 logger.info("FaceIdenService.handleCameraImage 2...");
                 FaceMonitor faceMonitorPerson = null;
                 if(imgPersonFiles.length > 0){
@@ -259,9 +257,9 @@ public class FaceIdenService {
         String photographTime = imgFileName.substring(0, imgFileName.indexOf("_"));
         Long photographTimeLong = DateUtils.strToDate(photographTime,"yyyyMMddHHmmss").getTime();
         //获取data/final/camera/image下图片
-        File originImageDirFile = new File(idenRoot + "data/final/camera/image");
+        String originImageDir= idenRoot + "data/final/camera/image";
         logger.info("FaceIdenService.isContinuation ...2");
-        File[] imgFiles = originImageDirFile.listFiles();
+        File[] imgFiles =  FileUtil.getFiles(originImageDir);
          List<String> featPtrList = new ArrayList<>();
         if (imgFiles != null && imgFiles.length > 0) {
             for(File imgFile : imgFiles) {

+ 10 - 1
src/main/java/com/iden/common/util/FileUtil.java

@@ -31,11 +31,20 @@ public class FileUtil {
         return fileList.toArray(filesNew);
     }
 
+
     /**
      * 递归 获取目录下所有文件
      * @return
      */
-    public static List<File> getFiles (File dirFile,List<File> resultFiles){
+    public static File[] getFiles (String dir){
+        List<File> imgPersonFileList = new ArrayList<>();
+        imgPersonFileList = FileUtil.getFiles(new File(dir),imgPersonFileList);
+        File[] imgPersonFiles = new File[imgPersonFileList.size()];
+        imgPersonFiles = imgPersonFileList.toArray(imgPersonFiles);
+        return imgPersonFiles;
+    }
+
+    private static List<File> getFiles (File dirFile,List<File> resultFiles){
         File[] files = dirFile.listFiles();
         if(files == null || files.length == 0){
             return resultFiles;// 判断目录下是不是空的