diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java index d1d61034..f6240349 100644 --- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java @@ -9,6 +9,7 @@ import com.xujie.sys.modules.reader.entity.EquipmentFolderLocation; import com.xujie.sys.modules.reader.service.EquipmentFolderLocationService; import com.xujie.sys.modules.reader.service.GetInformationForExcelService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,6 +36,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl locationList = equipmentFolderLocationService.list(); + if(CollectionUtils.isEmpty(locationList)){ + return; + } //创建线程池 ExecutorService executorService = Executors.newFixedThreadPool(locationList.size());//线程池的最大数量为文件夹的个数 for (EquipmentFolderLocation excel : locationList) { @@ -58,6 +62,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl equipmentDataDetails =new ArrayList<>(); //获取文件夹下所有文件 List files=getExcelFiles(folderFiler); + if(CollectionUtils.isEmpty(files)){ + return; + } //创建一个list用来存储所有的的excel文件路径 List fileName = new ArrayList<>(); for (File file : files) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e34efbef..03b3415b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -46,7 +46,7 @@ task: data: site: 2,3 #事业部 eamWorkPlanTime: 0 0 0 * * ? #点检、维保计划自动生成,每天0点执行 - getExcelInformation: 0/10 * * * * ? #每五秒读取一次文件 + getExcelInformation: 0/10 * * * * ? #每十秒读取一次文件 #--------------------------------------------接口地址和开关控制-------------------------------------------------