sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

故障录波修改

Browse Source
This commit is contained in:
huguanghan 2024-12-11 17:28:12 +08:00
parent 3390d22e98
commit 03cd293c13
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
das/src/main/java/com/das/modules/fdr/service/MinioViewsServcie.java
View File

@ -161,7 +161,7 @@ public class MinioViewsServcie {
lastModifyTime = zonedDateTime.format(dateFormat); lastModifyTime = zonedDateTime.format(dateFormat);
} }
if (parts.length > 0) { if (parts.length > 0) {
String nodeName = parts[2]; String nodeName = parts[1];
int type = isDir ? 0 : 1; int type = isDir ? 0 : 1;
itemName= isDir ? itemName.substring(0,itemName.lastIndexOf("/")) : itemName; itemName= isDir ? itemName.substring(0,itemName.lastIndexOf("/")) : itemName;
FileNode node = new FileNode(nodeName, type,size,lastModifyTime,"/"+itemName); FileNode node = new FileNode(nodeName, type,size,lastModifyTime,"/"+itemName);

19
das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
View File

@ -9,13 +9,11 @@ import com.das.common.exceptions.ServiceException;
import com.das.common.utils.ExcelUtil; import com.das.common.utils.ExcelUtil;
import com.das.common.utils.HuExcelUtils; import com.das.common.utils.HuExcelUtils;
import com.das.modules.auth.domain.vo.SysUserVo; 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.domain.entity.TheoreticalPowerCurveEntity;
import com.das.modules.curve.mapper.TheoreticalPowerCurveMapper; import com.das.modules.curve.mapper.TheoreticalPowerCurveMapper;
import com.das.modules.equipment.domain.excel.SheetInfoBean; import com.das.modules.equipment.domain.excel.SheetInfoBean;
import com.das.modules.equipment.entity.SysEquipment; import com.das.modules.equipment.entity.SysEquipment;
import com.das.modules.equipment.mapper.SysEquipmentMapper; 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.FileNode;
import com.das.modules.fdr.domain.SysFaultCodeDict; import com.das.modules.fdr.domain.SysFaultCodeDict;
import com.das.modules.fdr.domain.SysFaultRecordingDesc; import com.das.modules.fdr.domain.SysFaultRecordingDesc;
@ -38,7 +36,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.*; import java.io.*;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.rmi.ServerException;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
@ -71,9 +68,9 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
@Override @Override
public List<FileNode> getDirOrFileList(String fileType,String name, String startTime, String endTime) { public List<FileNode> getDirOrFileList(String fileType,String name, String startTime, String endTime) {
List<FileNode> fileResult = new ArrayList<>(); List<FileNode> fileResult = new ArrayList<>();
List<String> monthsBetween = getMonthsBetween(startTime, endTime); List<String> daysBetween = getDaysBetween(startTime, endTime);
for (String item : monthsBetween) { for (String item : daysBetween) {
String directoryName = name + FileConstants.FILE_SEPARATOR + fileType + FileConstants.FILE_SEPARATOR + item.substring(0, item.indexOf("-")) + FileConstants.FILE_SEPARATOR + item.substring(item.indexOf("-") + 1); String directoryName = name + FileConstants.FILE_SEPARATOR + fileType + FileConstants.FILE_SEPARATOR + item;
List<FileNode> fileTree = minioViewsServcie.getFileTree(directoryName); List<FileNode> fileTree = minioViewsServcie.getFileTree(directoryName);
fileResult.addAll(fileTree); fileResult.addAll(fileTree);
} }
@ -154,18 +151,18 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
} }
private List<String> getMonthsBetween(String startTime, String endTime) { private List<String> getDaysBetween(String startTime, String endTime) {
List<String> months = new ArrayList<>(); List<String> months = new ArrayList<>();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDate start = LocalDate.parse(startTime + "-01", formatter); LocalDate start = LocalDate.parse(startTime, formatter);
LocalDate end = LocalDate.parse(endTime + "-01", formatter); LocalDate end = LocalDate.parse(endTime, formatter);
DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyy-MM"); DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
while (!start.isAfter(end)) { while (!start.isAfter(end)) {
months.add(start.format(monthFormatter)); months.add(start.format(monthFormatter));
start = start.plusMonths(1); start = start.plusDays(1);
} }
return months; return months;
} }