소스 검색

修改代码

wanghc 3 년 전
부모
커밋
0f2a92dc0d
1개의 변경된 파일4개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 5
      ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/FileAnalysisService.java

+ 4 - 5
ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/FileAnalysisService.java

@@ -2,7 +2,6 @@ package com.jiayue.ipfcst.console.service;
 
 import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
 import com.jiayue.ipfcst.common.core.util.NumberUtils;
-import com.jiayue.ipfcst.common.data.constant.enums.HolidayTypeEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.PredictionModelEnum;
 import com.jiayue.ipfcst.common.data.entity.*;
 import com.jiayue.ipfcst.common.data.repository.ElectricFieldRepository;
@@ -128,10 +127,12 @@ public class FileAnalysisService extends BaseService {
       if (!filePath.exists()) {
         filePath.mkdirs();
       }
+      log.info("文件路径"+filePath);
       Collection<File> files = FileUtils.listFiles(filePath, new String[]{"RB"}, false);
+      log.info("文件个数"+files.size());
       String dayStr = new SimpleDateFormat("yyyyMMdd").format(new Date());//当前时间格式化为年月日
-      if (files.isEmpty()) {
-        for (File file : files) {
+        if (!files.isEmpty()) {
+          for (File file : files) {
           flag = false;
           String fileName = file.getName();
           if (!fileName.contains(dayStr)) {
@@ -143,7 +144,6 @@ public class FileAnalysisService extends BaseService {
               log.info(deleteFilelog,e2);
             }
           }
-          if (fileName.length() < 30) {
             if (file.getName().startsWith("DQ")) {
               try {
                 List<ForecastPowerShortTerm> listDq = fileAnalysisShortTerm(file, currentDate, stationCode);
@@ -252,7 +252,6 @@ public class FileAnalysisService extends BaseService {
               moveFileError(file);
             }
           }
-        }
       }
       log.info("-----------------执行文件解析任务完成----------------------");
     }