micord/evru-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/feature/SUPPORT-9570_pos' into develop

Browse source
This commit is contained in:
adel.ka 2025-11-14 17:41:26 +03:00
commit d642d42a53
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backend/src/main/java/ru/micord/ervu_dashboard/dao/AppealsDao.java
View file

@ -26,7 +26,10 @@ public class AppealsDao {
this.dslContext = dslContext; this.dslContext = dslContext;
} }
public void save(List<Map<String, String>> records) { public void replaceAll(List<Map<String, String>> records) {
dslContext.truncate(APPEALS_LIST)
.execute();
LocalDateTime uploadDate = LocalDateTime.now(); LocalDateTime uploadDate = LocalDateTime.now();
List<AppealsListRecord> appealRecords = new ArrayList<>(); List<AppealsListRecord> appealRecords = new ArrayList<>();
@ -38,8 +41,8 @@ public class AppealsDao {
appealRecords.add(appealRecord); appealRecords.add(appealRecord);
} }
} }
dslContext.batchMerge(appealRecords) dslContext.batchInsert(appealRecords)
.execute(); .execute();
} }
private Map<String, Object> createFieldsMap(Map<String, String> valueMap, LocalDateTime uploadDate) { private Map<String, Object> createFieldsMap(Map<String, String> valueMap, LocalDateTime uploadDate) {

4
backend/src/main/java/ru/micord/ervu_dashboard/service/AppealsFileUploadService.java
View file

@ -8,6 +8,7 @@ import java.util.*;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ru.micord.ervu_dashboard.dao.AppealsDao; import ru.micord.ervu_dashboard.dao.AppealsDao;
import ru.micord.ervu_dashboard.exception.FileUploadException; import ru.micord.ervu_dashboard.exception.FileUploadException;
@ -28,9 +29,10 @@ public class AppealsFileUploadService {
this.requiredHeaders = getRequiredHeaders(rawHeaders); this.requiredHeaders = getRequiredHeaders(rawHeaders);
} }
@Transactional
public void save(MultipartFile file) { public void save(MultipartFile file) {
List<Map<String, String>> maps = parseFile(file); List<Map<String, String>> maps = parseFile(file);
appealsDao.save(maps); appealsDao.replaceAll(maps);
} }
private List<Map<String, String>> parseFile(MultipartFile file) { private List<Map<String, String>> parseFile(MultipartFile file) {