2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 2026_0910_AI_5G_Java_MUN:t-eguchi
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:h-hein2 2026_0910_AI_5G_Java_MUN:m_shimizu 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:new-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi2 2026_0910_AI_5G_Java_MUN:m-ozawa 2026_0910_AI_5G_Java_MUN:h-hein
..
compare: 2026_0910_AI_5G_Java_MUN:o-matsuda
Branches Tags
2026_0910_AI_5G_Java_MUN:h-hein2 2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m_shimizu 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:new-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi2 2026_0910_AI_5G_Java_MUN:m-ozawa 2026_0910_AI_5G_Java_MUN:h-hein

5 Commits
t-eguchi ... o-matsuda

Author SHA1 Message Date
o-matsuda
044a6b5609 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 
# Conflicts:
#	book-rent/pom.xml
#	book-rent/src/main/java/com/example/demo/config/CustomAuthenticationFailureHandler.java
#	book-rent/src/main/java/com/example/demo/service/CustomUserDetailsService.java
 2026-10-27 15:22:16 +09:00
h.hein
a9c5fb2283 All done 2026-10-27 15:07:10 +09:00
o-matsuda
bc8c93d2ea Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 
# Conflicts:
#	book-rent/src/main/resources/static/css/style.css
 2026-10-27 14:47:24 +09:00
h.hein
f7020dd41a 小澤さんの作成 2026-10-27 14:33:13 +09:00
o-matsuda
adf3ece0d2 バリテーション追加 2026-10-27 14:25:06 +09:00
16 changed files with 674 additions and 437 deletions
Expand all files Collapse all files

130
book-rent/pom.xml
View File

@@ -1,130 +0,0 @@
<?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>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</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
book-rent/src/main/java/com/example/demo/config/CustomAuthenticationFailureHandler.java
View File

@@ -57,3 +57,4 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
} }
} }

6
book-rent/src/main/java/com/example/demo/controller/AdminBookController.java
View File

@@ -43,7 +43,8 @@ public class AdminBookController {
@PostMapping(NEW + "/confirm") @PostMapping(NEW + "/confirm")
public String newConfirm(@ModelAttribute("form") BookForm form, Model model) { public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
List<String> errors = bookAdminService.validate(form); List<String> errors = bookAdminService.validate(form);
if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model); if (!errors.isEmpty())
return input(form, errors, "書籍登録", NEW, model);
return confirm("書籍登録", NEW, model); return confirm("書籍登録", NEW, model);
} }
@@ -87,7 +88,8 @@ public class AdminBookController {
@PostMapping(EDIT + "/confirm") @PostMapping(EDIT + "/confirm")
public String editConfirm(@ModelAttribute("form") BookForm form, Model model) { public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
List<String> errors = bookAdminService.validate(form); List<String> errors = bookAdminService.validate(form);
if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model); if (!errors.isEmpty())
return input(form, errors, "書籍編集", EDIT, model);
return confirm("書籍編集", EDIT, model); return confirm("書籍編集", EDIT, model);
} }

19
book-rent/src/main/java/com/example/demo/controller/BookController.java
View File

@@ -1,18 +1,17 @@
package com.example.demo.controller; package com.example.demo.controller;
import java.util.List;
import java.util.stream.IntStream;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import com.example.demo.entity.BookCollection;
import com.example.demo.service.BookService; import com.example.demo.service.BookService;
/** BOOK-01：書籍検索（bookList.html） */ /** BOOK-01：書籍検索（bookList.html） */
@Controller @Controller
public class BookController { public class BookController {
@@ -27,8 +26,16 @@ public class BookController {
public String list(@RequestParam(defaultValue = "") String nmBook, public String list(@RequestParam(defaultValue = "") String nmBook,
@RequestParam(defaultValue = "") String publisher, @RequestParam(defaultValue = "") String publisher,
@RequestParam(defaultValue = "") String note, @RequestParam(defaultValue = "") String note,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size,
Model model) { Model model) {
model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
Page<BookCollection> bookPage = bookService.searchLendable(nmBook, publisher, note, page, size);
List<Integer> pageNumbers = IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
model.addAttribute("books", bookPage);
model.addAttribute("bookPage", bookPage);
model.addAttribute("pageNumbers", pageNumbers);
// 検索条件を保持 // 検索条件を保持
model.addAttribute("nmBook", nmBook); model.addAttribute("nmBook", nmBook);
model.addAttribute("publisher", publisher); model.addAttribute("publisher", publisher);

3
book-rent/src/main/java/com/example/demo/controller/EmployeeController.java
View File

@@ -46,7 +46,8 @@ public class EmployeeController {
} }
@PostMapping(NEW + "/confirm") @PostMapping(NEW + "/confirm")
public String registConfirm(@ModelAttribute("form") EmployeeForm form, Model model) { public String registConfirm(@ModelAttribute("form") EmployeeForm form,
Model model) {
List<String> errors = employeeService.validateRegist(form); List<String> errors = employeeService.validateRegist(form);
if (!errors.isEmpty()) if (!errors.isEmpty())
return registView(form, errors, model); return registView(form, errors, model);

72
book-rent/src/main/java/com/example/demo/controller/LoginController.java
View File

@@ -66,3 +66,75 @@ public class LoginController {
return "login"; return "login";
} }
} }
//package com.example.demo.controller;
//
//
//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";
// }
//}

2
book-rent/src/main/java/com/example/demo/form/EmployeeForm.java
View File

@@ -1,5 +1,7 @@
package com.example.demo.form; package com.example.demo.form;
/** 社員登録・編集フォーム */ /** 社員登録・編集フォーム */
public class EmployeeForm { public class EmployeeForm {
private Integer idEmployee; private Integer idEmployee;

9
book-rent/src/main/java/com/example/demo/repository/BookCollectionRepository.java
View File

@@ -1,8 +1,9 @@
package com.example.demo.repository; package com.example.demo.repository;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
@@ -22,10 +23,12 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
+ "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') " + "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') " + "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
+ "order by b.idBook") + "order by b.idBook")
List<BookCollection> search(@Param("lending") String lending, Page<BookCollection> search(
@Param("lending") String lending,
@Param("nm") String nm, @Param("nm") String nm,
@Param("publisher") String publisher, @Param("publisher") String publisher,
@Param("note") String note); @Param("note") String note,
Pageable pageable);
/** /**
* 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。

24
book-rent/src/main/java/com/example/demo/service/BookAdminService.java
View File

@@ -28,12 +28,20 @@ public class BookAdminService {
public List<String> validate(BookForm f) { public List<String> validate(BookForm f) {
f.trim(); f.trim();
List<String> e = new ArrayList<>(); List<String> e = new ArrayList<>();
if (f.getIsbn().isEmpty()) e.add("ISBNを入力してください。"); if (f.getIsbn().isEmpty())
else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。"); e.add("ISBNを入力してください。");
if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。"); else if (f.getIsbn().length() > 13)
else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。"); e.add("ISBNは13文字以内で入力してください。");
if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。"); if (f.getNmBook().isEmpty())
if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。"); e.add("書籍名を入力してください。");
else if (f.getNmBook().length() > 50)
e.add("書籍名は50文字以内で入力してください。");
if (f.getKnBook().length() > 100)
e.add("書籍名よみは100文字以内で入力してください。");
else if (!f.getKnBook().matches("^[\\u3040-\\u309F]+$"))
e.add("書籍名よみはひらがなで入力してください");
if (f.getPublisher().length() > 50)
e.add("出版社は50文字以内で入力してください。");
return e; return e;
} }
@@ -78,10 +86,10 @@ public class BookAdminService {
private void check(BookForm f) { private void check(BookForm f) {
List<String> errors = validate(f); List<String> errors = validate(f);
if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors)); if (!errors.isEmpty())
throw new BusinessException(String.join(" ", errors));
} }
private static void apply(BookCollection b, BookForm f) { private static void apply(BookCollection b, BookForm f) {
b.setIsbn(f.getIsbn()); b.setIsbn(f.getIsbn());
b.setNmBook(f.getNmBook()); b.setNmBook(f.getNmBook());

14
book-rent/src/main/java/com/example/demo/service/BookService.java
View File

@@ -1,7 +1,7 @@
package com.example.demo.service; package com.example.demo.service;
import java.util.List; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -20,14 +20,16 @@ public class BookService {
/** 貸出可の蔵書を検索する。全て未入力なら全件。 */ /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public List<BookCollection> searchLendable(String nmBook, String publisher, String note) { public Page<BookCollection> searchLendable(String nmBook, String publisher, String note, int page, int size) {
return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note)); return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),
PageRequest.of(page, size));
} }
/** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */ /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
static String normalize(String s) { static String normalize(String s) {
if (s == null) return ""; if (s == null)
return "";
return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_"); return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
} }
}
}

187
book-rent/src/main/java/com/example/demo/service/EmployeeService.java
View File

@@ -193,3 +193,190 @@ public class EmployeeService {
throw new BusinessException(String.join(" ", errors)); throw new BusinessException(String.join(" ", errors));
} }
} }
//package com.example.demo.service;
//
//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文字以内で入力してください。");
// else if (!f.getKnEmployee().matches("^[\\u3040-\\u309F]+$"))
// e.add("社員名よみはひらがなで入力してください");
// }
//
// 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));
// }
//}

213
book-rent/src/main/resources/static/css/style.css
View File

@@ -1,90 +1,153 @@
body body {
{font-family: font-family:
"Meiryo","Hiragino Sans",sans-serif; "Meiryo", "Hiragino Sans", sans-serif;
margin:0;color:#222; margin: 0;
background:#f6f7f9} color: #222;
header.top background: #f6f7f9
{display:flex;
justify-content:space-between;
align-items:center;
background:#176a78;color:#fff;
padding:10px 20px
} }
header.top form
{display:inline; header.top {
margin:0} display: flex;
header.top .user justify-content: space-between;
{margin-right:12px align-items: center;
background: #176a78;
color: #fff;
padding: 10px 20px
} }
main
{max-width:960px; header.top form {
margin:24px auto; display: inline;
padding:0 16px margin: 0
} }
h1
{font-size:20px header.top .user {
margin-right: 12px
} }
.card
{background:#fff; main {
border:1px solid #dde; max-width: 960px;
border-radius:6px; margin: 24px auto;
padding:20px; padding: 0 16px
margin-bottom:16px
} }
label
{display:block; h1 {
margin:10px 0 4px; font-size: 20px
font-weight:bold
} }
input[type=text],input[type=password],input[type=email]
{width:100%; .card {
max-width:360px; background: #fff;
padding:6px; border: 1px solid #dde;
box-sizing:border-box border-radius: 6px;
padding: 20px;
margin-bottom: 16px
} }
button,.btn
{display:inline-block; label {
background:#176a78; display: block;
color:#fff;border:0; margin: 10px 0 4px;
border-radius:4px; font-weight: bold
padding:7px 16px;
cursor:pointer;
text-decoration:none;
font-size:14px
} }
button.sub,.btn.sub
{background:#6b7b80 input[type=text],
input[type=password],
input[type=email] {
width: 100%;
max-width: 360px;
padding: 6px;
box-sizing: border-box
} }
.error
{background:#fdecea;color:#b3261e; button,
border:1px solid #f5c2be; .btn {
padding:8px 12px; display: inline-block;
border-radius:4px; background: #176a78;
margin-bottom:12px color: #fff;
border: 0;
border-radius: 4px;
padding: 7px 16px;
cursor: pointer;
text-decoration: none;
font-size: 14px
} }
.info
{background:#e8f4ea; button.sub,
color:#1b5e20; .btn.sub {
border:1px solid #bfdcc3; background: #6b7b80
padding:8px 12px;
border-radius:4px;
margin-bottom:12px
} }
table
{border-collapse:collapse; .error {
width:100%; background: #fdecea;
background:#fff color: #b3261e;
border: 1px solid #f5c2be;
padding: 8px 12px;
border-radius: 4px;
margin-bottom: 12px
} }
th,td
{border:1px solid #dde; .info {
padding:6px 8px; background: #e8f4ea;
text-align:left; color: #1b5e20;
font-size:14px border: 1px solid #bfdcc3;
padding: 8px 12px;
border-radius: 4px;
margin-bottom: 12px
} }
th
{background:#eaf4f6 table {
border-collapse: collapse;
width: 100%;
background: #fff
} }
.menu a
{display:block; th,
margin:8px 0 td {
border: 1px solid #dde;
padding: 6px 8px;
text-align: left;
font-size: 14px
}
th {
background: #eaf4f6
}
.menu a {
display: block;
margin: 8px 0
}
/* Responsive (ဖုန်းစခရင်သေးများတွင် အောက်သို့ ဆင်းသွားစေရန်) */
@media (max-width: 600px) {
.login-container-flex {
flex-direction: column;
align-items: center;
text-align: center;
}
.form-content-area {
width: 100%;
}
input[type=text],
input[type=password],
input[type=email] {
max-width: 100% !important;
}
}
/* ページネーション */
.page-number {
display: inline-block;
background: #eaf4f6;
color: #176a78;
border: 1px solid #d4e3e6;
border-radius: 4px;
padding: 7px 12px;
margin: 2px;
text-decoration: none;
font-size: 14px;
}
.page-number:hover {
background: #d5edf1;
} }

13
book-rent/src/main/resources/templates/bookInput.html
View File

@@ -1,13 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>書籍情報入力</title> <title>書籍情報入力</title>
<link rel="stylesheet" th:href="@{/css/style.css}"> <link rel="stylesheet" th:href="@{/css/style.css}">
</head> </head>
<body> <body>
<div th:replace="~{fragments/header :: header}"></div> <div th:replace="~{fragments/header :: header}"></div>
<main> <main>
<h1>書籍情報入力</h1> <h1>書籍情報入力</h1>
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div> <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
<div class="error" th:each="e : ${errors}" th:text="${e}"></div> <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
@@ -21,14 +23,17 @@
<input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50"> <input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
<label for="knBook">書籍名よみ（100文字以内）</label> <label for="knBook">書籍名よみ（100文字以内）</label>
<input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100"> <input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
<!-- <span th:errors="${form.knBook}"></span>-->
<label for="publisher">出版社（50文字以内）</label> <label for="publisher">出版社（50文字以内）</label>
<input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50"> <input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
<label for="note">特記事項</label> <label for="note">特記事項</label>
<input type="text" id="note" name="note" th:value="${form.note}"> <input type="text" id="note" name="note" th:value="${form.note}">
<p><button type="submit" th:text="${title} + '確認'">確認</button> <p><button type="submit" th:text="${title} + '確認'">確認</button>
<a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p> <a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a>
</p>
</form> </form>
</div> </div>
</main> </main>
</body> </body>
</html> </html>

17
book-rent/src/main/resources/templates/bookList.html
View File

@@ -29,8 +29,8 @@
<div class="card"> <div class="card">
<h2>検索結果</h2> <h2>検索結果</h2>
<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p> <p th:if="${bookPage.isEmpty()}">該当する書籍はありません。</p>
<table th:unless="${#lists.isEmpty(books)}"> <table th:unless="${bookPage.isEmpty()}">
<thead> <thead>
<tr> <tr>
<th>蔵書ID</th> <th>蔵書ID</th>
@@ -60,8 +60,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<a class="page-number"
th:if="${bookPage.hasPrevious()}"
th:href="@{/books(page=${bookPage.number-1}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}">前へ</a>
<span th:each="pageNum : ${pageNumbers}">
<a class="page-number"
th:href="@{/books(page=${pageNum}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}"
th:text="${pageNum + 1}"></a>
</span>
<a class="page-number"
th:if="${bookPage.hasNext()}"
th:href="@{/books(page=${bookPage.number+1}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}">次へ</a>
</div> </div>
</main> </main>
</body> </body>
</html> </html>

1
book-rent/src/main/resources/templates/employeeRegistInput.html
View File

@@ -37,6 +37,7 @@
<div> <div>
<label for="knEmployee">社員名よみ</label> <label for="knEmployee">社員名よみ</label>
<input type="text" id="knEmployee" th:field="*{knEmployee}"> <input type="text" id="knEmployee" th:field="*{knEmployee}">
<span th:errors="*{knEmployee}"></span>
</div> </div>
<!-- メールアドレス --> <!-- メールアドレス -->