From 03cd293c135df2e71f7a4193c1e6e0b08cba7808 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Wed, 11 Dec 2024 17:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=BD=95=E6=B3=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fdr/service/MinioViewsServcie.java | 2 +- .../impl/FaultRecorderServiceImpl.java | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java b/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java index af3372af..0a81db32 100644 --- a/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java +++ b/das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java @@ -161,7 +161,7 @@ public class MinioViewsServcie { lastModifyTime = zonedDateTime.format(dateFormat); } if (parts.length > 0) { - String nodeName = parts[2]; + String nodeName = parts[1]; int type = isDir ? 0 : 1; itemName= isDir ? itemName.substring(0,itemName.lastIndexOf("/")) : itemName; FileNode node = new FileNode(nodeName, type,size,lastModifyTime,"/"+itemName); diff --git a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java index 17c86d0f..024b257d 100644 --- a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java +++ b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java @@ -9,13 +9,11 @@ import com.das.common.exceptions.ServiceException; import com.das.common.utils.ExcelUtil; import com.das.common.utils.HuExcelUtils; import com.das.modules.auth.domain.vo.SysUserVo; -import com.das.modules.curve.domain.entity.CurveItemEntity; import com.das.modules.curve.domain.entity.TheoreticalPowerCurveEntity; import com.das.modules.curve.mapper.TheoreticalPowerCurveMapper; import com.das.modules.equipment.domain.excel.SheetInfoBean; import com.das.modules.equipment.entity.SysEquipment; import com.das.modules.equipment.mapper.SysEquipmentMapper; -import com.das.modules.fdr.config.MinioProperties; import com.das.modules.fdr.domain.FileNode; import com.das.modules.fdr.domain.SysFaultCodeDict; import com.das.modules.fdr.domain.SysFaultRecordingDesc; @@ -38,7 +36,6 @@ import org.springframework.web.multipart.MultipartFile; import java.io.*; import java.nio.file.Files; import java.nio.file.Path; -import java.rmi.ServerException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; @@ -71,9 +68,9 @@ public class FaultRecorderServiceImpl implements FaultRecorderService { @Override public List getDirOrFileList(String fileType,String name, String startTime, String endTime) { List fileResult = new ArrayList<>(); - List monthsBetween = getMonthsBetween(startTime, endTime); - for (String item : monthsBetween) { - String directoryName = name + FileConstants.FILE_SEPARATOR + fileType + FileConstants.FILE_SEPARATOR + item.substring(0, item.indexOf("-")) + FileConstants.FILE_SEPARATOR + item.substring(item.indexOf("-") + 1); + List daysBetween = getDaysBetween(startTime, endTime); + for (String item : daysBetween) { + String directoryName = name + FileConstants.FILE_SEPARATOR + fileType + FileConstants.FILE_SEPARATOR + item; List fileTree = minioViewsServcie.getFileTree(directoryName); fileResult.addAll(fileTree); } @@ -154,18 +151,18 @@ public class FaultRecorderServiceImpl implements FaultRecorderService { } - private List getMonthsBetween(String startTime, String endTime) { + private List getDaysBetween(String startTime, String endTime) { List months = new ArrayList<>(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDate start = LocalDate.parse(startTime + "-01", formatter); - LocalDate end = LocalDate.parse(endTime + "-01", formatter); + LocalDate start = LocalDate.parse(startTime, formatter); + LocalDate end = LocalDate.parse(endTime, formatter); - DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyy-MM"); + DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd"); while (!start.isAfter(end)) { months.add(start.format(monthFormatter)); - start = start.plusMonths(1); + start = start.plusDays(1); } return months; }