0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлен вывод позиций найденных паттернов

Browse Source
This commit is contained in:
serega6531
2019-11-24 23:06:39 +03:00
parent 56e84f6566
commit 9b5a61f023
10 changed files with 127 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/ru/serega6531/packmate/controller/StreamController.java
View File

@@ -2,27 +2,21 @@ package ru.serega6531.packmate.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import ru.serega6531.packmate.model.CtfService;
import ru.serega6531.packmate.model.Pagination;
import ru.serega6531.packmate.model.Stream;
import ru.serega6531.packmate.service.ServicesService;
import ru.serega6531.packmate.service.StreamService;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@RestController
@RequestMapping("/api/stream/")
public class StreamController {
private final StreamService streamService;
private final ServicesService servicesService;
@Autowired
public StreamController(StreamService streamService, ServicesService servicesService) {
public StreamController(StreamService streamService) {
this.streamService = streamService;
this.servicesService = servicesService;
}
@PostMapping("/all")
@@ -36,15 +30,10 @@ public class StreamController {
@PostMapping("/{port}")
public List<Stream> getStreams(@PathVariable int port, @RequestBody Pagination pagination) {
final Optional<CtfService> serviceOptional = servicesService.findByPort(port);
if (serviceOptional.isPresent()) {
if (pagination.isFavorites()) {
return streamService.findFavoritesByService(pagination, serviceOptional.get());
} else {
return streamService.findAllByService(pagination, serviceOptional.get());
}
if (pagination.isFavorites()) {
return streamService.findFavoritesByService(pagination, port);
} else {
return Collections.emptyList();
return streamService.findAllByService(pagination, port);
}
}