From ca5b3d06f18f2f0583818ac55bc399ba9b73dc95 Mon Sep 17 00:00:00 2001 From: DyCTaTOR <125912249+DyCTaTOR@users.noreply.github.com> Date: Mon, 20 May 2024 20:50:40 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=B4=D0=BE?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20=D0=B8=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.mv.db | Bin 507904 -> 753664 bytes .../directions/api/DirectionsController.java | 2 +- .../directions/service/DirectionsService.java | 6 +- .../example/demo/news/api/NewsController.java | 62 +++++++++++------- src/main/resources/public/css/style.css | 2 +- src/main/resources/templates/new-edit.html | 45 +++++++++++++ src/main/resources/templates/news.html | 59 ++++++++++------- 7 files changed, 125 insertions(+), 51 deletions(-) diff --git a/data.mv.db b/data.mv.db index f725e335c490ec2d9b3a5aad1b5dce79367cdbcf..3a72557059652c1bfeb662fb37f70a6289ecf3e2 100644 GIT binary patch delta 58358 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 S2DmERRJEYrfyg+OTmL^WK=N+@ delta 3622 zcmcImYj6|S8NK_uyIRYZWDAWS1WP6k7=+o??&?+Jm?SuvOi7_F)Nu*JN?rvAupKZ2 z6DC#~20CrS#G&vtvCO??nVTYCntYk;GB^9`?EyU;Txs->9rWoB z8f!>hrLT|623dNQ-WS&rAviFHYnZ&wSiPpZwwAp#{c%kS_V*^^a+ez0mU+8f z5E0@oyRIOhrg9qvnJ0HQYl&>&6>$+u>k1s-kL%5vSuR{~C1i#?86n@1+9xP98~)hL zUWPMGTzi@7u->>?*R|~2GP;M(E(o#Ho!O`Q@q7lp;#mhcTe#a`%Srr0c(aAObyC>c zu@*{7!IjiG?HZ%Y9BWcofrmfA-f}HiL`DUwmGg^QehE#5 zmp0%UN`ax5IIp?CJfilBVQqXx)m%|kG`V!eXaw|Ot}3RNE}>bVha%Bfus4}p+o$&= z2jWtclFP})qvm6zP(llvBNcvm3ZE!%Lulq=WPYeuE@r7+!ZdnT0gM9m#a9RiQ!9=B z%g-TSts{cLuum!(F)bBZ43eXl!DF%x)G#(7i!FT5!QP-P2Ls3^y^ z@q~0UdC{Z^!9*xSsi+~9kf&;SXrn|8#aCDUDYU8A{)KdEwgra-N`j#tu4=}AuOgrh zQdJcb7Pe$F$rrLoH1~fKi66j|S26FnxYMGM)v^nn>})2}x0{8uixV0(tAmx2chO2{ z422aXRitstST9GY#Ez%@a{fNM^JT?qq);+a5Gri>DL=K?`3c!ZJCd}K(xM8{#=L2y z^O0X{L1_nrrr*=gVCus*IzgpPu*LF*`v@x*{aNlgZM1zp9EWPnYh z*w3fPM^5dAOp6eN+~*v2g~F-gt+Ebt|3)lP0%|E2m?BwXvzkRxRmpOUq-8^r7L#`D z;*Ubr4bDGE`O}EL?=D37bBJC-Y5*bnp}UBg5Ud}0+^z(3b4)NN^KA%c-X%4S@OhTh z9Kx4rL^TjDu9C|d$o!wvq>}ls$hba-cy`- zm8fyts^oA)QX-mMuqsN-9*^NlCZ8JVYn%v)llay=rkbP{fq~~w;ut(XfG5M*dcF*P z(!%+$38s{SYkP#<)Dfs|<${*sfZoc5#;6U;AlvO)MoIlcv^f0u1FpW}p? z`vhMeX5DIOHDSa|W7fxEhW!^g3+E|=KJu~zmF>e;r8Cu5Wg{I{<;Kj`Pa|P*tyRSx zc6GkC1epxED>spvLvBB*gdunHCIW36a)0f(UGF5%BV*5nPBPzyyz4|#)5!ar$!HFF zoA%scQRF?;W>Mrlma{1Go*-jFk@uYwWMPE7XA0i4m9o7jW_d`Y#Cu{zUZOgQkVMgY zVC-YoQQu|VqUH}A5nJXe(W)JfFt?%9b@Z;h>qITrQPgD8Ja5#Qu5(yCjA+u8^j9lS;iuSC z+mjn`5VpD*T&_qZXBs%Of#}qAh3M3^gmr@dQEX}N<mWEn=rmPTZQ-_^)sQE|B z?NIZ_E9_A7ce(6P^WWjNLoIN?Qxa-{?Ui<@1>UckDDWH-KiXMcTac|OaAC0Nm>1QK ztGXW2lX=mWGxa7&1LFx6o#3|p12`s_2_`9t7#x3ytD%?#x$ov~Q%P+-KWK8^0 nJZ<}>c+T!8hTxac$$7&%uNAtY*hr~jBZbwlriY4+M2Y_ZM6DQM diff --git a/src/main/java/com/example/demo/directions/api/DirectionsController.java b/src/main/java/com/example/demo/directions/api/DirectionsController.java index 4803438..19f2106 100644 --- a/src/main/java/com/example/demo/directions/api/DirectionsController.java +++ b/src/main/java/com/example/demo/directions/api/DirectionsController.java @@ -51,7 +51,7 @@ public class DirectionsController { @GetMapping public String getAllWithDepartment( - @RequestParam(name="PAGE_ATTRIBUTE", defaultValue = "0") int page, + @RequestParam(name=PAGE_ATTRIBUTE, defaultValue = "0") int page, Model model) { final Map attributes = PageAttributesMapper. toAttributes(directionsService.getAllWithDepartment(page, Constants.DEFAULT_PAGE_SIZE), this::toGroupedDto); diff --git a/src/main/java/com/example/demo/directions/service/DirectionsService.java b/src/main/java/com/example/demo/directions/service/DirectionsService.java index f45ffa4..eecafc3 100644 --- a/src/main/java/com/example/demo/directions/service/DirectionsService.java +++ b/src/main/java/com/example/demo/directions/service/DirectionsService.java @@ -6,6 +6,7 @@ import java.util.stream.StreamSupport; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -81,9 +82,8 @@ public class DirectionsService { return existsEntity; } - @Transactional + @Transactional(readOnly = true) public Page getAllWithDepartment(int page, int size) { - final Pageable pageRequest = PageRequest.of(page, size); - return repository.findAllWithDepartment(pageRequest); + return repository.findAllWithDepartment(PageRequest.of(page, size, Sort.by("id"))); } } diff --git a/src/main/java/com/example/demo/news/api/NewsController.java b/src/main/java/com/example/demo/news/api/NewsController.java index e6bb797..2b08ead 100644 --- a/src/main/java/com/example/demo/news/api/NewsController.java +++ b/src/main/java/com/example/demo/news/api/NewsController.java @@ -1,15 +1,20 @@ package com.example.demo.news.api; +import java.util.List; + import org.modelmapper.ModelMapper; +import org.modelmapper.TypeToken; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import com.example.demo.core.configuration.Constants; +import com.example.demo.department.api.DepartmentDto; import com.example.demo.department.service.DepartmentService; import com.example.demo.news.model.NewsEntity; import com.example.demo.news.service.NewsService; @@ -23,6 +28,7 @@ public class NewsController { private static final String NEWS_VIEW = "news"; private static final String NEWS_EDIT_VIEW = "new-edit"; private static final String NEWS_ATTRIBUTE = "news"; + private static final String DEPARTMENT_ATTRIBUTE = "departments"; private final NewsService newsService; private final ModelMapper modelMapper; private final DepartmentService departmentService; @@ -43,11 +49,9 @@ public class NewsController { return entity; } - // @GetMapping - // public List getAll(@RequestParam(name = "departmentId", defaultValue - // = "0") Long departmentId) { - // return newsService.getAll(departmentId).stream().map(this::toDto).toList(); - // } + private List getDepartments(){ + return modelMapper.map(departmentService.getAll(), new TypeToken>(){}.getType()); + } @GetMapping public String getAll(Model model) { @@ -56,14 +60,22 @@ public class NewsController { return NEWS_VIEW; } - @GetMapping("/{id}") - public NewsDto get(@PathVariable(name = "id") Long id) { - return toDto(newsService.get(id)); + @GetMapping("/edit/") + public String create(Model model) { + model.addAttribute(NEWS_ATTRIBUTE, new NewsDto()); + return NEWS_EDIT_VIEW; } - @PostMapping - public NewsDto create(@RequestBody @Valid NewsDto dto) { - return toDto(newsService.create(toEntity(dto))); + @PostMapping("/edit/") + public String create( + @ModelAttribute(name = NEWS_ATTRIBUTE) @Valid NewsDto newItem, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return NEWS_EDIT_VIEW; + } + newsService.create(toEntity(newItem)); + return Constants.REDIRECT_VIEW + URL; } @PostMapping("/delete/{id}") @@ -81,17 +93,23 @@ public class NewsController { throw new IllegalArgumentException(); } model.addAttribute(NEWS_ATTRIBUTE, toDto(newsService.get(id))); + model.addAttribute(DEPARTMENT_ATTRIBUTE, getDepartments()); return NEWS_EDIT_VIEW; } - // @PutMapping("/{id}") - // public NewsDto update(@PathVariable(name = "id") Long id, @RequestBody - // NewsDto dto) { - // return toDto(newsService.update(id, toEntity(dto))); - // } - - // @DeleteMapping("/{id}") - // public NewsDto delete(@PathVariable(name = "id") Long id) { - // return toDto(newsService.delete(id)); - // } + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @ModelAttribute(name = NEWS_ATTRIBUTE) @Valid NewsDto newItem, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return NEWS_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + newsService.update(id, toEntity(newItem)); + return Constants.REDIRECT_VIEW + URL; + } } diff --git a/src/main/resources/public/css/style.css b/src/main/resources/public/css/style.css index ba7619b..bd6781f 100644 --- a/src/main/resources/public/css/style.css +++ b/src/main/resources/public/css/style.css @@ -86,7 +86,7 @@ td form { } .mainSt { - color: #060647; + color: #008B8B; font-size: 50px; } diff --git a/src/main/resources/templates/new-edit.html b/src/main/resources/templates/new-edit.html index e69de29..362f8e6 100644 --- a/src/main/resources/templates/new-edit.html +++ b/src/main/resources/templates/new-edit.html @@ -0,0 +1,45 @@ + + + + + Редактировать новость + + + +

+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+
+ + +
+
+
+ + Отмена +
+
+
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/news.html b/src/main/resources/templates/news.html index 54852d0..838eeff 100644 --- a/src/main/resources/templates/news.html +++ b/src/main/resources/templates/news.html @@ -13,31 +13,42 @@ Новости
- Добавить новость -
-
-
-
- -
- - -
- - - -
-
- - - -
- -
-
-
+ Добавить новость
+ + + + + + + + + + + + + + + + + + + + +
IDЗаголовокОписание
+
+ +
+ 		+
+ +
+