From fda151baff74e47f2b6ae80b17008451b9e345d9 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Tue, 8 Mar 2022 21:21:08 +0400 Subject: [PATCH 1/6] #1 -- add config for db --- build.gradle | 6 +++++- data/db.mv.db | Bin 0 -> 16384 bytes .../ru/ulstu/controller/IndexController.java | 10 +++++++++- src/main/java/ru/ulstu/model/News.java | 2 +- src/main/resources/application.properties | 8 ++++++++ src/main/resources/public/css/main.css | 6 +----- src/main/resources/static/favicon.ico | Bin 0 -> 8801 bytes src/main/resources/templates/index.html | 4 ++-- 8 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 data/db.mv.db create mode 100644 src/main/resources/static/favicon.ico diff --git a/build.gradle b/build.gradle index 309b542..f103d3e 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,11 @@ dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf' implementation group: 'org.slf4j', name: 'slf4j-api', version: versionSLF4J implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect' - implementation group: 'org.javassist', name: 'javassist', version: '3.25.0-GA' + implementation group: 'org.springframework.boot', name:'spring-boot-starter-data-jpa' + implementation group: 'com.h2database', name:'h2' + implementation group: 'javax.xml.bind', name:'jaxb-api' + implementation group: 'org.javassist', name:'javassist' + implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: versionJetty implementation group: 'org.webjars', name: 'jquery', version: '3.6.0' diff --git a/data/db.mv.db b/data/db.mv.db new file mode 100644 index 0000000000000000000000000000000000000000..8505c2cdaa6406a2030df0b887d6d42e05aec188 GIT binary patch literal 16384 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index aaecabd..704e018 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -21,10 +21,10 @@
-
+
From d490fb813300d18352cb14b84d59a2f468212c7a Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Tue, 8 Mar 2022 21:28:49 +0400 Subject: [PATCH 2/6] #1 -- fix favicon --- data/db.mv.db | Bin 16384 -> 20480 bytes src/main/resources/static/favicon.ico | Bin 8801 -> 305822 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/data/db.mv.db b/data/db.mv.db index 8505c2cdaa6406a2030df0b887d6d42e05aec188..9e8355995daf126bb0ce886b8decd179ae7cc0e3 100644 GIT binary patch delta 899 zcmb7?O-tNB7{_-a-NI_Cpok!rtkm1EJTsY1*13ruq_j|I^&l!_lUWU}lXW){@wA{9 zy|nI7dMcEDfP(jagnpMoKS3wEdGYPgy<{ebC*EdRE?&m^-Sm0i27qLl!sSGeIxtE7c_u*HA_up0^W#a z+!KBpGkRHzw$nH(52km5zoL;mE2U# zAN*#^)?T-Mz{~*3yE!3#)ZbW~S(+VQ|0|Nu9EWR+QF%K wr?*HiQF48sY>=9T)y0Pe(xSl3p*@DfN@JwZZ)k;|rxJyQk^-twXcr3q0UInDzyJUM delta 266 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 literal 8801 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 From 5efcaa1a3ca9281178566468bc65eddf8bc4c772 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Wed, 9 Mar 2022 00:10:50 +0400 Subject: [PATCH 3/6] #1 -- add some business logic --- build.gradle | 7 +- data/db.mv.db | Bin 20480 -> 24576 bytes .../ulstu/configuration/MvcConfiguration.java | 3 +- .../ru/ulstu/controller/IndexController.java | 24 ++--- .../ru/ulstu/controller/NewsController.java | 37 ++++++++ src/main/java/ru/ulstu/model/BaseEntity.java | 83 ++++++++++++++++++ src/main/java/ru/ulstu/model/News.java | 32 +++++-- .../ru/ulstu/repository/NewsRepository.java | 7 ++ .../java/ru/ulstu/service/NewsService.java | 45 ++++++++++ src/main/resources/static/favicon.ico | Bin 305822 -> 15406 bytes src/main/resources/templates/default.html | 8 +- src/main/resources/templates/editNews.html | 26 ++++++ src/main/resources/templates/index.html | 4 - 13 files changed, 243 insertions(+), 33 deletions(-) create mode 100644 src/main/java/ru/ulstu/controller/NewsController.java create mode 100644 src/main/java/ru/ulstu/model/BaseEntity.java create mode 100644 src/main/java/ru/ulstu/repository/NewsRepository.java create mode 100644 src/main/java/ru/ulstu/service/NewsService.java create mode 100644 src/main/resources/templates/editNews.html diff --git a/build.gradle b/build.gradle index f103d3e..d5286fb 100644 --- a/build.gradle +++ b/build.gradle @@ -32,10 +32,11 @@ dependencies { versionSwagger = '2.5.0' } - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jetty' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jetty' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf' - implementation group: 'org.slf4j', name: 'slf4j-api', version: versionSLF4J + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation' + implementation group: 'org.slf4j', name: 'slf4j-api', version: versionSLF4J implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect' implementation group: 'org.springframework.boot', name:'spring-boot-starter-data-jpa' implementation group: 'com.h2database', name:'h2' diff --git a/data/db.mv.db b/data/db.mv.db index 9e8355995daf126bb0ce886b8decd179ae7cc0e3..2867556fbde610335892a5c43e5dd6d0feb53af0 100644 GIT binary patch literal 24576 zcmeHP%WvF77+ugG>HYBv)9&FEy?fLoleKVfl zeB)iR<&xj&1$VN2YwP{UmPAo31-JLRcWlYBNN4vJHE3zL(@^k@yzyL4+3;+Yb05AXy00Y1PFaQhy z1Hb?EaEwl$fovbvIg$ZKjH) z_;{5VOkvH5a8Y7MHMOH=#%7eHwxv@$idtCO@9ytKq0?WdD?4YB5j>yszdwb5!37TOy zmqV1o$(;T$StbL{WWW(GvGZQ?W^8_&nm=7@lTja8#8>Rpi-^{=LayXIEhm@#03*lIIAZvL^#S4lBAmAAc4d(xarUK1)q`;HlXTH_8JtOW6X~M$Yq+(^K1?Z%PdT?K002lxU zfPpi_KqllYIxrZyj^2pcmTKzOxHa^2R)1c%vHJheI5Qo_GeeJf2-jvtXsj3;H)eXj z_@jc4xF2TE7bICxHKS0Ry2#Hwe(=_ZAAhxg%ZgJ1Nq+Ld*GcjcNk07Z+a!6JBp-e8 zU6Q<#T>Iy+VHuj7roiGUe7SHaGmu%qxVsW`|cbM%}z_=m|Hq7HC_BU3%&o6~uo)xltz z;-shYK>u5y{|{`?|74bZv=%>!iAd1@XJ`-%P=Eno02p`<891!J2m0R_d`GW`SpRD$ zsQ)wVkwu>v{eS#`@c=p-9Hx4G+y`;||Ng|!=Po4rUpJ;M6pE7<`Kuc(*W)Wq*YVuV z#kE?!%FCiyoD_Ir?jD!q^J^`)$=BZI8!H~~Zq!;{ix*msz_*;b$In|To^1&P> z(j|YMUvgSY{JdcVa%37fe5F}3p2t^JNzw5i9Qb}{n0}}Sq7))gLLv%OWcZOPYoThY zrsW$-r2FDL?^Ks-jpF1bo}as$La8{FCAZ3Z&SKr=h1IpidaWXqg{9h}+ib+o&~o2d za~l=6B`i$GBnnx^X2V%_1%BOWR+gORf~;xR$OARj>h)4`YQx>|HrJiHz%SOW*BajR zwc_Mu{^HzwY2~ZU+OpHU$=`5qGIgi9n>cq<6Zn+|Q#KM;4ic{93V&tpQx3Cj)Wu?*bnhwUvR5-|tu`qxa^0o4{M%CS5E**Z3;^b9K`-98{j^MrFzDtR&RRw%c z&%KTxBK8!9*mbwrs;x9=dCGSc8%*H6+Opg7oaNOt*TYs2_)2|cG0UiV^_=Bm%gkfT zRF7>LIcJ#!xqw0ATPA{_>wt92(8I0+7YxfqFi47)WZk^RLoy`Y5W7Qf10_+dQAaXtxhQts zF1rpW_C59mH;R-jH^`7?fZz@I=|Iu{iRXPS;Nkn~EaqOaDAU*Nc{=}D#f(zwrLQ){ z>sWZ{Ldha#Ub<4UQd!KxJdlyhRWS1Ma&;{${o)(7TF=Wuzdc{5Dt)C^v7iwZD)bK> z93TJ!AOHd&00JNY0w4eaAOHd&00Mg@aMpT%dxrn-H6HkJ5C8!X009sH0T2KI5C8!X z009u_gFsv4Z+ie1sxI|k%Viwu@ons<)GO56Djs@E`BJU*Ho>Yab;VzI20G9LOX}Kw?n35ijx~Jez=jg$K!?^S0;g{s=7t_g%JiVHXXOo}4d47Iz zN;suY9v+k9Pk(jo^W^z-az)O+CC|Q}k;#km>1;}lr{iNX9be4I$w-JONQaSPd^8GJ zazf6=(=&1shACH3$XGrcamIuY%ny=GB}o=WNfxA(Ws)*UWh!KtD8YxBh(t6>LSF?5 zJt5=M%kyWBbMW1Rubj`Ej}7wyZ_fTln)ZO1(awdL56u{uG5n;E*J`jRlT%sA$L)hl zx!lgLRQ|bnzFewewvxqKrj_op*@{MQ{Fg*$Ya>$~CO<`2gem3>?X@SPw40w4ea zAOHd&00JNY0{s)X>EE~X(aT{*vm_6C&}edayZF`qe}Bbm*S_m;eJq+-`+xNRvVZrT z^Otkf+Q0REJMw>W|9-9i_eQVT_6Cp-vwr3`daadscS}eZz4n7BwR+9+)~!4L@07p0 zWrW>n)@IkD^JMGL_Yv(KljetZcYc*w_T222idi8I2RQPov zzbodnlem`MV1aW*`6pAOHd&00JNY0w4eadm~`|zw__Tptt@n JgC6Vue*?VDS(X3* diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java index 9716493..502e5b1 100644 --- a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java @@ -20,7 +20,8 @@ import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; public class MvcConfiguration implements WebMvcConfigurer { @Override public void addViewControllers(ViewControllerRegistry registry) { - registry.addViewController("/{articlename:\\w+}"); + registry.addViewController("/index"); + registry.addViewController("/editNews"); } @Override diff --git a/src/main/java/ru/ulstu/controller/IndexController.java b/src/main/java/ru/ulstu/controller/IndexController.java index d70ef2f..d6f2fc0 100644 --- a/src/main/java/ru/ulstu/controller/IndexController.java +++ b/src/main/java/ru/ulstu/controller/IndexController.java @@ -9,28 +9,20 @@ package ru.ulstu.controller; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import ru.ulstu.model.News; - -import java.util.GregorianCalendar; -import java.util.List; +import ru.ulstu.service.NewsService; @Controller public class IndexController { + private final NewsService newsService; + + public IndexController(NewsService newsService) { + this.newsService = newsService; + } + @GetMapping("/") public String index(Model model) { - model.addAttribute("news", List.of(new News("Открытие семинара", new GregorianCalendar(2022, 4, 1).getTime(), - "На кафере \"Информационные системы\" Ульяновского государственного технического университета состоится открытие постоянно действующего семинара \"Анализ данных и процессов\". Семинар планируется проводить ежемесячно."), - new News("Открытие семинара", new GregorianCalendar(2022, 4, 1).getTime(), - "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec laoreet enim dolor, vitae imperdiet mi consectetur et. Etiam posuere massa sed arcu pulvinar, eu tincidunt nunc vehicula. Integer interdum magna et orci eleifend convallis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam interdum nulla eget lacus ultricies sagittis. Duis a lacus lacinia, pulvinar augue ultrices, vulputate arcu. Etiam facilisis justo nec ex tincidunt, sit amet tempus ante iaculis. Praesent non accumsan odio. Nunc faucibus mattis elit elementum lacinia. Sed orci augue, iaculis sed efficitur ac, faucibus nec orci. Vivamus sed tempor lectus. Mauris non nisi lobortis, varius tortor id, cursus orci. Sed gravida, est nec placerat ornare, mi metus mattis eros, vitae finibus lectus turpis ut felis. Mauris faucibus lorem orci, tempor bibendum leo varius et.\n" + - "\n" + - "Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Suspendisse ut vulputate enim, nec rutrum magna. Ut finibus dignissim arcu, gravida gravida eros vulputate a. Nulla dapibus eleifend egestas. Pellentesque malesuada venenatis fermentum. Proin suscipit mi enim, eu cursus neque luctus id. Sed nec sodales libero, vel finibus sem. Maecenas tincidunt sagittis risus a posuere. Donec quis velit lorem. Curabitur viverra libero quis nibh molestie, id suscipit lorem ultrices. Donec egestas lectus at justo tempus, et pulvinar magna dignissim. Donec eleifend pretium ante in maximus. Maecenas in malesuada ante. Donec euismod tincidunt tempus.\n" + - "\n" + - "Integer convallis euismod nibh non ornare. Sed sed sagittis enim, id tempus libero. Sed interdum dui ut orci ultrices efficitur. Aenean a tristique odio. Duis nec lacus sit amet metus fringilla posuere. Donec nisi felis, congue ut lorem in, efficitur dapibus leo. Sed vel urna porta, mollis nunc in, aliquam quam. Sed rhoncus justo nisi, vitae volutpat nibh feugiat at. Phasellus laoreet justo et elit aliquet, non tincidunt mauris sagittis. Nunc in quam velit. Aliquam lobortis turpis elit, ut aliquam dolor sagittis sed. Duis pellentesque eu turpis quis ullamcorper. Nullam in ullamcorper metus. Vestibulum sit amet tellus at nulla pretium commodo. Nulla eleifend lacus ex, ac sodales odio pellentesque in. Cras nec metus elit.\n" + - "\n" + - "Cras feugiat gravida magna, nec faucibus eros eleifend nec. Donec sodales ligula ut ante lacinia eleifend. Pellentesque bibendum nunc vel nulla luctus, ut vulputate turpis semper. Aenean quis massa bibendum, vehicula lorem et, fringilla arcu. Morbi nisi elit, pellentesque ac tincidunt quis, volutpat et felis. Duis ullamcorper velit mauris, sit amet egestas sem euismod ac. Proin sodales urna in libero scelerisque mollis.\n" + - "\n" + - "Curabitur sed massa tempus, ullamcorper nisl non, posuere mi. Integer nisl quam, venenatis ut dapibus vehicula, tempor nec metus. Suspendisse ultrices maximus lorem quis accumsan. Donec ac orci et dolor tincidunt pellentesque. In at tempor ligula. Nulla mi risus, malesuada tincidunt ante vel, rhoncus posuere massa. Pellentesque feugiat urna id arcu gravida euismod. Maecenas vulputate et lorem vitae molestie. Maecenas et nibh nec nisl facilisis faucibus. Vestibulum sed lacus elementum, interdum erat non, euismod odio. Proin ac lorem vel nibh efficitur egestas ac et nibh. Integer at enim."))); + model.addAttribute("news", newsService.getAll()); return "index"; } } diff --git a/src/main/java/ru/ulstu/controller/NewsController.java b/src/main/java/ru/ulstu/controller/NewsController.java new file mode 100644 index 0000000..d76fe1f --- /dev/null +++ b/src/main/java/ru/ulstu/controller/NewsController.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2021 Anton Romanov - All Rights Reserved + * You may use, distribute and modify this code, please write to: romanov73@gmail.com. + * + */ + +package ru.ulstu.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +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 ru.ulstu.model.News; +import ru.ulstu.service.NewsService; + +@Controller +public class NewsController { + private final NewsService newsService; + + public NewsController(NewsService newsService) { + this.newsService = newsService; + } + + @GetMapping("/editNews/{newsId}") + public String editNews(@PathVariable(value = "newsId") Integer id, Model model) { + model.addAttribute("news", (id != null && id != 0) ? newsService.getById(id) : new News()); + return "editNews"; + } + + @PostMapping("saveNews") + public String saveNews(@ModelAttribute News news) { + newsService.save(news); + return "redirect:/"; + } +} diff --git a/src/main/java/ru/ulstu/model/BaseEntity.java b/src/main/java/ru/ulstu/model/BaseEntity.java new file mode 100644 index 0000000..7946ec0 --- /dev/null +++ b/src/main/java/ru/ulstu/model/BaseEntity.java @@ -0,0 +1,83 @@ +package ru.ulstu.model; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.MappedSuperclass; +import javax.persistence.Version; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@MappedSuperclass +public abstract class BaseEntity implements Serializable, Comparable { + @Id + @GeneratedValue(strategy = GenerationType.TABLE) + private Integer id; + + @Version + private Integer version; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (!getClass().isAssignableFrom(obj.getClass())) { + return false; + } + BaseEntity other = (BaseEntity) obj; + if (id == null) { + if (other.id != null) { + return false; + } + } else if (!id.equals(other.id)) { + return false; + } + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (id == null ? 0 : id.hashCode()); + return result; + } + + @Override + public String toString() { + return getClass().getSimpleName() + "{" + + "id=" + id + + ", version=" + version + + '}'; + } + + @Override + public int compareTo(@NotNull BaseEntity o) { + return id != null ? id.compareTo(o.getId()) : -1; + } + + public void reset() { + this.id = null; + this.version = null; + } +} \ No newline at end of file diff --git a/src/main/java/ru/ulstu/model/News.java b/src/main/java/ru/ulstu/model/News.java index 9050698..7efb6dc 100644 --- a/src/main/java/ru/ulstu/model/News.java +++ b/src/main/java/ru/ulstu/model/News.java @@ -1,12 +1,22 @@ package ru.ulstu.model; +import javax.persistence.Entity; +import javax.persistence.Lob; import java.util.Date; -public class News { +@Entity +public class News extends BaseEntity { private final static int MAX_NEWS_TEXT_PREVIEW_LENGTH = 800; - private final String title; - private final Date date; - private final String text; + + private String title; + + private Date date; + + @Lob + private String text; + + public News() { + } public News(String title, Date date, String text) { this.title = title; @@ -22,12 +32,24 @@ public class News { return date; } + public void setDate(Date date) { + this.date = date; + } + + public void setTitle(String title) { + this.title = title; + } + + public void setText(String text) { + this.text = text; + } + public String getText() { return text; } public String getPreview() { - return text.length() > MAX_NEWS_TEXT_PREVIEW_LENGTH + return text != null && text.length() > MAX_NEWS_TEXT_PREVIEW_LENGTH ? text.substring(0, MAX_NEWS_TEXT_PREVIEW_LENGTH) + "..." : text; } diff --git a/src/main/java/ru/ulstu/repository/NewsRepository.java b/src/main/java/ru/ulstu/repository/NewsRepository.java new file mode 100644 index 0000000..3aaf6bf --- /dev/null +++ b/src/main/java/ru/ulstu/repository/NewsRepository.java @@ -0,0 +1,7 @@ +package ru.ulstu.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.ulstu.model.News; + +public interface NewsRepository extends JpaRepository { +} diff --git a/src/main/java/ru/ulstu/service/NewsService.java b/src/main/java/ru/ulstu/service/NewsService.java new file mode 100644 index 0000000..a4bcae3 --- /dev/null +++ b/src/main/java/ru/ulstu/service/NewsService.java @@ -0,0 +1,45 @@ +package ru.ulstu.service; + +import org.springframework.stereotype.Service; +import ru.ulstu.model.News; +import ru.ulstu.repository.NewsRepository; + +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +@Service +public class NewsService { + private final NewsRepository newsRepository; + + public NewsService(NewsRepository newsRepository) { + this.newsRepository = newsRepository; + } + + public void create(String title, String text) { + newsRepository.save(new News(title, new Date(), text)); + } + + public void create(News news) { + news.setDate(new Date()); + newsRepository.save(news); + } + + public void save(News news) { + if (news.getId() != null && (news.getId() != 0)) { + newsRepository.save(news); + } else { + create(news); + } + } + + public News getById(@NotNull Integer id) { + return newsRepository + .findById(id) + .orElseThrow(() -> new RuntimeException("Новость не найдена")); + } + + public List getAll() { + return newsRepository.findAll(); + } +} diff --git a/src/main/resources/static/favicon.ico b/src/main/resources/static/favicon.ico index 4d4f220f9c4fbcc966f1bf92c84c60b0ab1ffb6f..dca8f8d67ea05ee0a483ce70dbc899e5084aeea1 100644 GIT binary patch literal 15406 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 literal 305822 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 diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index ab97906..01de6c5 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -22,7 +22,7 @@ From 6207da8fa5a315f33e13ee2b24f9ffcf5b5685c6 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Wed, 9 Mar 2022 12:48:40 +0400 Subject: [PATCH 5/6] #1 -- add validation --- data/db.mv.db | Bin 24576 -> 28672 bytes .../ru/ulstu/controller/NewsController.java | 9 ++++++++- src/main/java/ru/ulstu/model/News.java | 3 +++ src/main/resources/public/css/main.css | 4 ++++ src/main/resources/templates/editNews.html | 5 ++++- 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/data/db.mv.db b/data/db.mv.db index db9ad7d68730cb8f45d91a8f364aea9b6a28e9b4..f2a5f01bea579e0c6be94328e072eae670ce8703 100644 GIT binary patch literal 28672 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 S|GEFo`p{YZzpEZo{{LS??+2Iw diff --git a/src/main/java/ru/ulstu/controller/NewsController.java b/src/main/java/ru/ulstu/controller/NewsController.java index d76fe1f..61cca27 100644 --- a/src/main/java/ru/ulstu/controller/NewsController.java +++ b/src/main/java/ru/ulstu/controller/NewsController.java @@ -8,6 +8,7 @@ package ru.ulstu.controller; 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; @@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.PostMapping; import ru.ulstu.model.News; import ru.ulstu.service.NewsService; +import javax.validation.Valid; + @Controller public class NewsController { private final NewsService newsService; @@ -30,8 +33,12 @@ public class NewsController { } @PostMapping("saveNews") - public String saveNews(@ModelAttribute News news) { + public String saveNews(@Valid @ModelAttribute News news, BindingResult result) { + if (result.hasErrors()) { + return "editNews"; + } newsService.save(news); + return "redirect:/"; } } diff --git a/src/main/java/ru/ulstu/model/News.java b/src/main/java/ru/ulstu/model/News.java index 7efb6dc..af66265 100644 --- a/src/main/java/ru/ulstu/model/News.java +++ b/src/main/java/ru/ulstu/model/News.java @@ -2,17 +2,20 @@ package ru.ulstu.model; import javax.persistence.Entity; import javax.persistence.Lob; +import javax.validation.constraints.NotEmpty; import java.util.Date; @Entity public class News extends BaseEntity { private final static int MAX_NEWS_TEXT_PREVIEW_LENGTH = 800; + @NotEmpty(message = "Заголовок не может быть пустым") private String title; private Date date; @Lob + @NotEmpty(message = "Текст новости не может быть пустым") private String text; public News() { diff --git a/src/main/resources/public/css/main.css b/src/main/resources/public/css/main.css index c207eae..b2b570d 100644 --- a/src/main/resources/public/css/main.css +++ b/src/main/resources/public/css/main.css @@ -19,4 +19,8 @@ .news-image { width: 300px; +} + +.error { + color: red; } \ No newline at end of file diff --git a/src/main/resources/templates/editNews.html b/src/main/resources/templates/editNews.html index 96aa36e..a6df9fb 100644 --- a/src/main/resources/templates/editNews.html +++ b/src/main/resources/templates/editNews.html @@ -11,14 +11,17 @@

Редактирование новости:

-

+

+ Не может быть пустым

+

+ Не может быть пустым

From b7953c4b715faba645d79edbdc31b21e54b69231 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Wed, 9 Mar 2022 15:09:17 +0400 Subject: [PATCH 6/6] #1 -- view news --- data/db.mv.db | Bin 28672 -> 32768 bytes .../ru/ulstu/controller/NewsController.java | 12 +++++++++ src/main/java/ru/ulstu/model/News.java | 3 +++ .../java/ru/ulstu/service/NewsService.java | 4 +++ src/main/resources/public/css/main.css | 8 ++++++ src/main/resources/templates/default.html | 2 +- src/main/resources/templates/editNews.html | 9 +++++-- src/main/resources/templates/index.html | 17 ++++++++++-- src/main/resources/templates/news.html | 25 ++++++++++++++++++ 9 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/templates/news.html diff --git a/data/db.mv.db b/data/db.mv.db index f2a5f01bea579e0c6be94328e072eae670ce8703..8fe3c2fececf3c4da42c6f2c33870fa4d36b9582 100644 GIT binary patch literal 32768 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 Nvnlfb?VFJQ|37zZB`N>_ literal 28672 zcmeHPO>g7I8J29zO}x9oszDkc>0y@HjlF>2@LMD=fh@6WVP$zM$=l7P#*iE(M!b@1 z%bP_HO;EJxp$O7T+ii>V&=$!b2$1v-6v!XQsVIt`+EZ^mG?xr#_%WiyU3nqbsqpGR zafTx22mk_r03dK-2y6rYzcB2fVL$*700aO5KmZT`1ONd*01yBK00BVYe}zC4 zsu{@e3KtCD|%*yEC zK5;ZdA-3+NsQ~n{M+bxY@N_V8WHk3rm{suN(offl1*K44x*d={K0O?jo~6~_TKe~; zqEM-XfUdl|`dQ(n!n5qAH&xY2_UvR2CwpFrg0QKqhFjHQ1&wWWwl&z+WLwO(`~?5< z0N*E@2ZMk-+|+sDaOgGg2w!4HXkiB*CHo!He}UBxkI0~Rj0Y#!AJIgL6MpIldxvCG z77LnKFrQ;5pALdyYxpKLH|(2DjelYOh3Jp^fT^K!f zKv9`Q3JZo|!LYPHy~r>#W0+{xcz?!b#e-Uj@$wm7YTr)r63m*hKRv-p=G{)#yHV)2 zPU5yvZc*YL3Smy}MDEWkY(OCHuKD}_l<1XhCF4&=mN0%qWdDpHS)y>Bo1th7z5VkPr}d_!Zju7Sl%fBp^mY*pos-_!ewe(D(ymAe_davvDP`%^UdhY(#UbEFesw|gR zBqUw=Ns-s1y{_9q&F`T0ZV$Qln%!O(N!^-+y0umht=qb8nZ98WMYU~H@z&9Ht-FoZ zt5shmR#j2@hOJWart6AkdI9mgplW%6>B~xhWd+OF*KyS&x@rWvrCYXF)rjfI>!{Y) zX|~HNuOM{gL1aq3R^N6Ts8`!+xk$RRx7BLarA=wOx#f1+;XQQS@9w$ny4#gD)&#}ySH|;ymB2~yYl_0 z@jIR7POb9>y6wIpv>ny%)7pJQLc49@*i^eRCecQ2pc_}-FH$rq&a>PaMW%u3yX|hT zQ=@hY4W^Z$ErP)t*;Y}r-Ei*-r;gu8dF53K`=i(ea&T|E-%EgQHY9q@o_mYlMCd63 zuy@@~x4GL+jz@SmXopFt*W7Wtz1q&5sJ2IYK|=M`?p9pU?6opI7xv6L?U}~RJ)>rN zhFdOCqv@qKDE=qY;b*^_32)lM7~bKf9}BW7QJw8aOUt6pHcegg6P+z!;@KkUY#%0q zQJ#X8ugjcOz+!@orzulNurH8cQO`F^sTY+GuC~o~K z0Wp0ya&0;mE2%D>s+HTvOk<5zN^gov zNv8Lzh*u!IUKdg`;!}(#%4`vQAZ=XKG#1(g1ONd*01!AM0+akZ<^Lq*|5&qateqeK zr;GgKe*u_?|I<0sc>LdpLWMk1NCTK@1XHz@s+>;f=w;72{!jV;%fSDE|8pVa@zm6i zfd6x4>74n0;l%k6$fM^XJ0H(IIdei8XXl}az}_#DWWArhbH;McQY9uP>)BkQd@CoEm?x0*8O;+p zdkSJ!e~&eeT=R03m|Ru3+v4w|DUc! zf&Bjqn!G`?fB+x>2mk_rz*8a+$Ny9QEpq6D|6}8PR6ZHMyzl^?ABT@1se%lD@S getAll() { return newsRepository.findAll(); } + + public void delete(Integer id) { + newsRepository.deleteById(id); + } } diff --git a/src/main/resources/public/css/main.css b/src/main/resources/public/css/main.css index b2b570d..359a34c 100644 --- a/src/main/resources/public/css/main.css +++ b/src/main/resources/public/css/main.css @@ -23,4 +23,12 @@ .error { color: red; +} + +.fa { + color: black; +} + +.link-dark, .link-dark:visited, .link-dark:focus { + color: black; } \ No newline at end of file diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index b744d63..819bd2a 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -17,7 +17,7 @@ - +