romanov73/seminar
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases 1 Wiki Activity

meetings #8

Merged
romanov73 merged 10 commits from 7-meetings into master 2022-03-18 11:14:19 +04:00
Conversation 1 Commits 10 Files Changed 42 +8 -11
7 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a553a3330 - Show all commits

BIN
data/db.mv.db
View File

Binary file not shown.

2
src/main/java/ru/ulstu/controller/IndexController.java
View File

@ -9,7 +9,7 @@ package ru.ulstu.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import ru.ulstu.service.NewsService; import ru.ulstu.news.NewsService;
@Controller @Controller
public class IndexController { public class IndexController {

2
src/main/java/ru/ulstu/meeting/MeetingService.java
View File

@ -3,7 +3,7 @@ package ru.ulstu.meeting;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.service.NewsService; import ru.ulstu.news.NewsService;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;

3
src/main/java/ru/ulstu/model/News.java → src/main/java/ru/ulstu/news/News.java
View File

@ -1,7 +1,8 @@
package ru.ulstu.model; package ru.ulstu.news;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ru.ulstu.model.BaseEntity;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Lob; import javax.persistence.Lob;

4
src/main/java/ru/ulstu/controller/NewsController.java → src/main/java/ru/ulstu/news/NewsController.java
View File

@ -4,7 +4,7 @@
* *
*/ */
package ru.ulstu.controller; package ru.ulstu.news;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.security.access.annotation.Secured; import org.springframework.security.access.annotation.Secured;
@ -17,10 +17,8 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import ru.ulstu.model.News;
import ru.ulstu.model.OffsetablePageRequest; import ru.ulstu.model.OffsetablePageRequest;
import ru.ulstu.model.UserRoleConstants; import ru.ulstu.model.UserRoleConstants;
import ru.ulstu.service.NewsService;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;

3
src/main/java/ru/ulstu/repository/NewsRepository.java → src/main/java/ru/ulstu/news/NewsRepository.java
View File

@ -1,9 +1,8 @@
package ru.ulstu.repository; package ru.ulstu.news;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import ru.ulstu.model.News;
import java.util.List; import java.util.List;

5
src/main/java/ru/ulstu/service/NewsService.java → src/main/java/ru/ulstu/news/NewsService.java
View File

@ -1,10 +1,9 @@
package ru.ulstu.service; package ru.ulstu.news;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.model.News; import ru.ulstu.service.FileUtil;
import ru.ulstu.repository.NewsRepository;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.IOException; import java.io.IOException;