login done
This commit is contained in:
@@ -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,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,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";
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
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>
|
||||
@@ -1,10 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Insert title here</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,15 +1,13 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>メニュー</title>
|
||||
<!-- <link rel="stylesheet" th:href="@{/css/style.css}">-->
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>メニュー</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="card menu">
|
||||
@@ -22,7 +20,6 @@
|
||||
</th:block>
|
||||
<a class="btn" th:href="@{/employees/search}">社員編集</a>
|
||||
</div>
|
||||
</main>
|
||||
</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>
|
||||
Reference in New Issue
Block a user