Compare commits
64 Commits
h-hein
...
da41c781df
| Author | SHA1 | Date | |
|---|---|---|---|
| da41c781df | |||
| 103acf1106 | |||
|
|
7d5d038a9e | ||
| 6f56164c13 | |||
| ce94b90bf1 | |||
| 9db673abb8 | |||
| abb1cda6bf | |||
| 3e0be17cef | |||
| b9036465f2 | |||
|
|
7362f58c4f | ||
| 9728e2a983 | |||
| 8a0b53522b | |||
| fecf19636f | |||
| b298aa01c3 | |||
| e5f3a3774a | |||
|
|
9ef18e73ed | ||
| a17aa3ae93 | |||
| 879d7235e0 | |||
| 40c08ea6b4 | |||
|
|
45eff1634e | ||
|
|
136b18bfc7 | ||
| 3d5653418a | |||
| f87e6d60c9 | |||
| 0754c4507e | |||
| ef71711641 | |||
| 6b2c08c031 | |||
| b6d24a3d05 | |||
| b128e92598 | |||
| 6faaedaa95 | |||
| 1585457395 | |||
| 3e1eb9f6bd | |||
| b6ada277a2 | |||
| 3f304d8e12 | |||
|
|
9bba174df3 | ||
| 3e0f27f7c0 | |||
| 0566219226 | |||
|
|
0bf7852ef9 | ||
| b58a996e84 | |||
| 0b89e45386 | |||
| a2a406dd8b | |||
| 694cb0f621 | |||
| ff1c43d80b | |||
|
|
cbb6495741 | ||
| 81d722be8d | |||
|
|
c612e9dac3 | ||
| 97e8df70f5 | |||
| bb34fe164e | |||
| cdfdef6d93 | |||
| 528eadec5a | |||
| 13f2fdedea | |||
| 945d8a465a | |||
|
|
0d582fee5c | ||
| eaaf022694 | |||
|
|
4a01b85ae9 | ||
|
|
013bb72439 | ||
|
|
f647eb6ef2 | ||
| 87cdd2ca48 | |||
| 174f843618 | |||
| 4e6ca0eea9 | |||
| d67b790c44 | |||
| f370d03e10 | |||
|
|
48477829fd | ||
|
|
44ed4b3120 | ||
| eddc638c93 |
@@ -1,2 +1,127 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>4.1.1</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>com.example</groupId>
|
||||
<artifactId>book-rent</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<packaging>war</packaging>
|
||||
<name>book-rent</name>
|
||||
<description/>
|
||||
<url/>
|
||||
<licenses>
|
||||
<license/>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer/>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection/>
|
||||
<developerConnection/>
|
||||
<tag/>
|
||||
<url/>
|
||||
</scm>
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
<!-- webmvcから通常のwebスターターに変更 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-devtools</artifactId> <!-- ここを修正 -->
|
||||
<scope>runtime</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-compile</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>default-testCompile</id>
|
||||
<phase>test-compile</phase>
|
||||
<goals>
|
||||
<goal>testCompile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package com.example.demo.common;
|
||||
|
||||
public class BusinessException {
|
||||
public class BusinessException extends RuntimeException {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public BusinessException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,31 @@
|
||||
package com.example.demo.common;
|
||||
|
||||
public class Const {
|
||||
|
||||
|
||||
/** テーブル定義書のコード値(数値の直書きを避けるため一箇所に集約) */
|
||||
public final class Const {
|
||||
private Const() {}
|
||||
|
||||
public static final String SESSION_LOGIN_USER = "loginUser";
|
||||
|
||||
/** 管理者フラグ */
|
||||
public static final String ADMIN_NO = "0";
|
||||
public static final String ADMIN_YES = "1";
|
||||
|
||||
/** 初期パスワード(機能一覧 EMP-01) */
|
||||
public static final String DEFAULT_PASSWORD = "sakura2024";
|
||||
|
||||
/** 退職フラグ */
|
||||
public static final String RETIRE_NO = "0";
|
||||
public static final String RETIRE_YES = "1";
|
||||
|
||||
/** 貸出フラグ */
|
||||
public static final String LENDING_OK = "0"; // 貸出可
|
||||
public static final String LENDING_NG = "1"; // 貸出不可
|
||||
|
||||
/** 貸出ステータス */
|
||||
public static final String STATUS_RETURNED = "0"; // 返却済
|
||||
public static final String STATUS_WAITING = "1"; // 承認待
|
||||
public static final String STATUS_LENDING = "2"; // 貸出中
|
||||
public static final String STATUS_REJECTED = "9"; // 却下
|
||||
}
|
||||
|
||||
@@ -1,5 +1,31 @@
|
||||
package com.example.demo.common;
|
||||
|
||||
public class LoginUser {
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/** セッションに保持するログイン情報(社員ID・社員名・社員名よみ・メールアドレス・管理者フラグ) */
|
||||
public class LoginUser implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private final Integer idEmployee;
|
||||
private final String nmEmployee;
|
||||
private final String knEmployee;
|
||||
private final String mailAddress;
|
||||
private final String flgAdmin;
|
||||
|
||||
public LoginUser(Integer idEmployee, String nmEmployee, String knEmployee, String mailAddress, String flgAdmin) {
|
||||
this.idEmployee = idEmployee;
|
||||
this.nmEmployee = nmEmployee;
|
||||
this.knEmployee = knEmployee;
|
||||
this.mailAddress = mailAddress;
|
||||
this.flgAdmin = flgAdmin;
|
||||
}
|
||||
|
||||
public Integer getIdEmployee() { return idEmployee; }
|
||||
public String getNmEmployee() { return nmEmployee; }
|
||||
public String getKnEmployee() { return knEmployee; }
|
||||
public String getMailAddress() { return mailAddress; }
|
||||
public String getFlgAdmin() { return flgAdmin; }
|
||||
public boolean isAdmin() { return Const.ADMIN_YES.equals(flgAdmin); }
|
||||
}
|
||||
|
||||
@@ -1,5 +1,37 @@
|
||||
package com.example.demo.config;
|
||||
|
||||
public class LoginCheckInterceptor {
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.web.servlet.HandlerInterceptor;
|
||||
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
|
||||
/**
|
||||
* 全業務画面共通のアクセス制御(NFR-02)。
|
||||
* ・未ログイン → ログイン画面へ
|
||||
* ・/admin/** は管理者のみ(画面のボタン非表示だけでなくサーバー側でも確認)
|
||||
*/
|
||||
public class LoginCheckInterceptor implements HandlerInterceptor {
|
||||
@Override
|
||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
|
||||
// ブラウザの「戻る」でログアウト後の画面が見えないようにする
|
||||
response.setHeader("Cache-Control", "no-store");
|
||||
|
||||
HttpSession session = request.getSession(false);
|
||||
LoginUser user = session == null ? null : (LoginUser) session.getAttribute(Const.SESSION_LOGIN_USER);
|
||||
if (user == null) {
|
||||
response.sendRedirect(request.getContextPath() + "/login");
|
||||
return false;
|
||||
}
|
||||
String path = request.getRequestURI().substring(request.getContextPath().length());
|
||||
if (path.startsWith("/admin") && !user.isAdmin()) {
|
||||
response.sendRedirect(request.getContextPath() + "/menu");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,16 @@
|
||||
package com.example.demo.config;
|
||||
|
||||
public class WebConfig {
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
|
||||
@Configuration
|
||||
public class WebConfig implements WebMvcConfigurer {
|
||||
@Override
|
||||
public void addInterceptors(InterceptorRegistry registry) {
|
||||
registry.addInterceptor(new LoginCheckInterceptor())
|
||||
.addPathPatterns("/**")
|
||||
.excludePathPatterns("/login", "/css/**", "/js/**", "/error");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,125 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
public class AdminBookController {
|
||||
import java.util.List;
|
||||
|
||||
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.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.SessionAttribute;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import com.example.demo.common.BusinessException;
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.form.BookForm;
|
||||
import com.example.demo.service.BookAdminService;
|
||||
|
||||
/** BOOK-02 書籍登録 / BOOK-03 書籍編集(管理者のみ:/admin/** で拒否)。入力 → 確認 → 完了 */
|
||||
@Controller
|
||||
public class AdminBookController {
|
||||
private static final String NEW = "/admin/books/new";
|
||||
private static final String EDIT = "/admin/books/edit";
|
||||
|
||||
private final BookAdminService bookAdminService;
|
||||
|
||||
public AdminBookController(BookAdminService bookAdminService) {
|
||||
this.bookAdminService = bookAdminService;
|
||||
}
|
||||
|
||||
// ===== BOOK-02 登録 =====
|
||||
@GetMapping(NEW)
|
||||
public String newInput(Model model) {
|
||||
return input(new BookForm(), List.of(), "書籍登録", NEW, model);
|
||||
}
|
||||
|
||||
@PostMapping(NEW + "/input")
|
||||
public String newBack(@ModelAttribute("form") BookForm form, Model model) {
|
||||
return input(form, List.of(), "書籍登録", NEW, model);
|
||||
}
|
||||
|
||||
@PostMapping(NEW + "/confirm")
|
||||
public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
|
||||
List<String> errors = bookAdminService.validate(form);
|
||||
if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model);
|
||||
return confirm("書籍登録", NEW, model);
|
||||
}
|
||||
|
||||
@PostMapping(NEW + "/execute")
|
||||
public String newExecute(@ModelAttribute("form") BookForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
|
||||
Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
bookAdminService.register(form, admin);
|
||||
} catch (BusinessException e) {
|
||||
return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
|
||||
}
|
||||
ra.addFlashAttribute("message", "書籍登録が完了しました。");
|
||||
return "redirect:" + NEW + "/complete";
|
||||
}
|
||||
|
||||
@GetMapping(NEW + "/complete")
|
||||
public String newComplete(Model model) {
|
||||
model.addAttribute("backUrl", "/books");
|
||||
model.addAttribute("backLabel", "書籍一覧に戻る");
|
||||
return "complete";
|
||||
}
|
||||
|
||||
// ===== BOOK-03 編集 =====
|
||||
@GetMapping(EDIT)
|
||||
public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
|
||||
return input(form, List.of(), "書籍編集", EDIT, model);
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/books";
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping(EDIT + "/input")
|
||||
public String editBack(@ModelAttribute("form") BookForm form, Model model) {
|
||||
return input(form, List.of(), "書籍編集", EDIT, model);
|
||||
}
|
||||
|
||||
@PostMapping(EDIT + "/confirm")
|
||||
public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
|
||||
List<String> errors = bookAdminService.validate(form);
|
||||
if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model);
|
||||
return confirm("書籍編集", EDIT, model);
|
||||
}
|
||||
|
||||
@PostMapping(EDIT + "/execute")
|
||||
public String editExecute(@ModelAttribute("form") BookForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
|
||||
Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
bookAdminService.update(form, admin);
|
||||
} catch (BusinessException e) {
|
||||
return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
|
||||
}
|
||||
ra.addFlashAttribute("message", "書籍編集が完了しました。");
|
||||
return "redirect:" + EDIT + "/complete";
|
||||
}
|
||||
|
||||
@GetMapping(EDIT + "/complete")
|
||||
public String editComplete(Model model) {
|
||||
return newComplete(model);
|
||||
}
|
||||
|
||||
private String input(BookForm form, List<String> errors, String title, String base, Model model) {
|
||||
model.addAttribute("form", form);
|
||||
model.addAttribute("errors", errors);
|
||||
model.addAttribute("title", title);
|
||||
model.addAttribute("base", base);
|
||||
return "bookInput";
|
||||
}
|
||||
|
||||
private String confirm(String title, String base, Model model) {
|
||||
model.addAttribute("title", title);
|
||||
model.addAttribute("base", base);
|
||||
return "bookConfirm";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,118 @@
|
||||
package com.example.demo.controller;
|
||||
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.PostMapping;
|
||||
import org.springframework.web.bind.annotation.SessionAttribute;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import com.example.demo.common.BusinessException;
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.service.LoanService;
|
||||
|
||||
/**
|
||||
* 管理者用:LOAN-02 申請一覧、LOAN-03 承認/却下、LOAN-04 貸出中一覧、LOAN-05 返却。
|
||||
* /admin/** は LoginCheckInterceptor で管理者以外を拒否する。
|
||||
*/
|
||||
@Controller
|
||||
public class AdminLoanController {
|
||||
private final LoanService loanService;
|
||||
|
||||
public AdminLoanController(LoanService loanService) {
|
||||
this.loanService = loanService;
|
||||
}
|
||||
|
||||
// ===== LOAN-02 書籍申請一覧(承認待) =====
|
||||
@GetMapping("/admin/applications")
|
||||
public String applications(Model model) {
|
||||
model.addAttribute("list", loanService.listByStatus(Const.STATUS_WAITING));
|
||||
return "applicationList";
|
||||
}
|
||||
|
||||
// ===== LOAN-03 承認/却下 =====
|
||||
@GetMapping("/admin/applications/{id}")
|
||||
public String approvalConfirm(@PathVariable Integer id, Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
model.addAttribute("r", loanService.getView(id, Const.STATUS_WAITING));
|
||||
return "approvalConfilm";
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/admin/applications";
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/admin/applications/{id}/approve")
|
||||
public String approve(@PathVariable Integer id,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, RedirectAttributes ra) {
|
||||
try {
|
||||
loanService.approve(id, admin);
|
||||
ra.addFlashAttribute("message", "書籍貸出申請を承認しました。");
|
||||
return "approvalComplete";
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/admin/applications";
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/admin/applications/{id}/reject")
|
||||
public String reject(@PathVariable Integer id,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, RedirectAttributes ra) {
|
||||
try {
|
||||
loanService.reject(id, admin);
|
||||
ra.addFlashAttribute("message", "書籍貸出申請を却下しました。");
|
||||
return "approvalRejected";
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/admin/applications";
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/admin/approval/complete")
|
||||
public String approvalComplete(Model model) {
|
||||
model.addAttribute("backUrl", "/admin/applications");
|
||||
model.addAttribute("backLabel", "承認待ち一覧に戻る");
|
||||
return "complete";
|
||||
}
|
||||
|
||||
// ===== LOAN-04 貸出中書籍一覧 =====
|
||||
@GetMapping("/admin/lendings")
|
||||
public String lendings(Model model) {
|
||||
model.addAttribute("list", loanService.listByStatus(Const.STATUS_LENDING));
|
||||
return "lendingList";
|
||||
}
|
||||
|
||||
// ===== LOAN-05 返却 =====
|
||||
@GetMapping("/admin/lendings/{id}")
|
||||
public String returnConfirm(@PathVariable Integer id, Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
model.addAttribute("r", loanService.getView(id, Const.STATUS_LENDING));
|
||||
return "returnConfirm";
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/admin/lendings";
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/admin/lendings/{id}/return")
|
||||
public String doReturn(@PathVariable Integer id,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, RedirectAttributes ra) {
|
||||
try {
|
||||
loanService.returnBook(id, admin);
|
||||
ra.addFlashAttribute("message", "書籍の返却が完了しました。");
|
||||
return "returnComplete";
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/admin/lendings";
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/admin/return/complete")
|
||||
public String returnComplete(Model model) {
|
||||
model.addAttribute("backUrl", "/admin/lendings");
|
||||
model.addAttribute("backLabel", "貸出中書籍一覧に戻る");
|
||||
return "complete";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,39 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.example.demo.service.BookService;
|
||||
|
||||
|
||||
/** BOOK-01:書籍検索(bookList.html) */
|
||||
@Controller
|
||||
public class BookController {
|
||||
private final BookService bookService;
|
||||
|
||||
public BookController(BookService bookService) {
|
||||
this.bookService = bookService;
|
||||
}
|
||||
|
||||
/** メニューの「書籍一覧」=条件なし(全件)、検索ボタン=条件付きで同じURLを使う */
|
||||
@GetMapping("/books")
|
||||
public String list(@RequestParam(defaultValue = "") String nmBook,
|
||||
@RequestParam(defaultValue = "") String publisher,
|
||||
@RequestParam(defaultValue = "") String note,
|
||||
Model model) {
|
||||
model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
|
||||
// 検索条件を保持
|
||||
model.addAttribute("nmBook", nmBook);
|
||||
model.addAttribute("publisher", publisher);
|
||||
model.addAttribute("note", note);
|
||||
return "bookList";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,178 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
public class EmployeeController {
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
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.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.SessionAttribute;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import com.example.demo.common.BusinessException;
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.entity.Employee;
|
||||
import com.example.demo.form.EmployeeForm;
|
||||
import com.example.demo.service.EmployeeService;
|
||||
|
||||
/**
|
||||
* EMP-01 社員登録(管理者のみ:/admin/** で拒否)
|
||||
* EMP-02 社員編集(管理者:メールアドレスで検索して全項目 / 一般:自分のパスワードのみ)
|
||||
*/
|
||||
@Controller
|
||||
public class EmployeeController {
|
||||
private static final String NEW = "/admin/employees/new";
|
||||
private static final String EDIT = "/employees/edit";
|
||||
|
||||
private final EmployeeService employeeService;
|
||||
|
||||
public EmployeeController(EmployeeService employeeService) {
|
||||
this.employeeService = employeeService;
|
||||
}
|
||||
|
||||
// ===== EMP-01 社員登録 =====
|
||||
@GetMapping(NEW)
|
||||
public String registInput(Model model) {
|
||||
return registView(new EmployeeForm(), List.of(), model);
|
||||
}
|
||||
|
||||
@PostMapping(NEW + "/input")
|
||||
public String registBack(@ModelAttribute("form") EmployeeForm form, Model model) {
|
||||
return registView(form, List.of(), model);
|
||||
}
|
||||
|
||||
@PostMapping(NEW + "/confirm")
|
||||
public String registConfirm(@ModelAttribute("form") EmployeeForm form, Model model) {
|
||||
List<String> errors = employeeService.validateRegist(form);
|
||||
if (!errors.isEmpty())
|
||||
return registView(form, errors, model);
|
||||
return "employeeRegistConfirm";
|
||||
}
|
||||
|
||||
@PostMapping(NEW + "/execute")
|
||||
public String registExecute(@ModelAttribute("form") EmployeeForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
|
||||
Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
employeeService.register(form, admin);
|
||||
} catch (BusinessException e) {
|
||||
return registView(form, List.of(e.getMessage()), model);
|
||||
}
|
||||
ra.addFlashAttribute("message", "社員登録が完了しました。");
|
||||
return "redirect:" + NEW + "/complete";
|
||||
}
|
||||
|
||||
@GetMapping(NEW + "/complete")
|
||||
public String registComplete(Model model) {
|
||||
return complete(model);
|
||||
}
|
||||
|
||||
private String registView(EmployeeForm form, List<String> errors, Model model) {
|
||||
model.addAttribute("form", form);
|
||||
model.addAttribute("errors", errors);
|
||||
return "employeeRegistInput";
|
||||
}
|
||||
|
||||
// ===== EMP-02 社員編集 =====
|
||||
|
||||
/** メニュー「社員編集」:管理者は検索画面へ、一般ユーザーは検索せず自分の編集画面へ */
|
||||
@GetMapping("/employees/search")
|
||||
public String search(@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user) {
|
||||
return user.isAdmin() ? "employeeSearch" : "redirect:" + EDIT;
|
||||
}
|
||||
|
||||
@PostMapping("/employees/search")
|
||||
public String doSearch(@RequestParam(defaultValue = "") String mailAddress,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) {
|
||||
if (!user.isAdmin())
|
||||
return "redirect:/menu";
|
||||
Optional<Employee> e = employeeService.findByMail(mailAddress);
|
||||
if (e.isEmpty()) {
|
||||
model.addAttribute("mailAddress", mailAddress);
|
||||
model.addAttribute("errorMessage", "該当する社員が見つかりません。");
|
||||
return "employeeSearch";
|
||||
}
|
||||
return "redirect:" + EDIT + "?idEmployee=" + e.get().getIdEmployee();
|
||||
}
|
||||
|
||||
@GetMapping(EDIT)
|
||||
public String editInput(@RequestParam(required = false) Integer idEmployee,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
|
||||
Model model, RedirectAttributes ra) {
|
||||
// 一般ユーザーは常に自分自身(リクエストの社員IDは使わない)
|
||||
Integer target = user.isAdmin() ? idEmployee : user.getIdEmployee();
|
||||
if (target == null)
|
||||
return "redirect:/employees/search";
|
||||
try {
|
||||
return editView(employeeService.toForm(employeeService.find(target)), List.of(), user, model);
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/menu";
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping(EDIT + "/input")
|
||||
public String editBack(@ModelAttribute("form") EmployeeForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) {
|
||||
fixTarget(form, user);
|
||||
return editView(form, List.of(), user, model);
|
||||
}
|
||||
|
||||
@PostMapping(EDIT + "/confirm")
|
||||
public String editConfirm(@ModelAttribute("form") EmployeeForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) {
|
||||
fixTarget(form, user);
|
||||
List<String> errors = user.isAdmin()
|
||||
? employeeService.validateUpdateByAdmin(form)
|
||||
: employeeService.validateUpdateBySelf(form);
|
||||
if (!errors.isEmpty())
|
||||
return editView(form, errors, user, model);
|
||||
model.addAttribute("admin", user.isAdmin());
|
||||
return "employeeUpdateConfirm";
|
||||
}
|
||||
|
||||
@PostMapping(EDIT + "/execute")
|
||||
public String editExecute(@ModelAttribute("form") EmployeeForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
|
||||
Model model, RedirectAttributes ra) {
|
||||
fixTarget(form, user);
|
||||
try {
|
||||
if (user.isAdmin())
|
||||
employeeService.updateByAdmin(form, user);
|
||||
else
|
||||
employeeService.updateBySelf(form, user);
|
||||
} catch (BusinessException e) {
|
||||
return editView(form, List.of(e.getMessage()), user, model);
|
||||
}
|
||||
ra.addFlashAttribute("message", "社員編集が完了しました。");
|
||||
return "redirect:" + EDIT + "/complete";
|
||||
}
|
||||
|
||||
@GetMapping(EDIT + "/complete")
|
||||
public String editComplete(Model model) {
|
||||
return complete(model);
|
||||
}
|
||||
|
||||
/** 一般ユーザーの対象は常にセッションの社員ID(URL/フォーム値の書き換えを無視) */
|
||||
private static void fixTarget(EmployeeForm form, LoginUser user) {
|
||||
if (!user.isAdmin())
|
||||
form.setIdEmployee(user.getIdEmployee());
|
||||
}
|
||||
|
||||
private String editView(EmployeeForm form, List<String> errors, LoginUser user, Model model) {
|
||||
model.addAttribute("form", form);
|
||||
model.addAttribute("errors", errors);
|
||||
model.addAttribute("admin", user.isAdmin());
|
||||
return "employeeUpdateInput";
|
||||
}
|
||||
|
||||
private String complete(Model model) {
|
||||
model.addAttribute("backUrl", "/menu");
|
||||
model.addAttribute("backLabel", "メニューに戻る");
|
||||
return "complete";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,34 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
public class GlobalExceptionHandler {
|
||||
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.web.bind.annotation.ControllerAdvice;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import org.springframework.web.servlet.resource.NoResourceFoundException;
|
||||
|
||||
/** 予期しない例外:内部情報を画面に出さず、原因調査用にログへ出力する(NFR-04, NFR-08) */
|
||||
@ControllerAdvice
|
||||
public class GlobalExceptionHandler {
|
||||
private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
|
||||
|
||||
/** 存在しないURL(favicon.ico など)はエラーログを出さず404にする */
|
||||
@ExceptionHandler(NoResourceFoundException.class)
|
||||
public ModelAndView handleNotFound(NoResourceFoundException e) {
|
||||
ModelAndView mav = new ModelAndView("error");
|
||||
mav.setStatus(HttpStatus.NOT_FOUND);
|
||||
mav.addObject("errorMessage", "ページが見つかりません。");
|
||||
return mav;
|
||||
}
|
||||
|
||||
@ExceptionHandler(Exception.class)
|
||||
public ModelAndView handle(Exception e) {
|
||||
log.error("予期しないエラーが発生しました", e);
|
||||
ModelAndView mav = new ModelAndView("error");
|
||||
mav.addObject("errorMessage", "システムエラーが発生しました。しばらくしてからもう一度お試しください。");
|
||||
return mav;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
public class LoanContorller {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.SessionAttribute;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import com.example.demo.common.BusinessException;
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.service.LoanService;
|
||||
|
||||
/** LOAN-01:書籍貸出申請(一般ユーザーのみ)。入力 → 確認 → 完了 */
|
||||
@Controller
|
||||
@RequestMapping("/loan")
|
||||
public class LoanController {
|
||||
private final LoanService loanService;
|
||||
|
||||
public LoanController(LoanService loanService) {
|
||||
this.loanService = loanService;
|
||||
}
|
||||
|
||||
/** 書籍一覧 →(申請ボタン)→ 申請入力 */
|
||||
@GetMapping("/apply")
|
||||
public String input(@RequestParam Integer idBook,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
|
||||
Model model, RedirectAttributes ra) {
|
||||
return showInput(idBook, "", "", List.of(), user, model, ra);
|
||||
}
|
||||
|
||||
/** 確認画面 →(申請情報入力に戻る)→ 申請入力(入力値を保持) */
|
||||
@PostMapping("/apply/input")
|
||||
public String back(@RequestParam Integer idBook,
|
||||
@RequestParam(defaultValue = "") String dateBorrow,
|
||||
@RequestParam(defaultValue = "") String dateScheduledReturn,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
|
||||
Model model, RedirectAttributes ra) {
|
||||
return showInput(idBook, dateBorrow, dateScheduledReturn, List.of(), user, model, ra);
|
||||
}
|
||||
|
||||
/** 申請入力 →(申請確認)→ 確認 */
|
||||
@PostMapping("/apply/confirm")
|
||||
public String confirm(@RequestParam Integer idBook,
|
||||
@RequestParam(defaultValue = "") String dateBorrow,
|
||||
@RequestParam(defaultValue = "") String dateScheduledReturn,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
|
||||
Model model, RedirectAttributes ra) {
|
||||
List<String> errors = loanService.validateDates(dateBorrow, dateScheduledReturn);
|
||||
if (!errors.isEmpty()) {
|
||||
return showInput(idBook, dateBorrow, dateScheduledReturn, errors, user, model, ra);
|
||||
}
|
||||
if (user.isAdmin()) return "redirect:/menu";
|
||||
try {
|
||||
model.addAttribute("book", loanService.getLendableBook(idBook));
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/books";
|
||||
}
|
||||
model.addAttribute("idBook", idBook);
|
||||
model.addAttribute("dateBorrow", dateBorrow);
|
||||
model.addAttribute("dateScheduledReturn", dateScheduledReturn);
|
||||
return "loanApplyConfirm";
|
||||
}
|
||||
|
||||
/** 確認 →(申請)→ 完了。二重送信防止のため登録後はリダイレクトする(PRG) */
|
||||
@PostMapping("/apply/execute")
|
||||
public String execute(@RequestParam Integer idBook,
|
||||
@RequestParam(defaultValue = "") String dateBorrow,
|
||||
@RequestParam(defaultValue = "") String dateScheduledReturn,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user,
|
||||
RedirectAttributes ra) {
|
||||
if (user.isAdmin()) return "redirect:/menu";
|
||||
try {
|
||||
Integer id = loanService.apply(idBook, dateBorrow, dateScheduledReturn, user);
|
||||
ra.addFlashAttribute("message", "書籍貸出申請が完了しました。(申請ID:" + id + ")");
|
||||
return "redirect:/loan/apply/complete";
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/books";
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/apply/complete")
|
||||
public String complete(Model model) {
|
||||
model.addAttribute("backUrl", "/books");
|
||||
model.addAttribute("backLabel", "書籍一覧に戻る");
|
||||
return "complete";
|
||||
}
|
||||
|
||||
private String showInput(Integer idBook, String dateBorrow, String dateScheduledReturn, List<String> errors,
|
||||
LoginUser user, Model model, RedirectAttributes ra) {
|
||||
if (user.isAdmin()) return "redirect:/menu"; // 申請は一般ユーザーのみ
|
||||
try {
|
||||
model.addAttribute("book", loanService.getLendableBook(idBook));
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/books";
|
||||
}
|
||||
model.addAttribute("idBook", idBook);
|
||||
model.addAttribute("dateBorrow", dateBorrow);
|
||||
model.addAttribute("dateScheduledReturn", dateScheduledReturn);
|
||||
model.addAttribute("errors", errors);
|
||||
return "loanApplyInput";
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,72 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
public class LoginController {
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.service.AuthService;
|
||||
|
||||
/** AUTH-01:ログイン/ログアウト(login.html) */
|
||||
@Controller
|
||||
public class LoginController {
|
||||
private final AuthService authService;
|
||||
|
||||
public LoginController(AuthService authService) {
|
||||
this.authService = authService;
|
||||
}
|
||||
|
||||
@GetMapping("/")
|
||||
public String root() {
|
||||
return "redirect:/menu";
|
||||
}
|
||||
|
||||
@GetMapping("/login")
|
||||
public String loginForm(HttpSession session) {
|
||||
if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) {
|
||||
return "redirect:/menu";
|
||||
}
|
||||
return "login";
|
||||
}
|
||||
|
||||
@PostMapping("/login")
|
||||
public String login(@RequestParam(defaultValue = "") String mailAddress,
|
||||
@RequestParam(defaultValue = "") String password,
|
||||
HttpServletRequest request, Model model) {
|
||||
String mail = mailAddress.trim();
|
||||
model.addAttribute("mailAddress", mail); // 入力値を保持(パスワードは保持しない)
|
||||
|
||||
if (mail.isEmpty() || password.isEmpty()) {
|
||||
model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。");
|
||||
return "login";
|
||||
}
|
||||
Optional<LoginUser> user = authService.authenticate(mail, password);
|
||||
if (user.isEmpty()) {
|
||||
// どちらが誤りかは分からない文言にする
|
||||
model.addAttribute("errorMessage", "メールアドレスまたはパスワードが正しくありません。");
|
||||
return "login";
|
||||
}
|
||||
// セッション固定化攻撃対策:古いセッションを破棄して新規発行
|
||||
HttpSession old = request.getSession(false);
|
||||
if (old != null) {
|
||||
old.invalidate();
|
||||
}
|
||||
request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get());
|
||||
return "redirect:/menu";
|
||||
}
|
||||
|
||||
@PostMapping("/logout")
|
||||
public String logout(HttpSession session) {
|
||||
session.invalidate();
|
||||
return "redirect:/login";
|
||||
}
|
||||
}
|
||||
@@ -1,19 +1,13 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
/** メニュー画面(menu.html)。表示内容は管理者フラグで切り替える。 */
|
||||
@Controller
|
||||
public class MenuController {
|
||||
|
||||
@GetMapping("/menu")
|
||||
public String showMenu(Model model) {
|
||||
|
||||
// 仮のログインユーザー名
|
||||
model.addAttribute("loginUserName", "テストユーザー");
|
||||
|
||||
// menu.htmlを表示
|
||||
public String menu() {
|
||||
return "menu";
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,72 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
public class BorrowView {
|
||||
import java.time.LocalDate;
|
||||
|
||||
/** 貸出情報+申請者名+書籍情報(一覧・確認画面表示用) */
|
||||
public class BorrowView {
|
||||
private final Integer idRequest;
|
||||
private final String nmApplicant;
|
||||
private final String nmBook;
|
||||
private final LocalDate dateRequest;
|
||||
private final LocalDate dateBorrow;
|
||||
private final LocalDate dateScheduledReturn;
|
||||
private final String isbn;
|
||||
private final String publisher;
|
||||
private final String note;
|
||||
private final String status;
|
||||
|
||||
public BorrowView(Integer idRequest, String nmApplicant, String nmBook, LocalDate dateRequest,
|
||||
LocalDate dateBorrow, LocalDate dateScheduledReturn, String isbn,
|
||||
String publisher, String note, String status) {
|
||||
this.idRequest = idRequest;
|
||||
this.nmApplicant = nmApplicant;
|
||||
this.nmBook = nmBook;
|
||||
this.dateRequest = dateRequest;
|
||||
this.dateBorrow = dateBorrow;
|
||||
this.dateScheduledReturn = dateScheduledReturn;
|
||||
this.isbn = isbn;
|
||||
this.publisher = publisher;
|
||||
this.note = note;
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Integer getIdRequest() {
|
||||
return idRequest;
|
||||
}
|
||||
|
||||
public String getNmApplicant() {
|
||||
return nmApplicant;
|
||||
}
|
||||
|
||||
public String getNmBook() {
|
||||
return nmBook;
|
||||
}
|
||||
|
||||
public LocalDate getDateRequest() {
|
||||
return dateRequest;
|
||||
}
|
||||
|
||||
public LocalDate getDateBorrow() {
|
||||
return dateBorrow;
|
||||
}
|
||||
|
||||
public LocalDate getDateScheduledReturn() {
|
||||
return dateScheduledReturn;
|
||||
}
|
||||
|
||||
public String getIsbn() {
|
||||
return isbn;
|
||||
}
|
||||
|
||||
public String getPublisher() {
|
||||
return publisher;
|
||||
}
|
||||
|
||||
public String getNote() {
|
||||
return note;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,108 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
public class BookCollection {
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
/** 蔵書テーブル */
|
||||
@Entity
|
||||
@Table(name = "book_collection")
|
||||
public class BookCollection {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id_book")
|
||||
private Integer idBook;
|
||||
@Column(name = "isbn")
|
||||
private String isbn;
|
||||
@Column(name = "nm_book")
|
||||
private String nmBook;
|
||||
@Column(name = "kn_book")
|
||||
private String knBook;
|
||||
@Column(name = "publisher")
|
||||
private String publisher;
|
||||
@Column(name = "note", columnDefinition = "text")
|
||||
private String note;
|
||||
@Column(name = "flg_lending")
|
||||
private String flgLending;
|
||||
@Column(name = "id_update")
|
||||
private Integer idUpdate;
|
||||
@Column(name = "date_update")
|
||||
private LocalDateTime dateUpdate;
|
||||
|
||||
public Integer getIdBook() {
|
||||
return idBook;
|
||||
}
|
||||
|
||||
public void setIdBook(Integer v) {
|
||||
this.idBook = v;
|
||||
}
|
||||
|
||||
public String getIsbn() {
|
||||
return isbn;
|
||||
}
|
||||
|
||||
public void setIsbn(String v) {
|
||||
this.isbn = v;
|
||||
}
|
||||
|
||||
public String getNmBook() {
|
||||
return nmBook;
|
||||
}
|
||||
|
||||
public void setNmBook(String v) {
|
||||
this.nmBook = v;
|
||||
}
|
||||
|
||||
public String getKnBook() {
|
||||
return knBook;
|
||||
}
|
||||
|
||||
public void setKnBook(String v) {
|
||||
this.knBook = v;
|
||||
}
|
||||
|
||||
public String getPublisher() {
|
||||
return publisher;
|
||||
}
|
||||
|
||||
public void setPublisher(String v) {
|
||||
this.publisher = v;
|
||||
}
|
||||
|
||||
public String getNote() {
|
||||
return note;
|
||||
}
|
||||
|
||||
public void setNote(String v) {
|
||||
this.note = v;
|
||||
}
|
||||
|
||||
public String getFlgLending() {
|
||||
return flgLending;
|
||||
}
|
||||
|
||||
public void setFlgLending(String v) {
|
||||
this.flgLending = v;
|
||||
}
|
||||
|
||||
public Integer getIdUpdate() {
|
||||
return idUpdate;
|
||||
}
|
||||
|
||||
public void setIdUpdate(Integer v) {
|
||||
this.idUpdate = v;
|
||||
}
|
||||
|
||||
public LocalDateTime getDateUpdate() {
|
||||
return dateUpdate;
|
||||
}
|
||||
|
||||
public void setDateUpdate(LocalDateTime v) {
|
||||
this.dateUpdate = v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,139 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
public class BorrowBook {
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
/** 貸出テーブル(LOAN-01〜05 で使用) */
|
||||
@Entity
|
||||
@Table(name = "borrow_books")
|
||||
public class BorrowBook {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id_request")
|
||||
private Integer idRequest;
|
||||
@Column(name = "id_applicant")
|
||||
private Integer idApplicant;
|
||||
@Column(name = "id_book")
|
||||
private Integer idBook;
|
||||
@Column(name = "date_request")
|
||||
private LocalDate dateRequest;
|
||||
@Column(name = "status")
|
||||
private String status;
|
||||
@Column(name = "id_approval")
|
||||
private Integer idApproval;
|
||||
@Column(name = "date_approval")
|
||||
private LocalDate dateApproval;
|
||||
@Column(name = "date_borrow")
|
||||
private LocalDate dateBorrow;
|
||||
@Column(name = "date_scheduled_return")
|
||||
private LocalDate dateScheduledReturn;
|
||||
@Column(name = "date_return")
|
||||
private LocalDate dateReturn;
|
||||
@Column(name = "id_update")
|
||||
private Integer idUpdate;
|
||||
@Column(name = "date_update")
|
||||
private LocalDateTime dateUpdate;
|
||||
|
||||
public Integer getIdRequest() {
|
||||
return idRequest;
|
||||
}
|
||||
|
||||
public void setIdRequest(Integer v) {
|
||||
this.idRequest = v;
|
||||
}
|
||||
|
||||
public Integer getIdApplicant() {
|
||||
return idApplicant;
|
||||
}
|
||||
|
||||
public void setIdApplicant(Integer v) {
|
||||
this.idApplicant = v;
|
||||
}
|
||||
|
||||
public Integer getIdBook() {
|
||||
return idBook;
|
||||
}
|
||||
|
||||
public void setIdBook(Integer v) {
|
||||
this.idBook = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateRequest() {
|
||||
return dateRequest;
|
||||
}
|
||||
|
||||
public void setDateRequest(LocalDate v) {
|
||||
this.dateRequest = v;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String v) {
|
||||
this.status = v;
|
||||
}
|
||||
|
||||
public Integer getIdApproval() {
|
||||
return idApproval;
|
||||
}
|
||||
|
||||
public void setIdApproval(Integer v) {
|
||||
this.idApproval = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateApproval() {
|
||||
return dateApproval;
|
||||
}
|
||||
|
||||
public void setDateApproval(LocalDate v) {
|
||||
this.dateApproval = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateBorrow() {
|
||||
return dateBorrow;
|
||||
}
|
||||
|
||||
public void setDateBorrow(LocalDate v) {
|
||||
this.dateBorrow = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateScheduledReturn() {
|
||||
return dateScheduledReturn;
|
||||
}
|
||||
|
||||
public void setDateScheduledReturn(LocalDate v) {
|
||||
this.dateScheduledReturn = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateReturn() {
|
||||
return dateReturn;
|
||||
}
|
||||
|
||||
public void setDateReturn(LocalDate v) {
|
||||
this.dateReturn = v;
|
||||
}
|
||||
|
||||
public Integer getIdUpdate() {
|
||||
return idUpdate;
|
||||
}
|
||||
|
||||
public void setIdUpdate(Integer v) {
|
||||
this.idUpdate = v;
|
||||
}
|
||||
|
||||
public LocalDateTime getDateUpdate() {
|
||||
return dateUpdate;
|
||||
}
|
||||
|
||||
public void setDateUpdate(LocalDateTime v) {
|
||||
this.dateUpdate = v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,108 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
public class Employee {
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
/** 社員マスタ */
|
||||
@Entity
|
||||
@Table(name = "employee")
|
||||
public class Employee {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id_employee")
|
||||
private Integer idEmployee;
|
||||
@Column(name = "nm_employee")
|
||||
private String nmEmployee;
|
||||
@Column(name = "kn_employee")
|
||||
private String knEmployee;
|
||||
@Column(name = "mail_address")
|
||||
private String mailAddress;
|
||||
@Column(name = "password")
|
||||
private String password;
|
||||
@Column(name = "flg_admin")
|
||||
private String flgAdmin;
|
||||
@Column(name = "flg_retirement")
|
||||
private String flgRetirement;
|
||||
@Column(name = "id_update")
|
||||
private Integer idUpdate;
|
||||
@Column(name = "date_update")
|
||||
private LocalDateTime dateUpdate;
|
||||
|
||||
public Integer getIdEmployee() {
|
||||
return idEmployee;
|
||||
}
|
||||
|
||||
public void setIdEmployee(Integer v) {
|
||||
this.idEmployee = v;
|
||||
}
|
||||
|
||||
public String getNmEmployee() {
|
||||
return nmEmployee;
|
||||
}
|
||||
|
||||
public void setNmEmployee(String v) {
|
||||
this.nmEmployee = v;
|
||||
}
|
||||
|
||||
public String getKnEmployee() {
|
||||
return knEmployee;
|
||||
}
|
||||
|
||||
public void setKnEmployee(String v) {
|
||||
this.knEmployee = v;
|
||||
}
|
||||
|
||||
public String getMailAddress() {
|
||||
return mailAddress;
|
||||
}
|
||||
|
||||
public void setMailAddress(String v) {
|
||||
this.mailAddress = v;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String v) {
|
||||
this.password = v;
|
||||
}
|
||||
|
||||
public String getFlgAdmin() {
|
||||
return flgAdmin;
|
||||
}
|
||||
|
||||
public void setFlgAdmin(String v) {
|
||||
this.flgAdmin = v;
|
||||
}
|
||||
|
||||
public String getFlgRetirement() {
|
||||
return flgRetirement;
|
||||
}
|
||||
|
||||
public void setFlgRetirement(String v) {
|
||||
this.flgRetirement = v;
|
||||
}
|
||||
|
||||
public Integer getIdUpdate() {
|
||||
return idUpdate;
|
||||
}
|
||||
|
||||
public void setIdUpdate(Integer v) {
|
||||
this.idUpdate = v;
|
||||
}
|
||||
|
||||
public LocalDateTime getDateUpdate() {
|
||||
return dateUpdate;
|
||||
}
|
||||
|
||||
public void setDateUpdate(LocalDateTime v) {
|
||||
this.dateUpdate = v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,71 @@
|
||||
package com.example.demo.form;
|
||||
|
||||
/** 書籍登録・編集フォーム */
|
||||
public class BookForm {
|
||||
private Integer idBook;
|
||||
private String isbn = "";
|
||||
private String nmBook = "";
|
||||
private String knBook = "";
|
||||
private String publisher = "";
|
||||
private String note = "";
|
||||
|
||||
public void trim() {
|
||||
isbn = t(isbn);
|
||||
nmBook = t(nmBook);
|
||||
knBook = t(knBook);
|
||||
publisher = t(publisher);
|
||||
note = t(note);
|
||||
}
|
||||
|
||||
private static String t(String s) {
|
||||
return s == null ? "" : s.trim();
|
||||
}
|
||||
|
||||
public Integer getIdBook() {
|
||||
return idBook;
|
||||
}
|
||||
|
||||
public void setIdBook(Integer v) {
|
||||
this.idBook = v;
|
||||
}
|
||||
|
||||
public String getIsbn() {
|
||||
return isbn;
|
||||
}
|
||||
|
||||
public void setIsbn(String v) {
|
||||
this.isbn = v;
|
||||
}
|
||||
|
||||
public String getNmBook() {
|
||||
return nmBook;
|
||||
}
|
||||
|
||||
public void setNmBook(String v) {
|
||||
this.nmBook = v;
|
||||
}
|
||||
|
||||
public String getKnBook() {
|
||||
return knBook;
|
||||
}
|
||||
|
||||
public void setKnBook(String v) {
|
||||
this.knBook = v;
|
||||
}
|
||||
|
||||
public String getPublisher() {
|
||||
return publisher;
|
||||
}
|
||||
|
||||
public void setPublisher(String v) {
|
||||
this.publisher = v;
|
||||
}
|
||||
|
||||
public String getNote() {
|
||||
return note;
|
||||
}
|
||||
|
||||
public void setNote(String v) {
|
||||
this.note = v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,82 @@
|
||||
package com.example.demo.form;
|
||||
|
||||
/** 社員登録・編集フォーム */
|
||||
public class EmployeeForm {
|
||||
private Integer idEmployee;
|
||||
private String nmEmployee = "";
|
||||
private String knEmployee = "";
|
||||
private String mailAddress = "";
|
||||
private String password = "";
|
||||
private String flgAdmin = "0";
|
||||
private String flgRetirement = "0";
|
||||
|
||||
public void trim() {
|
||||
nmEmployee = t(nmEmployee);
|
||||
knEmployee = t(knEmployee);
|
||||
mailAddress = t(mailAddress);
|
||||
flgAdmin = t(flgAdmin);
|
||||
flgRetirement = t(flgRetirement);
|
||||
if (password == null)
|
||||
password = "";
|
||||
}
|
||||
|
||||
private static String t(String s) {
|
||||
return s == null ? "" : s.trim();
|
||||
}
|
||||
|
||||
public Integer getIdEmployee() {
|
||||
return idEmployee;
|
||||
}
|
||||
|
||||
public void setIdEmployee(Integer v) {
|
||||
this.idEmployee = v;
|
||||
}
|
||||
|
||||
public String getNmEmployee() {
|
||||
return nmEmployee;
|
||||
}
|
||||
|
||||
public void setNmEmployee(String v) {
|
||||
this.nmEmployee = v;
|
||||
}
|
||||
|
||||
public String getKnEmployee() {
|
||||
return knEmployee;
|
||||
}
|
||||
|
||||
public void setKnEmployee(String v) {
|
||||
this.knEmployee = v;
|
||||
}
|
||||
|
||||
public String getMailAddress() {
|
||||
return mailAddress;
|
||||
}
|
||||
|
||||
public void setMailAddress(String v) {
|
||||
this.mailAddress = v;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String v) {
|
||||
this.password = v;
|
||||
}
|
||||
|
||||
public String getFlgAdmin() {
|
||||
return flgAdmin;
|
||||
}
|
||||
|
||||
public void setFlgAdmin(String v) {
|
||||
this.flgAdmin = v;
|
||||
}
|
||||
|
||||
public String getFlgRetirement() {
|
||||
return flgRetirement;
|
||||
}
|
||||
|
||||
public void setFlgRetirement(String v) {
|
||||
this.flgRetirement = v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,39 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
public class BookCollectionRepository {
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
import com.example.demo.entity.BookCollection;
|
||||
|
||||
public interface BookCollectionRepository extends JpaRepository<BookCollection, Integer> {
|
||||
|
||||
/**
|
||||
* 貸出可の蔵書を部分一致(AND)で検索する。
|
||||
* 空文字の条件は「指定なし」。LIKE の特殊文字は呼び出し側で '!' を使ってエスケープ済み。
|
||||
*/
|
||||
@Query("select b from BookCollection b "
|
||||
+ "where b.flgLending = :lending "
|
||||
+ "and (:nm = '' or b.nmBook like concat('%', :nm, '%') escape '!') "
|
||||
+ "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
|
||||
+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
|
||||
+ "order by b.idBook")
|
||||
List<BookCollection> search(@Param("lending") String lending,
|
||||
@Param("nm") String nm,
|
||||
@Param("publisher") String publisher,
|
||||
@Param("note") String note);
|
||||
|
||||
/**
|
||||
* 貸出フラグを from → to に更新する(現在値が from のときだけ更新)。
|
||||
* 戻り値が0なら、既に他の操作で状態が変わっている(状態不整合)。
|
||||
*/
|
||||
@Modifying(clearAutomatically = true, flushAutomatically = true)
|
||||
@Query("update BookCollection b set b.flgLending = :to, b.idUpdate = :uid, b.dateUpdate = :now "
|
||||
+ "where b.idBook = :id and b.flgLending = :from")
|
||||
int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
|
||||
@Param("uid") Integer uid, @Param("now") LocalDateTime now);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,36 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
public class BorrowBookRepository {
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import jakarta.persistence.LockModeType;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Lock;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
import com.example.demo.dto.BorrowView;
|
||||
import com.example.demo.entity.BorrowBook;
|
||||
|
||||
public interface BorrowBookRepository extends JpaRepository<BorrowBook, Integer> {
|
||||
|
||||
String VIEW = "select new com.example.demo.dto.BorrowView("
|
||||
+ "r.idRequest, e.nmEmployee, b.nmBook, r.dateRequest, r.dateBorrow, r.dateScheduledReturn, "
|
||||
+ "b.isbn, b.publisher, b.note, r.status) "
|
||||
+ "from BorrowBook r, Employee e, BookCollection b "
|
||||
+ "where r.idApplicant = e.idEmployee and r.idBook = b.idBook ";
|
||||
|
||||
/** LOAN-02 / LOAN-04:ステータス指定の一覧 */
|
||||
@Query(VIEW + "and r.status = :status order by r.idRequest")
|
||||
List<BorrowView> findViewsByStatus(@Param("status") String status);
|
||||
|
||||
/** 確認画面用:申請IDで1件 */
|
||||
@Query(VIEW + "and r.idRequest = :id")
|
||||
List<BorrowView> findViewById(@Param("id") Integer id);
|
||||
|
||||
/** 承認・却下・返却:更新前に行ロックを取って同時操作を防ぐ */
|
||||
@Lock(LockModeType.PESSIMISTIC_WRITE)
|
||||
@Query("select r from BorrowBook r where r.idRequest = :id")
|
||||
Optional<BorrowBook> findForUpdate(@Param("id") Integer id);
|
||||
}
|
||||
@@ -1,5 +1,13 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
public class EmployeeRepository {
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import com.example.demo.entity.Employee;
|
||||
|
||||
public interface EmployeeRepository extends JpaRepository<Employee, Integer> {
|
||||
Optional<Employee> findByMailAddressAndFlgRetirement(String mailAddress, String flgRetirement);
|
||||
|
||||
Optional<Employee> findByMailAddress(String mailAddress);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,34 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
public class AuthService {
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.entity.Employee;
|
||||
import com.example.demo.repository.EmployeeRepository;
|
||||
|
||||
/** AUTH-01:認証 */
|
||||
@Service
|
||||
public class AuthService {
|
||||
private final EmployeeRepository employeeRepository;
|
||||
|
||||
public AuthService(EmployeeRepository employeeRepository) {
|
||||
this.employeeRepository = employeeRepository;
|
||||
}
|
||||
|
||||
/** 在籍中の社員のうち、メールアドレスとパスワードが一致する者を返す。一致しなければ empty。 */
|
||||
public Optional<LoginUser> authenticate(String mailAddress, String password) {
|
||||
return employeeRepository
|
||||
.findByMailAddressAndFlgRetirement(mailAddress, Const.RETIRE_NO)
|
||||
.filter(e -> e.getPassword().equals(password))
|
||||
.map(AuthService::toLoginUser);
|
||||
}
|
||||
|
||||
private static LoginUser toLoginUser(Employee e) {
|
||||
return new LoginUser(e.getIdEmployee(), e.getNmEmployee(), e.getKnEmployee(),
|
||||
e.getMailAddress(), e.getFlgAdmin());
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,93 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.common.BusinessException;
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.entity.BookCollection;
|
||||
import com.example.demo.form.BookForm;
|
||||
import com.example.demo.repository.BookCollectionRepository;
|
||||
|
||||
/** BOOK-02:書籍登録、BOOK-03:書籍編集 */
|
||||
|
||||
@Service
|
||||
public class BookAdminService {
|
||||
private final BookCollectionRepository bookRepository;
|
||||
|
||||
public BookAdminService(BookCollectionRepository bookRepository) {
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
|
||||
/** 入力チェック(ISBN必須13文字以内、書籍名必須50、よみ100、出版社50)。※ISBNを数字13桁に限定するかは要確認 */
|
||||
public List<String> validate(BookForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
if (f.getIsbn().isEmpty()) e.add("ISBNを入力してください。");
|
||||
else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。");
|
||||
if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。");
|
||||
else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。");
|
||||
if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。");
|
||||
if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。");
|
||||
return e;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public BookCollection find(Integer idBook) {
|
||||
return bookRepository.findById(idBook)
|
||||
.orElseThrow(() -> new BusinessException("対象の書籍が見つかりません。"));
|
||||
}
|
||||
|
||||
public BookForm toForm(BookCollection b) {
|
||||
BookForm f = new BookForm();
|
||||
f.setIdBook(b.getIdBook());
|
||||
f.setIsbn(b.getIsbn());
|
||||
f.setNmBook(b.getNmBook());
|
||||
f.setKnBook(b.getKnBook() == null ? "" : b.getKnBook());
|
||||
f.setPublisher(b.getPublisher() == null ? "" : b.getPublisher());
|
||||
f.setNote(b.getNote() == null ? "" : b.getNote());
|
||||
return f;
|
||||
}
|
||||
|
||||
/** 新規登録:貸出可として登録する。 */
|
||||
@Transactional
|
||||
public Integer register(BookForm f, LoginUser admin) {
|
||||
check(f);
|
||||
BookCollection b = new BookCollection();
|
||||
apply(b, f);
|
||||
b.setFlgLending(Const.LENDING_OK);
|
||||
b.setIdUpdate(admin.getIdEmployee());
|
||||
b.setDateUpdate(LocalDateTime.now());
|
||||
return bookRepository.save(b).getIdBook();
|
||||
}
|
||||
|
||||
/** 編集:書籍情報のみ更新する(貸出フラグは変更しない)。 */
|
||||
@Transactional
|
||||
public void update(BookForm f, LoginUser admin) {
|
||||
check(f);
|
||||
BookCollection b = find(f.getIdBook());
|
||||
apply(b, f);
|
||||
b.setIdUpdate(admin.getIdEmployee());
|
||||
b.setDateUpdate(LocalDateTime.now());
|
||||
}
|
||||
|
||||
private void check(BookForm f) {
|
||||
List<String> errors = validate(f);
|
||||
if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
|
||||
}
|
||||
|
||||
|
||||
private static void apply(BookCollection b, BookForm f) {
|
||||
b.setIsbn(f.getIsbn());
|
||||
b.setNmBook(f.getNmBook());
|
||||
b.setKnBook(f.getKnBook().isEmpty() ? null : f.getKnBook());
|
||||
b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher());
|
||||
b.setNote(f.getNote().isEmpty() ? null : f.getNote());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,33 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
public class BookService {
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.entity.BookCollection;
|
||||
import com.example.demo.repository.BookCollectionRepository;
|
||||
|
||||
/** BOOK-01:書籍検索 */
|
||||
@Service
|
||||
public class BookService {
|
||||
private final BookCollectionRepository bookRepository;
|
||||
|
||||
public BookService(BookCollectionRepository bookRepository) {
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
|
||||
/** 貸出可の蔵書を検索する。全て未入力なら全件。 */
|
||||
@Transactional(readOnly = true)
|
||||
public List<BookCollection> searchLendable(String nmBook, String publisher, String note) {
|
||||
return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note));
|
||||
}
|
||||
|
||||
/** 前後の空白除去+LIKE特殊文字(! % _)のエスケープ(エスケープ文字は '!') */
|
||||
static String normalize(String s) {
|
||||
if (s == null) return "";
|
||||
return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,164 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
public class EmployeeService {
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.springframework.dao.DataIntegrityViolationException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.common.BusinessException;
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.entity.Employee;
|
||||
import com.example.demo.form.EmployeeForm;
|
||||
import com.example.demo.repository.EmployeeRepository;
|
||||
|
||||
/** EMP-01:社員登録、EMP-02:社員編集 */
|
||||
@Service
|
||||
public class EmployeeService {
|
||||
private static final Pattern MAIL = Pattern.compile("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");
|
||||
private static final String MSG_DUP = "このメールアドレスは既に登録されています。";
|
||||
|
||||
private final EmployeeRepository employeeRepository;
|
||||
|
||||
public EmployeeService(EmployeeRepository employeeRepository) {
|
||||
this.employeeRepository = employeeRepository;
|
||||
}
|
||||
|
||||
// ---------- 検索 ----------
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Optional<Employee> findByMail(String mail) {
|
||||
return employeeRepository.findByMailAddress(mail == null ? "" : mail.trim());
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Employee find(Integer id) {
|
||||
return employeeRepository.findById(id)
|
||||
.orElseThrow(() -> new BusinessException("対象の社員が見つかりません。"));
|
||||
}
|
||||
|
||||
/** 編集画面の初期値(パスワードは空:管理者は変更時のみ入力) */
|
||||
public EmployeeForm toForm(Employee e) {
|
||||
EmployeeForm f = new EmployeeForm();
|
||||
f.setIdEmployee(e.getIdEmployee());
|
||||
f.setNmEmployee(e.getNmEmployee());
|
||||
f.setKnEmployee(e.getKnEmployee());
|
||||
f.setMailAddress(e.getMailAddress());
|
||||
f.setFlgAdmin(e.getFlgAdmin());
|
||||
f.setFlgRetirement(e.getFlgRetirement());
|
||||
return f;
|
||||
}
|
||||
|
||||
// ---------- 入力チェック ----------
|
||||
|
||||
/** 社員登録:社員名・よみ・メール・管理者フラグ。パスワードは初期値で登録する。 */
|
||||
public List<String> validateRegist(EmployeeForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
checkBasic(f, e);
|
||||
checkMail(f, null, e);
|
||||
checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
|
||||
return e;
|
||||
}
|
||||
|
||||
/** 管理者による編集:全項目。パスワードは空なら変更しない。 */
|
||||
public List<String> validateUpdateByAdmin(EmployeeForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
checkBasic(f, e);
|
||||
checkMail(f, f.getIdEmployee(), e);
|
||||
checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
|
||||
checkFlag(f.getFlgRetirement(), "退職フラグ", e);
|
||||
if (f.getPassword().length() > 256) e.add("パスワードは256文字以内で入力してください。");
|
||||
return e;
|
||||
}
|
||||
|
||||
/** 一般ユーザーによる編集:パスワードのみ(必須)。 */
|
||||
public List<String> validateUpdateBySelf(EmployeeForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
if (f.getPassword().isEmpty()) e.add("パスワードを入力してください。");
|
||||
else if (f.getPassword().length() > 256) e.add("パスワードは256文字以内で入力してください。");
|
||||
return e;
|
||||
}
|
||||
|
||||
private void checkBasic(EmployeeForm f, List<String> e) {
|
||||
if (f.getNmEmployee().isEmpty()) e.add("社員名を入力してください。");
|
||||
else if (f.getNmEmployee().length() > 50) e.add("社員名は50文字以内で入力してください。");
|
||||
// ※社員名よみの文字種(ひらがなのみ等)は設計で確定する。現状は文字数のみチェック
|
||||
if (f.getKnEmployee().isEmpty()) e.add("社員名よみを入力してください。");
|
||||
else if (f.getKnEmployee().length() > 100) e.add("社員名よみは100文字以内で入力してください。");
|
||||
}
|
||||
|
||||
private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {
|
||||
String m = f.getMailAddress();
|
||||
if (m.isEmpty()) { e.add("メールアドレスを入力してください。"); return; }
|
||||
if (m.length() > 256) { e.add("メールアドレスは256文字以内で入力してください。"); return; }
|
||||
if (!MAIL.matcher(m).matches()) { e.add("メールアドレスの形式が正しくありません。"); return; }
|
||||
Optional<Employee> dup = employeeRepository.findByMailAddress(m);
|
||||
if (dup.isPresent() && !dup.get().getIdEmployee().equals(selfId)) e.add(MSG_DUP);
|
||||
}
|
||||
|
||||
private static void checkFlag(String v, String label, List<String> e) {
|
||||
if (!"0".equals(v) && !"1".equals(v)) e.add(label + "が正しくありません。");
|
||||
}
|
||||
|
||||
// ---------- 登録・更新 ----------
|
||||
|
||||
@Transactional
|
||||
public Integer register(EmployeeForm f, LoginUser admin) {
|
||||
raise(validateRegist(f));
|
||||
Employee e = new Employee();
|
||||
e.setNmEmployee(f.getNmEmployee());
|
||||
e.setKnEmployee(f.getKnEmployee());
|
||||
e.setMailAddress(f.getMailAddress());
|
||||
e.setPassword(Const.DEFAULT_PASSWORD);
|
||||
e.setFlgAdmin(f.getFlgAdmin());
|
||||
e.setFlgRetirement(Const.RETIRE_NO);
|
||||
e.setIdUpdate(admin.getIdEmployee());
|
||||
e.setDateUpdate(LocalDateTime.now());
|
||||
try {
|
||||
return employeeRepository.saveAndFlush(e).getIdEmployee();
|
||||
} catch (DataIntegrityViolationException ex) {
|
||||
throw new BusinessException(MSG_DUP); // 同時登録によるUNIQUE制約違反
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void updateByAdmin(EmployeeForm f, LoginUser admin) {
|
||||
raise(validateUpdateByAdmin(f));
|
||||
Employee e = find(f.getIdEmployee());
|
||||
e.setNmEmployee(f.getNmEmployee());
|
||||
e.setKnEmployee(f.getKnEmployee());
|
||||
e.setMailAddress(f.getMailAddress());
|
||||
if (!f.getPassword().isEmpty()) e.setPassword(f.getPassword());
|
||||
e.setFlgAdmin(f.getFlgAdmin());
|
||||
e.setFlgRetirement(f.getFlgRetirement());
|
||||
e.setIdUpdate(admin.getIdEmployee());
|
||||
e.setDateUpdate(LocalDateTime.now());
|
||||
try {
|
||||
employeeRepository.saveAndFlush(e);
|
||||
} catch (DataIntegrityViolationException ex) {
|
||||
throw new BusinessException(MSG_DUP);
|
||||
}
|
||||
}
|
||||
|
||||
/** 一般ユーザー:自分自身(セッションの社員ID)のパスワードのみ更新する。 */
|
||||
@Transactional
|
||||
public void updateBySelf(EmployeeForm f, LoginUser self) {
|
||||
raise(validateUpdateBySelf(f));
|
||||
Employee e = find(self.getIdEmployee());
|
||||
e.setPassword(f.getPassword());
|
||||
e.setIdUpdate(self.getIdEmployee());
|
||||
e.setDateUpdate(LocalDateTime.now());
|
||||
}
|
||||
|
||||
private static void raise(List<String> errors) {
|
||||
if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,159 @@
|
||||
package com.example.demo.service;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeParseException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.common.BusinessException;
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.dto.BorrowView;
|
||||
import com.example.demo.entity.BookCollection;
|
||||
import com.example.demo.entity.BorrowBook;
|
||||
import com.example.demo.repository.BookCollectionRepository;
|
||||
import com.example.demo.repository.BorrowBookRepository;
|
||||
|
||||
/** LOAN-01〜05:貸出申請・承認/却下・返却。貸出ステータスと蔵書の貸出フラグは同一トランザクションで更新する。 */
|
||||
@Service
|
||||
public class LoanService {
|
||||
private static final String MSG_STATE = "他の操作で状態が変わっています。最新の状態を確認してください。";
|
||||
|
||||
private final BorrowBookRepository borrowRepository;
|
||||
private final BookCollectionRepository bookRepository;
|
||||
|
||||
public LoanService(BorrowBookRepository borrowRepository, BookCollectionRepository bookRepository) {
|
||||
this.borrowRepository = borrowRepository;
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
|
||||
// ---------- LOAN-01 貸出申請 ----------
|
||||
|
||||
/** 貸出可の蔵書を取得する。存在しない/貸出不可なら BusinessException。 */
|
||||
@Transactional(readOnly = true)
|
||||
public BookCollection getLendableBook(Integer idBook) {
|
||||
return bookRepository.findById(idBook)
|
||||
.filter(b -> Const.LENDING_OK.equals(b.getFlgLending()))
|
||||
.orElseThrow(() -> new BusinessException("この書籍は現在貸出できません。書籍一覧を確認してください。"));
|
||||
}
|
||||
|
||||
/** 貸出日・返却予定日の入力チェック。エラーがなければ空のリスト。 */
|
||||
public List<String> validateDates(String dateBorrow, String dateScheduledReturn) {
|
||||
List<String> errors = new ArrayList<>();
|
||||
LocalDate b = parse(dateBorrow);
|
||||
LocalDate r = parse(dateScheduledReturn);
|
||||
if (isBlank(dateBorrow)) errors.add("貸出日を入力してください。");
|
||||
else if (b == null) errors.add("貸出日の形式が正しくありません。");
|
||||
if (isBlank(dateScheduledReturn)) errors.add("返却予定日を入力してください。");
|
||||
else if (r == null) errors.add("返却予定日の形式が正しくありません。");
|
||||
if (b != null && r != null && r.isBefore(b)) errors.add("返却予定日は貸出日より前の日付にできません。");
|
||||
return errors;
|
||||
}
|
||||
|
||||
public static LocalDate parse(String s) {
|
||||
if (isBlank(s)) return null;
|
||||
try {
|
||||
return LocalDate.parse(s.trim());
|
||||
} catch (DateTimeParseException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isBlank(String s) {
|
||||
return s == null || s.trim().isEmpty();
|
||||
}
|
||||
|
||||
/** 申請を登録し、蔵書を貸出不可にする(全体で1トランザクション)。 */
|
||||
@Transactional
|
||||
public Integer apply(Integer idBook, String dateBorrow, String dateScheduledReturn, LoginUser user) {
|
||||
List<String> errors = validateDates(dateBorrow, dateScheduledReturn);
|
||||
if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
|
||||
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
// 貸出可 → 貸出不可。0件なら他の人が先に申請済み
|
||||
int updated = bookRepository.updateLending(idBook, Const.LENDING_OK, Const.LENDING_NG, user.getIdEmployee(), now);
|
||||
if (updated == 0) throw new BusinessException("この書籍は現在貸出できません。書籍一覧を確認してください。");
|
||||
|
||||
BorrowBook r = new BorrowBook();
|
||||
r.setIdApplicant(user.getIdEmployee());
|
||||
r.setIdBook(idBook);
|
||||
r.setDateRequest(LocalDate.now());
|
||||
r.setStatus(Const.STATUS_WAITING);
|
||||
r.setDateBorrow(parse(dateBorrow));
|
||||
r.setDateScheduledReturn(parse(dateScheduledReturn));
|
||||
r.setIdUpdate(user.getIdEmployee());
|
||||
r.setDateUpdate(now);
|
||||
return borrowRepository.save(r).getIdRequest();
|
||||
}
|
||||
|
||||
// ---------- 一覧・確認画面 ----------
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<BorrowView> listByStatus(String status) {
|
||||
return borrowRepository.findViewsByStatus(status);
|
||||
}
|
||||
|
||||
/** 申請IDで1件取得し、期待するステータスであることを確認する。 */
|
||||
@Transactional(readOnly = true)
|
||||
public BorrowView getView(Integer idRequest, String expectedStatus) {
|
||||
BorrowView v = borrowRepository.findViewById(idRequest).stream().findFirst()
|
||||
.orElseThrow(() -> new BusinessException("対象の申請が見つかりません。"));
|
||||
if (!expectedStatus.equals(v.getStatus())) throw new BusinessException(MSG_STATE);
|
||||
return v;
|
||||
}
|
||||
|
||||
// ---------- LOAN-03 承認/却下 ----------
|
||||
|
||||
@Transactional
|
||||
public void approve(Integer idRequest, LoginUser admin) {
|
||||
BorrowBook r = lockWithStatus(idRequest, Const.STATUS_WAITING);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
r.setStatus(Const.STATUS_LENDING);
|
||||
r.setIdApproval(admin.getIdEmployee());
|
||||
r.setDateApproval(LocalDate.now());
|
||||
r.setIdUpdate(admin.getIdEmployee());
|
||||
r.setDateUpdate(now);
|
||||
// 蔵書の貸出フラグは貸出不可のまま
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void reject(Integer idRequest, LoginUser admin) {
|
||||
BorrowBook r = lockWithStatus(idRequest, Const.STATUS_WAITING);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
r.setStatus(Const.STATUS_REJECTED);
|
||||
r.setIdUpdate(admin.getIdEmployee());
|
||||
r.setDateUpdate(now);
|
||||
borrowRepository.saveAndFlush(r);
|
||||
releaseBook(r.getIdBook(), admin, now);
|
||||
}
|
||||
|
||||
// ---------- LOAN-05 返却 ----------
|
||||
|
||||
@Transactional
|
||||
public void returnBook(Integer idRequest, LoginUser admin) {
|
||||
BorrowBook r = lockWithStatus(idRequest, Const.STATUS_LENDING);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
r.setStatus(Const.STATUS_RETURNED);
|
||||
r.setDateReturn(LocalDate.now());
|
||||
r.setIdUpdate(admin.getIdEmployee());
|
||||
r.setDateUpdate(now);
|
||||
borrowRepository.saveAndFlush(r);
|
||||
releaseBook(r.getIdBook(), admin, now);
|
||||
}
|
||||
|
||||
private BorrowBook lockWithStatus(Integer idRequest, String expectedStatus) {
|
||||
BorrowBook r = borrowRepository.findForUpdate(idRequest)
|
||||
.orElseThrow(() -> new BusinessException("対象の申請が見つかりません。"));
|
||||
if (!expectedStatus.equals(r.getStatus())) throw new BusinessException(MSG_STATE);
|
||||
return r;
|
||||
}
|
||||
|
||||
/** 蔵書を貸出可に戻す。失敗時は例外でトランザクション全体がロールバックされる。 */
|
||||
private void releaseBook(Integer idBook, LoginUser admin, LocalDateTime now) {
|
||||
int updated = bookRepository.updateLending(idBook, Const.LENDING_NG, Const.LENDING_OK, admin.getIdEmployee(), now);
|
||||
if (updated == 0) throw new BusinessException(MSG_STATE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
spring.application.name=book-rent
|
||||
# --- MySQL (CREATE DATABASE.sql で作成した book_manage) ---
|
||||
spring.datasource.url=jdbc:mysql://localhost:3306/book_manage?serverTimezone=Asia/Tokyo&characterEncoding=UTF-8
|
||||
spring.datasource.username=bookuser
|
||||
spring.datasource.password=Book2026
|
||||
|
||||
# テーブルはSQLで作成済み。JPAでは変更しない
|
||||
spring.jpa.hibernate.ddl-auto=none
|
||||
spring.jpa.open-in-view=false
|
||||
spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
|
||||
|
||||
spring.thymeleaf.cache=false
|
||||
server.servlet.session.timeout=30m
|
||||
|
||||
90
book-rent/src/main/resources/static/css/style.css
Normal file
90
book-rent/src/main/resources/static/css/style.css
Normal file
@@ -0,0 +1,90 @@
|
||||
body
|
||||
{font-family:
|
||||
"Meiryo","Hiragino Sans",sans-serif;
|
||||
margin:0;color:#222;
|
||||
background:#f6f7f9}
|
||||
header.top
|
||||
{display:flex;
|
||||
justify-content:space-between;
|
||||
align-items:center;
|
||||
background:#176a78;color:#fff;
|
||||
padding:10px 20px
|
||||
}
|
||||
header.top form
|
||||
{display:inline;
|
||||
margin:0}
|
||||
header.top .user
|
||||
{margin-right:12px
|
||||
}
|
||||
main
|
||||
{max-width:960px;
|
||||
margin:24px auto;
|
||||
padding:0 16px
|
||||
}
|
||||
h1
|
||||
{font-size:20px
|
||||
}
|
||||
.card
|
||||
{background:#fff;
|
||||
border:1px solid #dde;
|
||||
border-radius:6px;
|
||||
padding:20px;
|
||||
margin-bottom:16px
|
||||
}
|
||||
label
|
||||
{display:block;
|
||||
margin:10px 0 4px;
|
||||
font-weight:bold
|
||||
}
|
||||
input[type=text],input[type=password],input[type=email]
|
||||
{width:100%;
|
||||
max-width:360px;
|
||||
padding:6px;
|
||||
box-sizing:border-box
|
||||
}
|
||||
button,.btn
|
||||
{display:inline-block;
|
||||
background:#176a78;
|
||||
color:#fff;border:0;
|
||||
border-radius:4px;
|
||||
padding:7px 16px;
|
||||
cursor:pointer;
|
||||
text-decoration:none;
|
||||
font-size:14px
|
||||
}
|
||||
button.sub,.btn.sub
|
||||
{background:#6b7b80
|
||||
}
|
||||
.error
|
||||
{background:#fdecea;color:#b3261e;
|
||||
border:1px solid #f5c2be;
|
||||
padding:8px 12px;
|
||||
border-radius:4px;
|
||||
margin-bottom:12px
|
||||
}
|
||||
.info
|
||||
{background:#e8f4ea;
|
||||
color:#1b5e20;
|
||||
border:1px solid #bfdcc3;
|
||||
padding:8px 12px;
|
||||
border-radius:4px;
|
||||
margin-bottom:12px
|
||||
}
|
||||
table
|
||||
{border-collapse:collapse;
|
||||
width:100%;
|
||||
background:#fff
|
||||
}
|
||||
th,td
|
||||
{border:1px solid #dde;
|
||||
padding:6px 8px;
|
||||
text-align:left;
|
||||
font-size:14px
|
||||
}
|
||||
th
|
||||
{background:#eaf4f6
|
||||
}
|
||||
.menu a
|
||||
{display:block;
|
||||
margin:8px 0
|
||||
}
|
||||
34
book-rent/src/main/resources/templates/applicationList.html
Normal file
34
book-rent/src/main/resources/templates/applicationList.html
Normal file
@@ -0,0 +1,34 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出申請一覧(承認待ち)</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍貸出申請一覧(承認待ち)</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<p th:if="${#lists.isEmpty(list)}">承認待ちの申請はありません。</p>
|
||||
<table th:unless="${#lists.isEmpty(list)}">
|
||||
<thead><tr><th>申請ID</th><th>申請者名</th><th>書籍名</th><th>申請日</th><th>貸出日</th><th>返却予定日</th><th>操作</th></tr></thead>
|
||||
<tbody>
|
||||
<tr th:each="r : ${list}">
|
||||
<td th:text="${r.idRequest}"></td>
|
||||
<td th:text="${r.nmApplicant}"></td>
|
||||
<td th:text="${r.nmBook}"></td>
|
||||
<td th:text="${r.dateRequest}"></td>
|
||||
<td th:text="${r.dateBorrow}"></td>
|
||||
<td th:text="${r.dateScheduledReturn}"></td>
|
||||
<td><a class="btn" th:href="@{/admin/applications/{id}(id=${r.idRequest})}">承認</a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<p><a class="btn sub" th:href="@{/menu}">メニューに戻る</a></p>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
23
book-rent/src/main/resources/templates/approvalComplete.html
Normal file
23
book-rent/src/main/resources/templates/approvalComplete.html
Normal file
@@ -0,0 +1,23 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出申請</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main class="complete-container">
|
||||
<h1>完了</h1>
|
||||
<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
|
||||
|
||||
<p>
|
||||
<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
|
||||
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
|
||||
</p>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
82
book-rent/src/main/resources/templates/approvalConfilm.html
Normal file
82
book-rent/src/main/resources/templates/approvalConfilm.html
Normal file
@@ -0,0 +1,82 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出承認確認</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍貸出承認確認</h1>
|
||||
<div class="card">
|
||||
<table>
|
||||
<tr>
|
||||
<th>申請ID</th>
|
||||
<td th:text="${r.idRequest}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>申請者名</th>
|
||||
<td th:text="${r.nmApplicant}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>申請日</th>
|
||||
<td th:text="${r.dateRequest}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>ISBN</th>
|
||||
<td th:text="${r.isbn}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>書籍名</th>
|
||||
<td th:text="${r.nmBook}" style="width: 700px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>出版社</th>
|
||||
<td th:text="${r.publisher}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>特記事項</th>
|
||||
<td th:text="${r.note}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>貸出日</th>
|
||||
<td th:text="${r.dateBorrow}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>返却予定日</th>
|
||||
<td th:text="${r.dateScheduledReturn}"></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div class="buttonSection" style="margin-top: 20px;">
|
||||
|
||||
<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
|
||||
style="display: inline;">
|
||||
<button type="submit">承認</button>
|
||||
</form>
|
||||
|
||||
|
||||
<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
|
||||
style="display: inline; margin-left: 10px;">
|
||||
<button type="submit" class="sub">却下</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
|
||||
|
||||
<script>
|
||||
function logoutSubmit() {
|
||||
if (confirm("ログアウトしますか?")) {
|
||||
window.location.href = "/logout";
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
25
book-rent/src/main/resources/templates/approvalRejected.html
Normal file
25
book-rent/src/main/resources/templates/approvalRejected.html
Normal file
@@ -0,0 +1,25 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出申請</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main class="complete-container">
|
||||
<h1>却下</h1>
|
||||
<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
|
||||
|
||||
<p>
|
||||
<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
|
||||
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
|
||||
</p>
|
||||
|
||||
</main>
|
||||
</body>
|
||||
|
||||
|
||||
</html>
|
||||
42
book-rent/src/main/resources/templates/bookConfirm.html
Normal file
42
book-rent/src/main/resources/templates/bookConfirm.html
Normal file
@@ -0,0 +1,42 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍情報確認</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍情報確認</h1>
|
||||
<div class="card">
|
||||
<h2 th:text="${title}">書籍登録</h2>
|
||||
<table>
|
||||
<tr><th>ISBN</th><td th:text="${form.isbn}"></td></tr>
|
||||
<tr><th>書籍名</th><td th:text="${form.nmBook}"></td></tr>
|
||||
<tr><th>書籍名よみ</th><td th:text="${form.knBook}"></td></tr>
|
||||
<tr><th>出版社</th><td th:text="${form.publisher}"></td></tr>
|
||||
<tr><th>特記事項</th><td th:text="${form.note}"></td></tr>
|
||||
</table>
|
||||
<form th:action="@{${base + '/execute'}}" method="post" style="display:inline">
|
||||
<input type="hidden" name="idBook" th:value="${form.idBook}">
|
||||
<input type="hidden" name="isbn" th:value="${form.isbn}">
|
||||
<input type="hidden" name="nmBook" th:value="${form.nmBook}">
|
||||
<input type="hidden" name="knBook" th:value="${form.knBook}">
|
||||
<input type="hidden" name="publisher" th:value="${form.publisher}">
|
||||
<input type="hidden" name="note" th:value="${form.note}">
|
||||
<button type="submit" th:text="${title == '書籍登録'} ? '登録' : '編集'">登録</button>
|
||||
</form>
|
||||
<form th:action="@{${base + '/input'}}" method="post" style="display:inline">
|
||||
<input type="hidden" name="idBook" th:value="${form.idBook}">
|
||||
<input type="hidden" name="isbn" th:value="${form.isbn}">
|
||||
<input type="hidden" name="nmBook" th:value="${form.nmBook}">
|
||||
<input type="hidden" name="knBook" th:value="${form.knBook}">
|
||||
<input type="hidden" name="publisher" th:value="${form.publisher}">
|
||||
<input type="hidden" name="note" th:value="${form.note}">
|
||||
<button type="submit" class="sub">書籍情報入力に戻る</button>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
34
book-rent/src/main/resources/templates/bookInput.html
Normal file
34
book-rent/src/main/resources/templates/bookInput.html
Normal file
@@ -0,0 +1,34 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍情報入力</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍情報入力</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<h2 th:text="${title}">書籍登録</h2>
|
||||
<form th:action="@{${base + '/confirm'}}" method="post">
|
||||
<input type="hidden" name="idBook" th:value="${form.idBook}">
|
||||
<label for="isbn">ISBN(必須・13文字以内)</label>
|
||||
<input type="text" id="isbn" name="isbn" th:value="${form.isbn}" maxlength="13">
|
||||
<label for="nmBook">書籍名(必須・50文字以内)</label>
|
||||
<input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
|
||||
<label for="knBook">書籍名よみ(100文字以内)</label>
|
||||
<input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
|
||||
<label for="publisher">出版社(50文字以内)</label>
|
||||
<input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
|
||||
<label for="note">特記事項</label>
|
||||
<input type="text" id="note" name="note" th:value="${form.note}">
|
||||
<p><button type="submit" th:text="${title} + '確認'">確認</button>
|
||||
<a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
67
book-rent/src/main/resources/templates/bookList.html
Normal file
67
book-rent/src/main/resources/templates/bookList.html
Normal file
@@ -0,0 +1,67 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍一覧</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍一覧</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="card">
|
||||
<form th:action="@{/books}" method="get">
|
||||
<label for="nmBook">書籍名</label>
|
||||
<input type="text" id="nmBook" name="nmBook" th:value="${nmBook}">
|
||||
<label for="publisher">出版社</label>
|
||||
<input type="text" id="publisher" name="publisher" th:value="${publisher}">
|
||||
<label for="note">特記事項</label>
|
||||
<input type="text" id="note" name="note" th:value="${note}">
|
||||
<p><button type="submit">検索</button>
|
||||
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
|
||||
<a class="btn" th:if="${session.loginUser.admin}" th:href="@{/admin/books/new}">書籍新規登録</a>
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>検索結果</h2>
|
||||
<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>
|
||||
<table th:unless="${#lists.isEmpty(books)}">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>蔵書ID</th>
|
||||
<th>ISBN</th>
|
||||
<th>書籍名</th>
|
||||
<th>書籍名よみ</th>
|
||||
<th>出版社</th>
|
||||
<th>特記事項</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="b : ${books}">
|
||||
<td th:text="${b.idBook}"></td>
|
||||
<td th:text="${b.isbn}"></td>
|
||||
<td th:text="${b.nmBook}"></td>
|
||||
<td th:text="${b.knBook}"></td>
|
||||
<td th:text="${b.publisher}"></td>
|
||||
<td th:text="${b.note}"></td>
|
||||
<td>
|
||||
<!-- 一般:貸出申請(LOAN-01) / 管理者:編集(BOOK-03) -->
|
||||
<a class="btn" th:unless="${session.loginUser.admin}"
|
||||
th:href="@{/loan/apply(idBook=${b.idBook})}">貸出申請</a>
|
||||
<a class="btn" th:if="${session.loginUser.admin}"
|
||||
th:href="@{/admin/books/edit(idBook=${b.idBook})}">編集</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
19
book-rent/src/main/resources/templates/complete.html
Normal file
19
book-rent/src/main/resources/templates/complete.html
Normal file
@@ -0,0 +1,19 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>完了</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>完了</h1>
|
||||
<div class="info" th:text="${message} ?: '処理が完了しました。'"></div>
|
||||
<p>
|
||||
<a class="btn" th:href="@{${backUrl}}" th:text="${backLabel}">戻る</a>
|
||||
<!-- <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
|
||||
</p>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,79 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>社員登録確認画面</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<!-- 共通ヘッダー -->
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>社員登録確認</h1>
|
||||
<!-- エラーメッセージ -->
|
||||
<div class="error"
|
||||
th:if="${errors != null and !errors.isEmpty()}">
|
||||
<p th:each="error : ${errors}"
|
||||
th:text="${error}">
|
||||
</p>
|
||||
</div>
|
||||
<div class="card">
|
||||
<p>以下の内容で登録します。内容を確認してください。</p>
|
||||
<!-- 登録ボタン -->
|
||||
<form th:action="@{/admin/employees/new/execute}"
|
||||
th:object="${form}"
|
||||
method="post">
|
||||
<table>
|
||||
<tr>
|
||||
<th>社員名</th>
|
||||
<td th:text="*{nmEmployee}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>社員名よみ</th>
|
||||
<td th:text="*{knEmployee}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>メールアドレス</th>
|
||||
<td th:text="*{mailAddress}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>パスワード</th>
|
||||
<td>********</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>権限</th>
|
||||
<td th:text="*{flgAdmin == '1' ? '管理者' : '一般'}"></td>
|
||||
</tr>
|
||||
</table>
|
||||
<!-- 登録処理に必要な値を引き継ぐ -->
|
||||
<input type="hidden" th:field="*{nmEmployee}">
|
||||
<input type="hidden" th:field="*{knEmployee}">
|
||||
<input type="hidden" th:field="*{mailAddress}">
|
||||
<input type="hidden" th:field="*{password}">
|
||||
<input type="hidden" th:field="*{flgAdmin}">
|
||||
<div class="actions">
|
||||
<button type="submit" class="btn">
|
||||
登録
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
<!-- 入力画面へ戻る -->
|
||||
<form th:action="@{/admin/employees/new/input}"
|
||||
th:object="${form}"
|
||||
method="post">
|
||||
<input type="hidden" th:field="*{nmEmployee}">
|
||||
<input type="hidden" th:field="*{knEmployee}">
|
||||
<input type="hidden" th:field="*{mailAddress}">
|
||||
<input type="hidden" th:field="*{password}">
|
||||
<input type="hidden" th:field="*{flgAdmin}">
|
||||
<div class="back-link">
|
||||
<button type="submit" class="sub">
|
||||
社員情報入力に戻る
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,69 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>社員登録画面</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<!-- 共通ヘッダー -->
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<!-- 社員登録入力画面 -->
|
||||
<main>
|
||||
<h2>社員登録</h2>
|
||||
<!-- 入力エラー表示 -->
|
||||
<div th:if="${errors != null and !errors.isEmpty()}">
|
||||
<p th:each="error : ${errors}"
|
||||
th:text="${error}"
|
||||
class="error">
|
||||
</p>
|
||||
</div>
|
||||
<form th:action="@{/admin/employees/new/confirm}"
|
||||
th:object="${form}"
|
||||
method="post">
|
||||
<div>
|
||||
<label for="nmEmployee">社員名</label>
|
||||
<input type="text"
|
||||
id="nmEmployee"
|
||||
th:field="*{nmEmployee}">
|
||||
</div>
|
||||
<div>
|
||||
<label for="knEmployee">社員名よみ</label>
|
||||
<input type="text"
|
||||
id="knEmployee"
|
||||
th:field="*{knEmployee}">
|
||||
</div>
|
||||
<div>
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
<input type="email"
|
||||
id="mailAddress"
|
||||
th:field="*{mailAddress}">
|
||||
</div>
|
||||
<div>
|
||||
<label for="password">パスワード</label>
|
||||
<input type="password"
|
||||
id="password"
|
||||
th:field="*{password}">
|
||||
</div>
|
||||
<fieldset>
|
||||
<legend>権限</legend>
|
||||
<label>
|
||||
<input type="radio"
|
||||
th:field="*{flgAdmin}"
|
||||
value="0">
|
||||
一般
|
||||
</label>
|
||||
<label>
|
||||
<input type="radio"
|
||||
th:field="*{flgAdmin}"
|
||||
value="1">
|
||||
管理者
|
||||
</label>
|
||||
</fieldset>
|
||||
<button type="submit">登録確認</button>
|
||||
</form>
|
||||
<a th:href="@{/menu}">メニューへ戻る</a>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
29
book-rent/src/main/resources/templates/employeeSearch.html
Normal file
29
book-rent/src/main/resources/templates/employeeSearch.html
Normal file
@@ -0,0 +1,29 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>社員検索</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>社員検索</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<form th:action="@{/employees/search}" method="post">
|
||||
<label for="mailAddress">メールアドレス(256文字以内)</label>
|
||||
<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}">
|
||||
|
||||
<p><button type="submit">検索</button>
|
||||
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,67 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>社員編集確認</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>社員編集確認</h1>
|
||||
<div class="card">
|
||||
<table>
|
||||
<th:block th:if="${admin}">
|
||||
<tr>
|
||||
<th>社員名</th>
|
||||
<td th:text="${form.nmEmployee}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>社員名よみ</th>
|
||||
<td th:text="${form.knEmployee}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>メールアドレス</th>
|
||||
<td th:text="${form.mailAddress}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>管理者フラグ</th>
|
||||
<td th:text="${form.flgAdmin == '1'} ? '1:管理者' : '0:一般'"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>退職フラグ</th>
|
||||
<td th:text="${form.flgRetirement == '1'} ? '1:退職' : '0:所属'"></td>
|
||||
</tr>
|
||||
</th:block>
|
||||
<tr>
|
||||
<th>パスワード</th>
|
||||
<td th:text="${#strings.isEmpty(form.password)} ? '(変更しない)' : '********'"></td>
|
||||
</tr>
|
||||
</table>
|
||||
<form th:action="@{/employees/edit/execute}" method="post" style="display:inline">
|
||||
<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
|
||||
<input type="hidden" name="nmEmployee" th:value="${form.nmEmployee}">
|
||||
<input type="hidden" name="knEmployee" th:value="${form.knEmployee}">
|
||||
<input type="hidden" name="mailAddress" th:value="${form.mailAddress}">
|
||||
<input type="hidden" name="flgAdmin" th:value="${form.flgAdmin}">
|
||||
<input type="hidden" name="flgRetirement" th:value="${form.flgRetirement}">
|
||||
<input type="hidden" name="password" th:value="${form.password}">
|
||||
<button type="submit">編集</button>
|
||||
</form>
|
||||
<form th:action="@{/employees/edit/input}" method="post" style="display:inline">
|
||||
<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
|
||||
<input type="hidden" name="nmEmployee" th:value="${form.nmEmployee}">
|
||||
<input type="hidden" name="knEmployee" th:value="${form.knEmployee}">
|
||||
<input type="hidden" name="mailAddress" th:value="${form.mailAddress}">
|
||||
<input type="hidden" name="flgAdmin" th:value="${form.flgAdmin}">
|
||||
<input type="hidden" name="flgRetirement" th:value="${form.flgRetirement}">
|
||||
<input type="hidden" name="password" th:value="${form.password}">
|
||||
<button type="submit" class="sub">社員情報入力に戻る</button>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,52 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>社員編集</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>社員編集</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<form th:action="@{/employees/edit/confirm}" method="post">
|
||||
<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
|
||||
<th:block th:if="${admin}">
|
||||
<label for="nmEmployee">社員名(必須・50文字以内)</label>
|
||||
<input type="text" id="nmEmployee" name="nmEmployee" th:value="${form.nmEmployee}" maxlength="50">
|
||||
<label for="knEmployee">社員名よみ(必須・100文字以内)</label>
|
||||
<input type="text" id="knEmployee" name="knEmployee" th:value="${form.knEmployee}" maxlength="100">
|
||||
<label for="mailAddress">メールアドレス(必須)</label>
|
||||
<input type="text" id="mailAddress" name="mailAddress" th:value="${form.mailAddress}"
|
||||
maxlength="256">
|
||||
<label for="flgAdmin">管理者フラグ</label>
|
||||
<select id="flgAdmin" name="flgAdmin">
|
||||
<option value="0" th:selected="${form.flgAdmin == '0'}">0:一般</option>
|
||||
<option value="1" th:selected="${form.flgAdmin == '1'}">1:管理者</option>
|
||||
</select>
|
||||
<label for="flgRetirement">退職フラグ</label>
|
||||
<select id="flgRetirement" name="flgRetirement">
|
||||
<option value="0" th:selected="${form.flgRetirement == '0'}">0:所属</option>
|
||||
<option value="1" th:selected="${form.flgRetirement == '1'}">1:退職</option>
|
||||
</select>
|
||||
<label for="password">パスワード(変更する場合のみ入力)</label>
|
||||
</th:block>
|
||||
<th:block th:unless="${admin}">
|
||||
<p>※パスワードのみ変更できます。</p>
|
||||
<label for="password">新しいパスワード(必須)</label>
|
||||
</th:block>
|
||||
<input type="password" id="password" name="password" maxlength="256" autocomplete="new-password">
|
||||
<p><button type="submit">編集確認</button>
|
||||
<a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
17
book-rent/src/main/resources/templates/error.html
Normal file
17
book-rent/src/main/resources/templates/error.html
Normal file
@@ -0,0 +1,17 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>エラー</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<main>
|
||||
<h1>エラー</h1>
|
||||
<div class="card">
|
||||
<div class="error" th:text="${errorMessage} ?: 'エラーが発生しました。'"></div>
|
||||
<a class="btn" th:href="@{/menu}">メニューに戻る</a>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
15
book-rent/src/main/resources/templates/fragments/header.html
Normal file
15
book-rent/src/main/resources/templates/fragments/header.html
Normal file
@@ -0,0 +1,15 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<body>
|
||||
<!-- ログイン後の全画面共通ヘッダー:右上にログイン者名とログアウト(要件定義書 7.1) -->
|
||||
<header class="top" th:fragment="header">
|
||||
<span>書籍貸出管理システム</span>
|
||||
<span>
|
||||
<span class="user" th:text="${session.loginUser.nmEmployee}">社員名</span>
|
||||
<form th:action="@{/logout}" method="post"><button type="submit" class="sub">ログアウト</button></form>
|
||||
</span>
|
||||
</header>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
34
book-rent/src/main/resources/templates/lendingList.html
Normal file
34
book-rent/src/main/resources/templates/lendingList.html
Normal file
@@ -0,0 +1,34 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>貸出中書籍一覧</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>貸出中書籍一覧</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<p th:if="${#lists.isEmpty(list)}">貸出中の書籍はありません。</p>
|
||||
<table th:unless="${#lists.isEmpty(list)}">
|
||||
<thead><tr><th>申請ID</th><th>申請者名</th><th>書籍名</th><th>申請日</th><th>貸出日</th><th>返却予定日</th><th>操作</th></tr></thead>
|
||||
<tbody>
|
||||
<tr th:each="r : ${list}">
|
||||
<td th:text="${r.idRequest}"></td>
|
||||
<td th:text="${r.nmApplicant}"></td>
|
||||
<td th:text="${r.nmBook}"></td>
|
||||
<td th:text="${r.dateRequest}"></td>
|
||||
<td th:text="${r.dateBorrow}"></td>
|
||||
<td th:text="${r.dateScheduledReturn}"></td>
|
||||
<td><a class="btn" th:href="@{/admin/lendings/{id}(id=${r.idRequest})}">返却</a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<p><a class="btn sub" th:href="@{/menu}">メニューに戻る</a></p>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
38
book-rent/src/main/resources/templates/loanApplyConfirm.html
Normal file
38
book-rent/src/main/resources/templates/loanApplyConfirm.html
Normal file
@@ -0,0 +1,38 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出申請確認</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍貸出申請確認</h1>
|
||||
<div class="card">
|
||||
<table>
|
||||
<tr><th>書籍名</th><td th:text="${book.nmBook}"></td></tr>
|
||||
<tr><th>ISBN</th><td th:text="${book.isbn}"></td></tr>
|
||||
<tr><th>出版社</th><td th:text="${book.publisher}"></td></tr>
|
||||
<tr><th>特記事項</th><td th:text="${book.note}"></td></tr>
|
||||
</table>
|
||||
<table>
|
||||
<tr><th>貸出日</th><td th:text="${dateBorrow}"></td></tr>
|
||||
<tr><th>返却予定日</th><td th:text="${dateScheduledReturn}"></td></tr>
|
||||
</table>
|
||||
<form th:action="@{/loan/apply/execute}" method="post" style="display:inline">
|
||||
<input type="hidden" name="idBook" th:value="${idBook}">
|
||||
<input type="hidden" name="dateBorrow" th:value="${dateBorrow}">
|
||||
<input type="hidden" name="dateScheduledReturn" th:value="${dateScheduledReturn}">
|
||||
<button type="submit">申請</button>
|
||||
</form>
|
||||
<form th:action="@{/loan/apply/input}" method="post" style="display:inline">
|
||||
<input type="hidden" name="idBook" th:value="${idBook}">
|
||||
<input type="hidden" name="dateBorrow" th:value="${dateBorrow}">
|
||||
<input type="hidden" name="dateScheduledReturn" th:value="${dateScheduledReturn}">
|
||||
<button type="submit" class="sub">申請情報入力に戻る</button>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
33
book-rent/src/main/resources/templates/loanApplyInput.html
Normal file
33
book-rent/src/main/resources/templates/loanApplyInput.html
Normal file
@@ -0,0 +1,33 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍貸出申請</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍貸出申請</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<table>
|
||||
<tr><th>書籍名</th><td th:text="${book.nmBook}"></td></tr>
|
||||
<tr><th>ISBN</th><td th:text="${book.isbn}"></td></tr>
|
||||
<tr><th>出版社</th><td th:text="${book.publisher}"></td></tr>
|
||||
<tr><th>特記事項</th><td th:text="${book.note}"></td></tr>
|
||||
</table>
|
||||
<form th:action="@{/loan/apply/confirm}" method="post">
|
||||
<input type="hidden" name="idBook" th:value="${idBook}">
|
||||
<label for="dateBorrow">貸出日</label>
|
||||
<input type="date" id="dateBorrow" name="dateBorrow" th:value="${dateBorrow}">
|
||||
<label for="dateScheduledReturn">返却予定日</label>
|
||||
<input type="date" id="dateScheduledReturn" name="dateScheduledReturn" th:value="${dateScheduledReturn}">
|
||||
<p><button type="submit">申請確認</button>
|
||||
<a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
@@ -3,92 +3,121 @@
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<!-- 外部スクリプトの読み込み -->
|
||||
<script th:src="@{/js/common.js}"></script>
|
||||
|
||||
<!-- CSSの読み込み -->
|
||||
<link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">
|
||||
|
||||
<title>ログイン</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<main>
|
||||
<h1>書籍貸出管理システム</h1>
|
||||
<div class="card">
|
||||
<h2>ログイン</h2>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<form th:action="@{/login}" method="post">
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}"
|
||||
autocomplete="username">
|
||||
<label for="password">パスワード</label>
|
||||
<input type="password" id="password" name="password" autocomplete="current-password">
|
||||
<p><button type="submit">ログイン</button></p>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
<div class="loginContainer">
|
||||
</html>
|
||||
|
||||
<h1>ログイン</h1>
|
||||
<!--<!DOCTYPE html>-->
|
||||
<!--<html xmlns:th="http://www.thymeleaf.org">-->
|
||||
|
||||
<form th:action="@{/doLogin}"
|
||||
method="post"
|
||||
th:object="${loginInfoForm}">
|
||||
<!--<head>-->
|
||||
<!-- <meta charset="UTF-8">-->
|
||||
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
|
||||
|
||||
<!-- 外部スクリプトの読み込み -->
|
||||
<!-- <script th:src="@{/js/common.js}"></script>-->
|
||||
|
||||
<!-- CSSの読み込み -->
|
||||
<!-- <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">-->
|
||||
<!-- <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">-->
|
||||
|
||||
<!-- <title>ログイン</title>-->
|
||||
<!--</head>-->
|
||||
|
||||
<!--<body>-->
|
||||
|
||||
<!-- <div class="loginContainer">-->
|
||||
|
||||
<!-- <h1>ログイン</h1>-->
|
||||
|
||||
<!-- <form th:action="@{/doLogin}"-->
|
||||
<!-- method="post"-->
|
||||
<!-- th:object="${loginInfoForm}">-->
|
||||
|
||||
<!-- エラーメッセージ -->
|
||||
<div class="msgBox error"
|
||||
th:if="${messageError != null}">
|
||||
<span class="error"
|
||||
th:text="${messageError.message}"></span>
|
||||
</div>
|
||||
<!-- <div class="msgBox error"-->
|
||||
<!-- th:if="${messageError != null}">-->
|
||||
<!-- <span class="error"-->
|
||||
<!-- th:text="${messageError.message}"></span>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<table>
|
||||
<!-- <table>-->
|
||||
<!-- メールアドレス -->
|
||||
<tr>
|
||||
<th class="header">メールアドレス</th>
|
||||
<td>
|
||||
<input
|
||||
id="mailAddress"
|
||||
type="text"
|
||||
th:field="*{mailAddress}"
|
||||
placeholder="メールアドレス"
|
||||
required
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- <tr>-->
|
||||
<!-- <th class="header">メールアドレス</th>-->
|
||||
<!-- <td>-->
|
||||
<!-- <input-->
|
||||
<!-- id="mailAddress"-->
|
||||
<!-- type="text"-->
|
||||
<!-- th:field="*{mailAddress}"-->
|
||||
<!-- placeholder="メールアドレス"-->
|
||||
<!-- required-->
|
||||
<!-- />-->
|
||||
<!-- </td>-->
|
||||
<!-- </tr>-->
|
||||
|
||||
<!-- パスワード -->
|
||||
<tr>
|
||||
<th class="header">パスワード</th>
|
||||
<td>
|
||||
<input
|
||||
id="password"
|
||||
type="password"
|
||||
th:field="*{password}"
|
||||
placeholder="パスワード"
|
||||
required
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- <tr>-->
|
||||
<!-- <th class="header">パスワード</th>-->
|
||||
<!-- <td>-->
|
||||
<!-- <input-->
|
||||
<!-- id="password"-->
|
||||
<!-- type="password"-->
|
||||
<!-- th:field="*{password}"-->
|
||||
<!-- placeholder="パスワード"-->
|
||||
<!-- required-->
|
||||
<!-- />-->
|
||||
<!-- </td>-->
|
||||
<!-- </tr>-->
|
||||
|
||||
<!-- ボタン -->
|
||||
<tr>
|
||||
<td class="btnArea" colspan="2">
|
||||
<input
|
||||
type="submit"
|
||||
value="ログイン"
|
||||
/>
|
||||
<!-- <tr>-->
|
||||
<!-- <td class="btnArea" colspan="2">-->
|
||||
<!-- <input-->
|
||||
<!-- type="submit"-->
|
||||
<!-- value="ログイン"-->
|
||||
<!-- />-->
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onclick="clearInput()">
|
||||
リセット
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<!-- <button-->
|
||||
<!-- type="button"-->
|
||||
<!-- onclick="clearInput()">-->
|
||||
<!-- リセット-->
|
||||
<!-- </button>-->
|
||||
<!-- </td>-->
|
||||
<!-- </tr>-->
|
||||
<!-- </table>-->
|
||||
|
||||
</form>
|
||||
<!-- </form>-->
|
||||
|
||||
</div>
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- 入力内容のリセット -->
|
||||
<script>
|
||||
function clearInput() {
|
||||
document.getElementById('mailAddress').value = '';
|
||||
document.getElementById('password').value = '';
|
||||
}
|
||||
</script>
|
||||
<!-- <script>-->
|
||||
<!-- function clearInput() {-->
|
||||
<!-- document.getElementById('mailAddress').value = '';-->
|
||||
<!-- document.getElementById('password').value = '';-->
|
||||
<!-- }-->
|
||||
<!-- </script>-->
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<!--</body>-->
|
||||
<!--</html>-->
|
||||
@@ -1,36 +1,28 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>メニュー</title>
|
||||
|
||||
<link rel="stylesheet" th:href="@{/css/all.css}">
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>メニュー</h1>
|
||||
|
||||
<div class="userInfo">
|
||||
<span>ログインユーザー:</span>
|
||||
<span th:text="${loginUserName}">ユーザー名</span>
|
||||
|
||||
<form th:action="@{/logout}" method="post">
|
||||
<button type="submit">ログアウト</button>
|
||||
</form>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="card menu">
|
||||
<a class="btn" th:href="@{/books}">書籍一覧</a>
|
||||
<!-- 管理者のみ(サーバー側でも /admin/** は管理者以外を拒否している) -->
|
||||
<th:block th:if="${session.loginUser.admin}">
|
||||
<a class="btn" th:href="@{/admin/applications}">書籍貸出申請一覧</a>
|
||||
<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧</a>
|
||||
<a class="btn" th:href="@{/admin/employees/new}">社員登録</a>
|
||||
</th:block>
|
||||
<a class="btn" th:href="@{/employees/search}">社員編集</a>
|
||||
</div>
|
||||
|
||||
<div class="menuArea">
|
||||
<form th:action="@{/book/list}" method="get">
|
||||
<button type="submit">書籍一覧</button>
|
||||
</form>
|
||||
|
||||
<form th:action="@{/book/rent}" method="get">
|
||||
<button type="submit">書籍貸出申請一覧</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
23
book-rent/src/main/resources/templates/returnComplete.html
Normal file
23
book-rent/src/main/resources/templates/returnComplete.html
Normal file
@@ -0,0 +1,23 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍返却完了</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main class="complete-container">
|
||||
<h1>返却完了</h1>
|
||||
<div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div>
|
||||
|
||||
<p>
|
||||
<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
|
||||
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
|
||||
</p>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
31
book-rent/src/main/resources/templates/returnConfirm.html
Normal file
31
book-rent/src/main/resources/templates/returnConfirm.html
Normal file
@@ -0,0 +1,31 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍返却確認</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍返却確認</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<table>
|
||||
<tr><th>申請ID</th><td th:text="${r.idRequest}"></td></tr>
|
||||
<tr><th>申請者名</th><td th:text="${r.nmApplicant}"></td></tr>
|
||||
<tr><th>申請日</th><td th:text="${r.dateRequest}"></td></tr>
|
||||
<tr><th>ISBN</th><td th:text="${r.isbn}"></td></tr>
|
||||
<tr><th>書籍名</th><td th:text="${r.nmBook}"></td></tr>
|
||||
<tr><th>出版社</th><td th:text="${r.publisher}"></td></tr>
|
||||
<tr><th>特記事項</th><td th:text="${r.note}"></td></tr>
|
||||
<tr><th>貸出日</th><td th:text="${r.dateBorrow}"></td></tr>
|
||||
<tr><th>返却予定日</th><td th:text="${r.dateScheduledReturn}"></td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<form method="post" style="display:inline" th:action="@{/admin/lendings/{id}/return(id=${r.idRequest})}"><button type="submit">返却</button></form>
|
||||
<a class="btn sub" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
2
book_rent/.gitattributes
vendored
Normal file
2
book_rent/.gitattributes
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
/mvnw text eol=lf
|
||||
*.cmd text eol=crlf
|
||||
33
book_rent/.gitignore
vendored
Normal file
33
book_rent/.gitignore
vendored
Normal file
@@ -0,0 +1,33 @@
|
||||
HELP.md
|
||||
target/
|
||||
.mvn/wrapper/maven-wrapper.jar
|
||||
!**/src/main/**/target/
|
||||
!**/src/test/**/target/
|
||||
|
||||
### STS ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
.factorypath
|
||||
.project
|
||||
.settings
|
||||
.springBeans
|
||||
.sts4-cache
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
### NetBeans ###
|
||||
/nbproject/private/
|
||||
/nbbuild/
|
||||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
build/
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
3
book_rent/.mvn/wrapper/maven-wrapper.properties
vendored
Normal file
3
book_rent/.mvn/wrapper/maven-wrapper.properties
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
wrapperVersion=3.3.4
|
||||
distributionType=only-script
|
||||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip
|
||||
295
book_rent/mvnw
vendored
Normal file
295
book_rent/mvnw
vendored
Normal file
@@ -0,0 +1,295 @@
|
||||
#!/bin/sh
|
||||
# ----------------------------------------------------------------------------
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you 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
|
||||
#
|
||||
# http://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.
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Apache Maven Wrapper startup batch script, version 3.3.4
|
||||
#
|
||||
# Optional ENV vars
|
||||
# -----------------
|
||||
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
|
||||
# MVNW_REPOURL - repo url base for downloading maven distribution
|
||||
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
||||
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
set -euf
|
||||
[ "${MVNW_VERBOSE-}" != debug ] || set -x
|
||||
|
||||
# OS specific support.
|
||||
native_path() { printf %s\\n "$1"; }
|
||||
case "$(uname)" in
|
||||
CYGWIN* | MINGW*)
|
||||
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
|
||||
native_path() { cygpath --path --windows "$1"; }
|
||||
;;
|
||||
esac
|
||||
|
||||
# set JAVACMD and JAVACCMD
|
||||
set_java_home() {
|
||||
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
|
||||
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"
|
||||
JAVACCMD="$JAVA_HOME/jre/sh/javac"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACCMD="$JAVA_HOME/bin/javac"
|
||||
|
||||
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
|
||||
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
|
||||
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
else
|
||||
JAVACMD="$(
|
||||
'set' +e
|
||||
'unset' -f command 2>/dev/null
|
||||
'command' -v java
|
||||
)" || :
|
||||
JAVACCMD="$(
|
||||
'set' +e
|
||||
'unset' -f command 2>/dev/null
|
||||
'command' -v javac
|
||||
)" || :
|
||||
|
||||
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
|
||||
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# hash string like Java String::hashCode
|
||||
hash_string() {
|
||||
str="${1:-}" h=0
|
||||
while [ -n "$str" ]; do
|
||||
char="${str%"${str#?}"}"
|
||||
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
|
||||
str="${str#?}"
|
||||
done
|
||||
printf %x\\n $h
|
||||
}
|
||||
|
||||
verbose() { :; }
|
||||
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
|
||||
|
||||
die() {
|
||||
printf %s\\n "$1" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
trim() {
|
||||
# MWRAPPER-139:
|
||||
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
|
||||
# Needed for removing poorly interpreted newline sequences when running in more
|
||||
# exotic environments such as mingw bash on Windows.
|
||||
printf "%s" "${1}" | tr -d '[:space:]'
|
||||
}
|
||||
|
||||
scriptDir="$(dirname "$0")"
|
||||
scriptName="$(basename "$0")"
|
||||
|
||||
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
|
||||
while IFS="=" read -r key value; do
|
||||
case "${key-}" in
|
||||
distributionUrl) distributionUrl=$(trim "${value-}") ;;
|
||||
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
|
||||
esac
|
||||
done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
||||
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
||||
|
||||
case "${distributionUrl##*/}" in
|
||||
maven-mvnd-*bin.*)
|
||||
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
|
||||
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
|
||||
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
|
||||
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
|
||||
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
|
||||
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
|
||||
*)
|
||||
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
|
||||
distributionPlatform=linux-amd64
|
||||
;;
|
||||
esac
|
||||
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
|
||||
;;
|
||||
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
|
||||
*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
|
||||
esac
|
||||
|
||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
||||
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
|
||||
distributionUrlName="${distributionUrl##*/}"
|
||||
distributionUrlNameMain="${distributionUrlName%.*}"
|
||||
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
|
||||
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
|
||||
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
|
||||
|
||||
exec_maven() {
|
||||
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
|
||||
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
|
||||
}
|
||||
|
||||
if [ -d "$MAVEN_HOME" ]; then
|
||||
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
||||
exec_maven "$@"
|
||||
fi
|
||||
|
||||
case "${distributionUrl-}" in
|
||||
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
|
||||
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
|
||||
esac
|
||||
|
||||
# prepare tmp dir
|
||||
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
|
||||
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
|
||||
trap clean HUP INT TERM EXIT
|
||||
else
|
||||
die "cannot create temp dir"
|
||||
fi
|
||||
|
||||
mkdir -p -- "${MAVEN_HOME%/*}"
|
||||
|
||||
# Download and Install Apache Maven
|
||||
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
||||
verbose "Downloading from: $distributionUrl"
|
||||
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||
|
||||
# select .zip or .tar.gz
|
||||
if ! command -v unzip >/dev/null; then
|
||||
distributionUrl="${distributionUrl%.zip}.tar.gz"
|
||||
distributionUrlName="${distributionUrl##*/}"
|
||||
fi
|
||||
|
||||
# verbose opt
|
||||
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
|
||||
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
|
||||
|
||||
# normalize http auth
|
||||
case "${MVNW_PASSWORD:+has-password}" in
|
||||
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
||||
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
||||
esac
|
||||
|
||||
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
|
||||
verbose "Found wget ... using wget"
|
||||
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
|
||||
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
|
||||
verbose "Found curl ... using curl"
|
||||
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
|
||||
elif set_java_home; then
|
||||
verbose "Falling back to use Java to download"
|
||||
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
|
||||
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||
cat >"$javaSource" <<-END
|
||||
public class Downloader extends java.net.Authenticator
|
||||
{
|
||||
protected java.net.PasswordAuthentication getPasswordAuthentication()
|
||||
{
|
||||
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
|
||||
}
|
||||
public static void main( String[] args ) throws Exception
|
||||
{
|
||||
setDefault( new Downloader() );
|
||||
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
|
||||
}
|
||||
}
|
||||
END
|
||||
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
|
||||
verbose " - Compiling Downloader.java ..."
|
||||
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
|
||||
verbose " - Running Downloader.java ..."
|
||||
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
|
||||
fi
|
||||
|
||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
||||
if [ -n "${distributionSha256Sum-}" ]; then
|
||||
distributionSha256Result=false
|
||||
if [ "$MVN_CMD" = mvnd.sh ]; then
|
||||
echo "Checksum validation is not supported for maven-mvnd." >&2
|
||||
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
||||
exit 1
|
||||
elif command -v sha256sum >/dev/null; then
|
||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
|
||||
distributionSha256Result=true
|
||||
fi
|
||||
elif command -v shasum >/dev/null; then
|
||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
|
||||
distributionSha256Result=true
|
||||
fi
|
||||
else
|
||||
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
|
||||
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
||||
exit 1
|
||||
fi
|
||||
if [ $distributionSha256Result = false ]; then
|
||||
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
|
||||
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# unzip and move
|
||||
if command -v unzip >/dev/null; then
|
||||
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
|
||||
else
|
||||
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
|
||||
fi
|
||||
|
||||
# Find the actual extracted directory name (handles snapshots where filename != directory name)
|
||||
actualDistributionDir=""
|
||||
|
||||
# First try the expected directory name (for regular distributions)
|
||||
if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
|
||||
if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
|
||||
actualDistributionDir="$distributionUrlNameMain"
|
||||
fi
|
||||
fi
|
||||
|
||||
# If not found, search for any directory with the Maven executable (for snapshots)
|
||||
if [ -z "$actualDistributionDir" ]; then
|
||||
# enable globbing to iterate over items
|
||||
set +f
|
||||
for dir in "$TMP_DOWNLOAD_DIR"/*; do
|
||||
if [ -d "$dir" ]; then
|
||||
if [ -f "$dir/bin/$MVN_CMD" ]; then
|
||||
actualDistributionDir="$(basename "$dir")"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
set -f
|
||||
fi
|
||||
|
||||
if [ -z "$actualDistributionDir" ]; then
|
||||
verbose "Contents of $TMP_DOWNLOAD_DIR:"
|
||||
verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
|
||||
die "Could not find Maven distribution directory in extracted archive"
|
||||
fi
|
||||
|
||||
verbose "Found extracted Maven distribution directory: $actualDistributionDir"
|
||||
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
|
||||
mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
|
||||
|
||||
clean || :
|
||||
exec_maven "$@"
|
||||
189
book_rent/mvnw.cmd
vendored
Normal file
189
book_rent/mvnw.cmd
vendored
Normal file
@@ -0,0 +1,189 @@
|
||||
<# : batch portion
|
||||
@REM ----------------------------------------------------------------------------
|
||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
||||
@REM or more contributor license agreements. See the NOTICE file
|
||||
@REM distributed with this work for additional information
|
||||
@REM regarding copyright ownership. The ASF licenses this file
|
||||
@REM to you under the Apache License, Version 2.0 (the
|
||||
@REM "License"); you may not use this file except in compliance
|
||||
@REM with the License. You may obtain a copy of the License at
|
||||
@REM
|
||||
@REM http://www.apache.org/licenses/LICENSE-2.0
|
||||
@REM
|
||||
@REM Unless required by applicable law or agreed to in writing,
|
||||
@REM software distributed under the License is distributed on an
|
||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
@REM KIND, either express or implied. See the License for the
|
||||
@REM specific language governing permissions and limitations
|
||||
@REM under the License.
|
||||
@REM ----------------------------------------------------------------------------
|
||||
|
||||
@REM ----------------------------------------------------------------------------
|
||||
@REM Apache Maven Wrapper startup batch script, version 3.3.4
|
||||
@REM
|
||||
@REM Optional ENV vars
|
||||
@REM MVNW_REPOURL - repo url base for downloading maven distribution
|
||||
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
||||
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
|
||||
@REM ----------------------------------------------------------------------------
|
||||
|
||||
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
|
||||
@SET __MVNW_CMD__=
|
||||
@SET __MVNW_ERROR__=
|
||||
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
|
||||
@SET PSModulePath=
|
||||
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
|
||||
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
|
||||
)
|
||||
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
|
||||
@SET __MVNW_PSMODULEP_SAVE=
|
||||
@SET __MVNW_ARG0_NAME__=
|
||||
@SET MVNW_USERNAME=
|
||||
@SET MVNW_PASSWORD=
|
||||
@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
|
||||
@echo Cannot start maven from wrapper >&2 && exit /b 1
|
||||
@GOTO :EOF
|
||||
: end batch / begin powershell #>
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
if ($env:MVNW_VERBOSE -eq "true") {
|
||||
$VerbosePreference = "Continue"
|
||||
}
|
||||
|
||||
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
|
||||
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
|
||||
if (!$distributionUrl) {
|
||||
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
||||
}
|
||||
|
||||
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
|
||||
"maven-mvnd-*" {
|
||||
$USE_MVND = $true
|
||||
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
|
||||
$MVN_CMD = "mvnd.cmd"
|
||||
break
|
||||
}
|
||||
default {
|
||||
$USE_MVND = $false
|
||||
$MVN_CMD = $script -replace '^mvnw','mvn'
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
||||
if ($env:MVNW_REPOURL) {
|
||||
$MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
|
||||
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
|
||||
}
|
||||
$distributionUrlName = $distributionUrl -replace '^.*/',''
|
||||
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
|
||||
|
||||
$MAVEN_M2_PATH = "$HOME/.m2"
|
||||
if ($env:MAVEN_USER_HOME) {
|
||||
$MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
|
||||
}
|
||||
|
||||
if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
|
||||
New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
|
||||
}
|
||||
|
||||
$MAVEN_WRAPPER_DISTS = $null
|
||||
if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
|
||||
$MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
|
||||
} else {
|
||||
$MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
|
||||
}
|
||||
|
||||
$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
|
||||
$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
|
||||
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
|
||||
|
||||
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
|
||||
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
||||
exit $?
|
||||
}
|
||||
|
||||
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
|
||||
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
|
||||
}
|
||||
|
||||
# prepare tmp dir
|
||||
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
|
||||
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
|
||||
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
|
||||
trap {
|
||||
if ($TMP_DOWNLOAD_DIR.Exists) {
|
||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
||||
}
|
||||
}
|
||||
|
||||
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
|
||||
|
||||
# Download and Install Apache Maven
|
||||
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
||||
Write-Verbose "Downloading from: $distributionUrl"
|
||||
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||
|
||||
$webclient = New-Object System.Net.WebClient
|
||||
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
|
||||
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
|
||||
}
|
||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
||||
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
|
||||
|
||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
||||
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
|
||||
if ($distributionSha256Sum) {
|
||||
if ($USE_MVND) {
|
||||
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
|
||||
}
|
||||
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
|
||||
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
|
||||
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
|
||||
}
|
||||
}
|
||||
|
||||
# unzip and move
|
||||
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
|
||||
|
||||
# Find the actual extracted directory name (handles snapshots where filename != directory name)
|
||||
$actualDistributionDir = ""
|
||||
|
||||
# First try the expected directory name (for regular distributions)
|
||||
$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
|
||||
$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
|
||||
if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
|
||||
$actualDistributionDir = $distributionUrlNameMain
|
||||
}
|
||||
|
||||
# If not found, search for any directory with the Maven executable (for snapshots)
|
||||
if (!$actualDistributionDir) {
|
||||
Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
|
||||
$testPath = Join-Path $_.FullName "bin/$MVN_CMD"
|
||||
if (Test-Path -Path $testPath -PathType Leaf) {
|
||||
$actualDistributionDir = $_.Name
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!$actualDistributionDir) {
|
||||
Write-Error "Could not find Maven distribution directory in extracted archive"
|
||||
}
|
||||
|
||||
Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
|
||||
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
|
||||
try {
|
||||
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
|
||||
} catch {
|
||||
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
|
||||
Write-Error "fail to move MAVEN_HOME"
|
||||
}
|
||||
} finally {
|
||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
||||
}
|
||||
|
||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
||||
139
book_rent/pom.xml
Normal file
139
book_rent/pom.xml
Normal file
@@ -0,0 +1,139 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>4.1.1</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>com.example</groupId>
|
||||
<artifactId>book_rent</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<packaging>war</packaging>
|
||||
<name>book_rent</name>
|
||||
<description/>
|
||||
<url/>
|
||||
<licenses>
|
||||
<license/>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer/>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection/>
|
||||
<developerConnection/>
|
||||
<tag/>
|
||||
<url/>
|
||||
</scm>
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webmvc</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-devtools</artifactId>
|
||||
<scope>runtime</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webmvc-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-compile</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>default-testCompile</id>
|
||||
<phase>test-compile</phase>
|
||||
<goals>
|
||||
<goal>testCompile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.example.demo;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
@SpringBootApplication
|
||||
public class BookRentApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(BookRentApplication.class, args);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.example.demo;
|
||||
|
||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
||||
|
||||
public class ServletInitializer extends SpringBootServletInitializer {
|
||||
|
||||
@Override
|
||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
|
||||
return application.sources(BookRentApplication.class);
|
||||
}
|
||||
|
||||
}
|
||||
15
book_rent/src/main/resources/application.properties
Normal file
15
book_rent/src/main/resources/application.properties
Normal file
@@ -0,0 +1,15 @@
|
||||
spring.application.name=book-rent
|
||||
# --- MySQL (CREATE DATABASE.sql で作成した book_manage) ---
|
||||
spring.datasource.url=jdbc:mysql://localhost:3306/book_manage?serverTimezone=Asia/Tokyo&characterEncoding=UTF-8
|
||||
spring.datasource.username=bookuser
|
||||
spring.datasource.password=Book2026
|
||||
|
||||
# テーブルはSQLで作成済み。JPAでは変更しない
|
||||
spring.jpa.hibernate.ddl-auto=none
|
||||
spring.jpa.open-in-view=false
|
||||
spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
|
||||
|
||||
spring.thymeleaf.cache=false
|
||||
server.servlet.session.timeout=30m
|
||||
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.example.demo;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
@SpringBootTest
|
||||
class BookRentApplicationTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user