etreschenkov 2026-02-19 15:17:23 +03:00
parent 5e984bd628
commit 8233617d66
4 changed files with 5 additions and 4 deletions

View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>ru.nbch</groupId> <groupId>ru.nbch</groupId>
<artifactId>credit-tracker</artifactId> <artifactId>credit-tracker</artifactId>
<version>2.21.5</version> <version>2.21.7</version>
<name>credit_tracker</name> <name>credit_tracker</name>
<description>Credit Tracker Application</description> <description>Credit Tracker Application</description>

View file

@ -196,7 +196,7 @@ public class MonitoringService {
String.format("%s_%s_%s.xml", String.format("%s_%s_%s.xml",
commonMembercode, commonMembercode,
userPackage.getPackageName(), userPackage.getPackageName(),
CTUtil.getDateFromReportFileName(reportName)) LocalDateTime.now().format(CTUtil.responseReportDateTimeFormatter))
)); ));
MonitoringSignalResponse response = new MonitoringSignalResponse(); MonitoringSignalResponse response = new MonitoringSignalResponse();

View file

@ -17,7 +17,7 @@ import ru.nbch.credit_tracker.entities.indic.Id;
public class CTUtil { public class CTUtil {
private static final DateTimeFormatter onlineReportDateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss"); private static final DateTimeFormatter onlineReportDateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss");
private static final DateTimeFormatter responseReportDateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss"); public static final DateTimeFormatter responseReportDateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss");
public static LocalDateTime parseDateFromReportFileName(String reportFileName) { public static LocalDateTime parseDateFromReportFileName(String reportFileName) {

View file

@ -17,6 +17,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@Slf4j @Slf4j
@ -94,7 +95,7 @@ public class ZipUtils {
public static Path zipFile(Path fileForZip) throws IOException { public static Path zipFile(Path fileForZip) throws IOException {
String fileName = fileForZip.getFileName().toString(); String fileName = fileForZip.getFileName().toString();
Path zipFilePath = fileForZip.getParent().resolve(fileName + ".zip"); Path zipFilePath = fileForZip.getParent().resolve(FilenameUtils.removeExtension(fileName) + ".zip");
try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(fileForZip), 8 * 1024 * 1024); try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(fileForZip), 8 * 1024 * 1024);
BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(zipFilePath.toString())); BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(zipFilePath.toString()));
ZipOutputStream zos = new ZipOutputStream(bos)) { ZipOutputStream zos = new ZipOutputStream(bos)) {