backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev fix add count
Test Workflow / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
backdev
2026-04-28 15:41:57 +07:00
parent 7adb52d86f
commit 61e47975ff
5 changed files with 82 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/controller/GlobalSearchController.java
+56 -14
View File
@@ -2,12 +2,14 @@ package ru.soune.nocopy.controller;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import ru.soune.nocopy.dto.search.GlobalSearchStartRequest; import ru.soune.nocopy.dto.search.GlobalSearchStartRequest;
import ru.soune.nocopy.dto.search.GlobalSearchStartResponse; import ru.soune.nocopy.dto.search.GlobalSearchStartResponse;
import ru.soune.nocopy.dto.search.GlobalSearchStatusResponse; import ru.soune.nocopy.dto.search.GlobalSearchStatusResponse;
import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO; import ru.soune.nocopy.dto.violation.FileViolationSummaryDTO;
import ru.soune.nocopy.dto.violation.ViolationRequest;
import ru.soune.nocopy.entity.file.FileEntity; import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.nocopy.entity.search.GlobalSearchTask; import ru.soune.nocopy.entity.search.GlobalSearchTask;
import ru.soune.nocopy.entity.search.SearchStatus; import ru.soune.nocopy.entity.search.SearchStatus;
@@ -17,6 +19,9 @@ import ru.soune.nocopy.service.register.AuthService;
import ru.soune.nocopy.service.search.GlobalSearchService; import ru.soune.nocopy.service.search.GlobalSearchService;
import ru.soune.nocopy.service.violation.ViolationService; import ru.soune.nocopy.service.violation.ViolationService;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.*; import java.util.*;
@Slf4j @Slf4j
@@ -105,33 +110,61 @@ public class GlobalSearchController {
return ResponseEntity.ok(taskOptional.get()); return ResponseEntity.ok(taskOptional.get());
} }
@GetMapping("/violation-summary") // @GetMapping("/violation-summary")
public ResponseEntity<?> getSummary(@RequestHeader(value = "Authorization", required = false) String tokenHeader) { // public ResponseEntity<?> getSummary(@RequestHeader(value = "Authorization", required = false) String tokenHeader) {
//
// if (tokenHeader == null || tokenHeader.isBlank()) {
// Map<String, Object> errorData = new HashMap<>();
// errorData.put("token", tokenHeader);
//
// return ResponseEntity.ok().body(Map.of("error", errorData));
// }
//
// List<FileViolationSummaryDTO> fileViolationsSummary;
//
// try {
// Long userId = authService.useUserAuthToken(tokenHeader);
//
// fileViolationsSummary =
// violationService.getFileViolationsSummary(userId);
//
// if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found");
// } catch (NotFoundAuthToken e) {
// Map<String, Object> errorData = new HashMap<>();
// errorData.put("token", tokenHeader);
//
// return ResponseEntity.ok().body(Map.of("error", errorData));
// }
//
// return ResponseEntity.ok(fileViolationsSummary);
// }
if (tokenHeader == null || tokenHeader.isBlank()) {
@PostMapping("/violations")
public ResponseEntity<?> getViolations(@RequestBody ViolationRequest request) {
if (request.getToken() == null || request.getToken().isBlank()) {
Map<String, Object> errorData = new HashMap<>(); Map<String, Object> errorData = new HashMap<>();
errorData.put("token", tokenHeader); errorData.put("token", request.getToken());
return ResponseEntity.ok().body(Map.of("error", errorData)); return ResponseEntity.ok().body(Map.of("error", errorData));
} }
List<FileViolationSummaryDTO> fileViolationsSummary;
try { try {
Long userId = authService.useUserAuthToken(tokenHeader); Long userId = authService.useUserAuthToken(request.getToken());
fileViolationsSummary = LocalDateTime start = parseDate(request.getStartDate());
violationService.getFileViolationsSummary(userId); LocalDateTime end = parseDate(request.getEndDate());
if (fileViolationsSummary.isEmpty()) return ResponseEntity.ok().body("Violations summary not found"); Page<FileViolationSummaryDTO> result = violationService.getFileViolationsSummary(
userId, request.getFileName(), request.getSortDirection(),
request.getPage(), request.getSize(), start, end);
return ResponseEntity.ok(result);
} catch (NotFoundAuthToken e) { } catch (NotFoundAuthToken e) {
Map<String, Object> errorData = new HashMap<>(); Map<String, Object> errorData = new HashMap<>();
errorData.put("token", tokenHeader); errorData.put("token", request.getToken());
return ResponseEntity.ok().body(Map.of("error", errorData)); return ResponseEntity.ok().body(Map.of("error", errorData));
} }
return ResponseEntity.ok(fileViolationsSummary);
} }
@GetMapping("/status/{taskId}") @GetMapping("/status/{taskId}")
@@ -170,4 +203,13 @@ public class GlobalSearchController {
return ResponseEntity.ok(response); return ResponseEntity.ok(response);
} }
private LocalDateTime parseDate(String dateStr) {
try {
return LocalDateTime.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
} catch (DateTimeParseException e) {
log.error(e.getMessage());
return null;
}
}
} }
src/main/java/ru/soune/nocopy/dto/violation/ViolationRequest.java
+3
View File
@@ -39,4 +39,7 @@ public class ViolationRequest {
@JsonProperty("token") @JsonProperty("token")
private String token; private String token;
@JsonProperty("fileName")
private String fileName = null;
} }
src/main/java/ru/soune/nocopy/handler/ViolationStatisticsHandler.java
-132
View File
@@ -31,138 +31,6 @@ public class ViolationStatisticsHandler implements RequestHandler {
@Override @Override
public BaseResponse handle(BaseRequest request) throws Exception { public BaseResponse handle(BaseRequest request) throws Exception {
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
log.info("start find violation statistic");
ViolationStatisticsRequest statRequest = objectMapper.convertValue(request.getMessageBody(), ViolationStatisticsRequest statRequest = objectMapper.convertValue(request.getMessageBody(),
ViolationStatisticsRequest.class); ViolationStatisticsRequest.class);
src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java
+4
View File
@@ -48,6 +48,10 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%") @Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword); List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
@Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
List<FileEntity> searchByFileNameAndStatusIn(@Param("userId") Long userId, @Param("keyword") String keyword,
List<FileStatus> statuses);
@Query("SELECT f FROM FileEntity f WHERE f.status = :status") @Query("SELECT f FROM FileEntity f WHERE f.status = :status")
List<FileEntity> searchFileEntityByStatus(@Param("status") FileStatus status); List<FileEntity> searchFileEntityByStatus(@Param("status") FileStatus status);
src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
+19 -1
View File
@@ -111,6 +111,24 @@ public class FileEntityService {
return allFiles; return allFiles;
} }
public List<FileEntity> getAllUserFilesWithFileName(Long userId, String fileName, List<FileStatus> statuses) {
User user = userRepository.findById(userId).orElseThrow();
List<FileEntity> allFiles = new ArrayList<>();
if (user.getCompany() != null) {
for (Long uId : userRepository.findByCompanyId(user.getCompany().getId()).stream()
.map(User::getId)
.toList()) {
allFiles.addAll(fileEntityRepository.searchByFileNameAndStatusIn(uId, fileName, statuses));
}
} else {
allFiles = fileEntityRepository.searchByFileNameAndStatusIn(userId, fileName, statuses);
}
return allFiles;
}
@Transactional(readOnly = true) @Transactional(readOnly = true)
public FileResponse getUserFiles(Long userId, Pageable pageable, int version) { public FileResponse getUserFiles(Long userId, Pageable pageable, int version) {
User user = userRepository.findById(userId).orElseThrow(); User user = userRepository.findById(userId).orElseThrow();
@@ -256,7 +274,7 @@ public class FileEntityService {
channel.force(true); channel.force(true);
} }
if (imageResizeService.isImage(extension)) { if (fileEntity.getMimeType().equals("image")) {
imageResizeService.generateSizes(fileEntity, data); imageResizeService.generateSizes(fileEntity, data);
} }