diff --git a/README.md b/README.md index f390ac2..7f43452 100644 --- a/README.md +++ b/README.md @@ -106,3 +106,19 @@ CHECK (status IN ( 'TEMP' )); +------- +Записи для лимитов поиска + +INSERT INTO protect_check (user_id, limit_check, count_checked, last_check_at, version) +SELECT +u.id, +100, -- limit_check = 100 +0, -- count_checked = 0 +NULL, -- last_check_at = NULL +0 -- version = 0 +FROM users u +WHERE NOT EXISTS ( +SELECT 1 +FROM protect_check pc +WHERE pc.user_id = u.id +); diff --git a/src/main/java/ru/soune/nocopy/service/ImageHashService.java b/src/main/java/ru/soune/nocopy/service/ImageHashService.java index 672bf78..0d1bbd6 100644 --- a/src/main/java/ru/soune/nocopy/service/ImageHashService.java +++ b/src/main/java/ru/soune/nocopy/service/ImageHashService.java @@ -24,7 +24,9 @@ public class ImageHashService { public Map calculateHash(Path imagePath) throws IOException { File file = imagePath.toFile(); + PHash pHash = PerceptualHashHelper.INSTANCE.generateDCTPerceptualHash(file); + Long firstPart = pHash.getFirstPart(); Long secondPart = pHash.getSecondPart(); Map hash = Map.of( diff --git a/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java b/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java index 8f02cee..de0c4aa 100644 --- a/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java +++ b/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java @@ -358,11 +358,13 @@ public class FileUploadServiceImpl implements FileUploadService { private String assembleFileSynchronously(FileUploadSession session) throws IOException { Path finalFilePath = prepareFinalFile(session); - + log.info("file path: " + finalFilePath); validateAllChunksExist(session); + log.info("validateAllChunksExist : " + session); mergeChunksToFile(session, finalFilePath); + log.info("mergeChunksToFile: " + session); validateFinalFile(session, finalFilePath); - + log.info("finalFilePath: " + finalFilePath); return finalFilePath.toString(); }