diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..aee5410 --- /dev/null +++ b/build.gradle @@ -0,0 +1,62 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.5' + id 'io.spring.dependency-management' version '1.1.7' +} + + +group = 'ru.mcs' +version = '0.0.1-SNAPSHOT' +description = 'Генеологическое древо' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(24) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() + // Добавляем репозитории для JasperReports и iText + maven { url "https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/" } + maven { url "https://repository.jboss.org/nexus/content/groups/public/" } + maven { url "https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/" } +} + +dependencies { + // Spring Boot starters + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + + // Базы данных + runtimeOnly 'com.h2database:h2' + runtimeOnly 'org.postgresql:postgresql' + + // Новая версия JasperReports с другим экспортером PDF + implementation("net.sf.jasperreports:jasperreports:6.21.5") + + // Инструменты разработки + developmentOnly 'org.springframework.boot:spring-boot-devtools' +// developmentOnly 'org.springframework.boot:spring-boot-docker-compose' + + // lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + // Тестирование + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d4081da --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..79c917a --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'genealogy' diff --git a/src/main/java/ru/mcs/genealogy/GenealogyApplication.java b/src/main/java/ru/mcs/genealogy/GenealogyApplication.java new file mode 100644 index 0000000..2331a1c --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/GenealogyApplication.java @@ -0,0 +1,13 @@ +package ru.mcs.genealogy; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class GenealogyApplication { + + public static void main(String[] args) { + SpringApplication.run(GenealogyApplication.class, args); + } + +} diff --git a/src/main/java/ru/mcs/genealogy/controller/PersonController.java b/src/main/java/ru/mcs/genealogy/controller/PersonController.java new file mode 100644 index 0000000..9e4503d --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/controller/PersonController.java @@ -0,0 +1,61 @@ +package ru.mcs.genealogy.controller; + +import ru.mcs.genealogy.entity.Gender; +import ru.mcs.genealogy.entity.Person; +import ru.mcs.genealogy.service.PersonService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +@Controller +@RequestMapping("/persons") +public class PersonController { + private final PersonService personService; + + public PersonController(PersonService personService) { + this.personService = personService; + } + + @GetMapping + public String showPersons(Model model) { + model.addAttribute("persons", personService.getAllPersons()); + model.addAttribute("selectedPerson", new Person()); + model.addAttribute("allPersons", personService.getAllPersons()); + model.addAttribute("genders", Gender.values()); + return "persons"; + } + + @GetMapping("/{id}") + public String selectPerson(@PathVariable Long id, Model model) { + personService.getPersonById(id).ifPresent(person -> + model.addAttribute("selectedPerson", person)); + model.addAttribute("persons", personService.getAllPersons()); + model.addAttribute("allPersons", personService.getAllPersons()); + model.addAttribute("genders", Gender.values()); + return "persons"; + } + + @PostMapping + public String savePerson(@ModelAttribute Person person) { + personService.savePerson(person); + return "redirect:/persons"; + } + + @GetMapping("/new") + public String newPerson(Model model) { + model.addAttribute("selectedPerson", new Person()); + model.addAttribute("persons", personService.getAllPersons()); + model.addAttribute("allPersons", personService.getAllPersons()); + model.addAttribute("genders", Gender.values()); + return "persons"; + } + + @GetMapping("/search") + public String searchPersons(@RequestParam String lastName, Model model) { + model.addAttribute("persons", personService.searchByLastName(lastName)); + model.addAttribute("selectedPerson", new Person()); + model.addAttribute("allPersons", personService.getAllPersons()); + model.addAttribute("genders", Gender.values()); + return "persons"; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/genealogy/controller/TreeController.java b/src/main/java/ru/mcs/genealogy/controller/TreeController.java new file mode 100644 index 0000000..8e5a265 --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/controller/TreeController.java @@ -0,0 +1,118 @@ +package ru.mcs.genealogy.controller; + +import jakarta.servlet.http.HttpServletResponse; +import net.sf.jasperreports.engine.*; +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import ru.mcs.genealogy.dto.TreeNode; +import ru.mcs.genealogy.entity.Person; +import ru.mcs.genealogy.service.PersonService; +import ru.mcs.genealogy.service.TreeService; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Controller +@RequestMapping("/tree") +public class TreeController { + private final PersonService personService; + private final TreeService treeService; + private final Map compiledReports = new ConcurrentHashMap<>(); + + public TreeController(PersonService personService, TreeService treeService) { + this.personService = personService; + this.treeService = treeService; + } + + @GetMapping + public String showTreePage(Model model) { + model.addAttribute("persons", personService.getAllPersons()); + return "tree"; + } + + @GetMapping("/{id}") + public String showTreeForPerson(@PathVariable Long id, Model model) { + Person selectedPerson = personService.getPersonById(id).orElseThrow(); + List tree = treeService.buildFullTree(selectedPerson); + + model.addAttribute("selectedPerson", selectedPerson); + model.addAttribute("persons", personService.getAllPersons()); + model.addAttribute("tree", tree); + return "tree"; + } + + @GetMapping("/pdf/{id}") + public void generatePdf(@PathVariable Long id, HttpServletResponse response) { + try { + Person selectedPerson = personService.getPersonById(id).orElseThrow(); + List tree = treeService.buildFullTree(selectedPerson); + + // Преобразуем дерево в список для отчета + List> reportData = new ArrayList<>(); + for (TreeNode node : tree) { + Map row = new HashMap<>(); + row.put("fullName", node.getPerson().getFullName()); + row.put("level", node.getLevel()); + reportData.add(row); + } + + // Получаем или компилируем отчет + JasperReport jasperReport = getCompiledReport("family-tree"); + + // Создаем datasource + JRBeanCollectionDataSource dataSource = new JRBeanCollectionDataSource(reportData); + + // Параметры отчета + Map parameters = new HashMap<>(); + parameters.put("title", "Генеалогическое древо: " + selectedPerson.getFullName()); + + // Заполняем отчет + JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters); + + // Настраиваем response + response.setContentType("application/pdf"); + response.setHeader("Content-Disposition", "attachment; filename=family-tree-" + selectedPerson.getId() + ".pdf"); + + // Экспортируем в PDF + JasperExportManager.exportReportToPdfStream(jasperPrint, response.getOutputStream()); + } catch (Exception e) { + throw new RuntimeException("Ошибка при генерации PDF", e); + } + } + + private JasperReport getCompiledReport(String reportName) throws JRException { + // Проверяем, есть ли уже скомпилированный отчет в кэше + if (compiledReports.containsKey(reportName)) { + return compiledReports.get(reportName); + } + + try { + // Простая загрузка файла шаблона из classpath + InputStream reportStream = getClass().getClassLoader().getResourceAsStream("reports/" + reportName + ".jrxml"); + + if (reportStream == null) { + throw new JRException("Файл шаблона не найден: reports/" + reportName + ".jrxml"); + } + + // Компилируем отчет + JasperReport jasperReport = JasperCompileManager.compileReport(reportStream); + + // Закрываем поток + reportStream.close(); + + // Кэшируем скомпилированный отчет + compiledReports.put(reportName, jasperReport); + return jasperReport; + } catch (Exception e) { + throw new JRException("Не удалось загрузить или скомпилировать отчет: " + reportName, e); + } + } +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/genealogy/dto/TreeNode.java b/src/main/java/ru/mcs/genealogy/dto/TreeNode.java new file mode 100644 index 0000000..cf4f708 --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/dto/TreeNode.java @@ -0,0 +1,31 @@ +package ru.mcs.genealogy.dto; + +import ru.mcs.genealogy.entity.Person; + +public class TreeNode { + private Person person; + private int level; + private boolean hasChildren; + + public TreeNode(Person person, int level, boolean hasChildren) { + this.person = person; + this.level = level; + this.hasChildren = hasChildren; + } + + public Person getPerson() { + return person; + } + + public int getLevel() { + return level; + } + + public boolean isHasChildren() { + return hasChildren; + } + + public String getFullName() { + return person.getFullName(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/genealogy/entity/Gender.java b/src/main/java/ru/mcs/genealogy/entity/Gender.java new file mode 100644 index 0000000..261d8c7 --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/entity/Gender.java @@ -0,0 +1,17 @@ +package ru.mcs.genealogy.entity; + + +public enum Gender { + MALE("Мужской"), + FEMALE("Женский"); + + private final String displayName; + + Gender(String displayName) { + this.displayName = displayName; + } + + public String getDisplayName() { + return displayName; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/genealogy/entity/Person.java b/src/main/java/ru/mcs/genealogy/entity/Person.java new file mode 100644 index 0000000..07199eb --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/entity/Person.java @@ -0,0 +1,122 @@ +package ru.mcs.genealogy.entity; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "persons") +public class Person { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotBlank(message = "Фамилия обязательна") + private String lastName; + + @NotBlank(message = "Имя обязательно") + private String firstName; + + @NotBlank(message = "Отчество обязательно") + private String patronymic; + + private String maidenName; + + @Enumerated(EnumType.STRING) + private Gender gender; + + private LocalDate birthDate; + private LocalDate deathDate; + + private String biography; + + @ManyToOne + @JoinColumn(name = "mother_id") + private Person mother; + + @ManyToOne + @JoinColumn(name = "father_id") + private Person father; + + @ManyToMany + @JoinTable( + name = "person_marriages", + joinColumns = @JoinColumn(name = "person_id"), + inverseJoinColumns = @JoinColumn(name = "spouse_id") + ) + private List spouses = new ArrayList<>(); + + @OneToMany(mappedBy = "mother") + private List childrenAsMother = new ArrayList<>(); + + @OneToMany(mappedBy = "father") + private List childrenAsFather = new ArrayList<>(); + + // Конструкторы + public Person() {} + + public Person(String lastName, String firstName, String patronymic, Gender gender) { + this.lastName = lastName; + this.firstName = firstName; + this.patronymic = patronymic; + this.gender = gender; + } + + // Геттеры и сеттеры + public Long getId() { return id; } + public void setId(Long id) { this.id = id; } + + public String getLastName() { return lastName; } + public void setLastName(String lastName) { this.lastName = lastName; } + + public String getFirstName() { return firstName; } + public void setFirstName(String firstName) { this.firstName = firstName; } + + public String getPatronymic() { return patronymic; } + public void setPatronymic(String patronymic) { this.patronymic = patronymic; } + + public String getMaidenName() { return maidenName; } + public void setMaidenName(String maidenName) { this.maidenName = maidenName; } + + public Gender getGender() { return gender; } + public void setGender(Gender gender) { this.gender = gender; } + + public LocalDate getBirthDate() { return birthDate; } + public void setBirthDate(LocalDate birthDate) { this.birthDate = birthDate; } + + public LocalDate getDeathDate() { return deathDate; } + public void setDeathDate(LocalDate deathDate) { this.deathDate = deathDate; } + + public String getBiography() { return biography; } + public void setBiography(String biography) { this.biography = biography; } + + public Person getMother() { return mother; } + public void setMother(Person mother) { this.mother = mother; } + + public Person getFather() { return father; } + public void setFather(Person father) { this.father = father; } + + public List getSpouses() { return spouses; } + public void setSpouses(List spouses) { this.spouses = spouses; } + + public List getChildrenAsMother() { return childrenAsMother; } + public void setChildrenAsMother(List childrenAsMother) { this.childrenAsMother = childrenAsMother; } + + public List getChildrenAsFather() { return childrenAsFather; } + public void setChildrenAsFather(List childrenAsFather) { this.childrenAsFather = childrenAsFather; } + + // Полное имя для отображения + public String getFullName() { + return lastName + " " + firstName + " " + patronymic; + } + + // Все дети (объединение детей от матери и от отца) + public List getAllChildren() { + List allChildren = new ArrayList<>(); + allChildren.addAll(childrenAsMother); + allChildren.addAll(childrenAsFather); + return allChildren; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/genealogy/repository/PersonRepository.java b/src/main/java/ru/mcs/genealogy/repository/PersonRepository.java new file mode 100644 index 0000000..dcfa0e0 --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/repository/PersonRepository.java @@ -0,0 +1,14 @@ +package ru.mcs.genealogy.repository; + +import ru.mcs.genealogy.entity.Person; +import ru.mcs.genealogy.entity.Gender; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import java.util.List; + +@Repository +public interface PersonRepository extends JpaRepository { + List findAllByOrderByLastNameAscFirstNameAsc(); + List findByGenderOrderByLastNameAscFirstNameAsc(Gender gender); + List findByLastNameContainingIgnoreCase(String lastName); +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/genealogy/service/PersonService.java b/src/main/java/ru/mcs/genealogy/service/PersonService.java new file mode 100644 index 0000000..dbfc798 --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/service/PersonService.java @@ -0,0 +1,50 @@ +package ru.mcs.genealogy.service; + +import ru.mcs.genealogy.entity.Gender; +import ru.mcs.genealogy.entity.Person; +import ru.mcs.genealogy.repository.PersonRepository; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +@Service +@Transactional +public class PersonService { + private final PersonRepository personRepository; + + public PersonService(PersonRepository personRepository) { + this.personRepository = personRepository; + } + + public List getAllPersons() { + return personRepository.findAllByOrderByLastNameAscFirstNameAsc(); + } + + public List getPersonsByGender(Gender gender) { + return personRepository.findByGenderOrderByLastNameAscFirstNameAsc(gender); + } + + public List searchByLastName(String lastName) { + return personRepository.findByLastNameContainingIgnoreCase(lastName); + } + + public Optional getPersonById(Long id) { + return personRepository.findById(id); + } + + public Person savePerson(Person person) { + // Если пол мужской, очищаем девичью фамилию + if (person.getGender() == Gender.MALE) { + person.setMaidenName(null); + } + return personRepository.save(person); + } + + public void deletePerson(Long id) { + personRepository.deleteById(id); + } + +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/genealogy/service/TreeService.java b/src/main/java/ru/mcs/genealogy/service/TreeService.java new file mode 100644 index 0000000..370ba7c --- /dev/null +++ b/src/main/java/ru/mcs/genealogy/service/TreeService.java @@ -0,0 +1,78 @@ +package ru.mcs.genealogy.service; + +import ru.mcs.genealogy.dto.TreeNode; +import ru.mcs.genealogy.entity.Person; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class TreeService { + + public List buildAncestorTree(Person person) { + List tree = new ArrayList<>(); + buildAncestorTreeRecursive(person, 0, tree); + return tree; + } + + public List buildDescendantTree(Person person) { + List tree = new ArrayList<>(); + buildDescendantTreeRecursive(person, 0, tree); + return tree; + } + + private void buildAncestorTreeRecursive(Person person, int level, List tree) { + if (person == null) return; + + tree.add(new TreeNode(person, level, person.getAllChildren().size() > 0)); + + if (person.getFather() != null) { + buildAncestorTreeRecursive(person.getFather(), level + 1, tree); + } + + if (person.getMother() != null) { + buildAncestorTreeRecursive(person.getMother(), level + 1, tree); + } + } + + private void buildDescendantTreeRecursive(Person person, int level, List tree) { + if (person == null) return; + + tree.add(new TreeNode(person, level, person.getAllChildren().size() > 0)); + + for (Person child : person.getAllChildren()) { + buildDescendantTreeRecursive(child, level + 1, tree); + } + } + + public List buildFullTree(Person person) { + List tree = new ArrayList<>(); + + // Сначала добавляем предков + Person current = person; + int level = 0; + while (current != null) { + tree.add(0, new TreeNode(current, level, current.getAllChildren().size() > 0)); + current = current.getFather(); + level++; + } + + // Затем добавляем потомков + for (Person child : person.getAllChildren()) { + addDescendantsToTree(child, 1, tree); + } + + return tree; + } + + private void addDescendantsToTree(Person person, int level, List tree) { + if (person == null) return; + + tree.add(new TreeNode(person, level, person.getAllChildren().size() > 0)); + + for (Person child : person.getAllChildren()) { + addDescendantsToTree(child, level + 1, tree); + } + } +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..8974ba4 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,52 @@ +spring: + application: + name: genealogy + + # ???????????? ???? ?????? postgres (??? ??????????) + datasource: + url: "jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5439}/${DB_DATABASE:genealogy}" + username: postgres + password: postgres + driver-class-name: org.postgresql.Driver + jpa: + database-platform: org.hibernate.dialect.PostgreSQLDialect + hibernate: + ddl-auto: update + + # ???????????? JPA +# jpa: +# database-platform: org.hibernate.dialect.H2Dialect +# hibernate: +# ddl-auto: create-drop +# show-sql: true +# properties: +# hibernate: +# format_sql: true +# dialect: org.hibernate.dialect.H2Dialect + + # ???????????? Thymeleaf + thymeleaf: + cache: false + prefix: classpath:/templates/ + suffix: .html + mode: HTML + encoding: UTF-8 + servlet: + content-type: text/html + + # ???????????? ???-?????????? + web: + resources: + static-locations: classpath:/static/ + +# ????????? ??????????? +logging: + level: + com.example.familytree: DEBUG + org.hibernate.SQL: DEBUG + org.hibernate.type.descriptor.sql.BasicBinder: TRACE + +# ????????? ????????? ?????????? +app: + title: "??????????????? ????? ?????" + version: "1.0.0" diff --git a/src/main/resources/reports/family-tree.jrxml b/src/main/resources/reports/family-tree.jrxml new file mode 100644 index 0000000..09afc96 --- /dev/null +++ b/src/main/resources/reports/family-tree.jrxml @@ -0,0 +1,18 @@ + + + + + + + + <band height="50"> + <textField> + <reportElement x="0" y="0" width="555" height="30" uuid="853b09ab-20b7-4b16-a8d5-323d262a7d4c"/> + <textFieldExpression><![CDATA["Генеалогическое древо"]]></textFieldExpression> + </textField> + </band> + + + + + diff --git a/src/main/resources/templates/persons.html b/src/main/resources/templates/persons.html new file mode 100644 index 0000000..0d828bf --- /dev/null +++ b/src/main/resources/templates/persons.html @@ -0,0 +1,171 @@ + + + + Генеалогическое древо семьи + + + + + +
+ +
+

Члены семьи

+ + + +
+ + +
+ +
+
+
+ + +
+

+ Информация о члене семьи +

+ +
+ + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/tree.html b/src/main/resources/templates/tree.html new file mode 100644 index 0000000..36472ff --- /dev/null +++ b/src/main/resources/templates/tree.html @@ -0,0 +1,57 @@ + + + + Генеалогическое древо семьи + + + + +
+ +
+

Члены семьи

+
+
+
+ + +
+

Генеалогическое древо

+
+

Дерево для:

+ + +
+
+ + ✓ +
+
+
+
+

Выберите члена семьи из списка слева для отображения генеалогического древа

+
+
+
+ + + + \ No newline at end of file diff --git a/src/test/java/ru/mcs/genealogy/GenealogyApplicationTests.java b/src/test/java/ru/mcs/genealogy/GenealogyApplicationTests.java new file mode 100644 index 0000000..526ae49 --- /dev/null +++ b/src/test/java/ru/mcs/genealogy/GenealogyApplicationTests.java @@ -0,0 +1,13 @@ +package ru.mcs.genealogy; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class GenealogyApplicationTests { + + @Test + void contextLoads() { + } + +}