コンフリクト解消

book-rent/pom.xml

@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>21</java.version>
 	</properties>
- <dependencies>
+<dependencies>
 <dependency>
 <groupId>org.springframework.boot</groupId>
 <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -77,6 +77,10 @@
 <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>
@@ -124,4 +128,3 @@
 	</build>
  
 </project>
-

book-rent/src/main/java/com/example/demo/common/LoginUser.java

@@ -1,31 +1,48 @@
 package com.example.demo.common;
 
-
-
 import java.io.Serializable;
 
 /** セッションに保持するログイン情報（社員ID・社員名・社員名よみ・メールアドレス・管理者フラグ） */
 public class LoginUser implements Serializable {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    private final Integer idEmployee;
+	private final Integer idEmployee;
-    private final String nmEmployee;
+	private final String nmEmployee;
-    private final String knEmployee;
+	private final String knEmployee;
-    private final String mailAddress;
+	private final String mailAddress;
-    private final String flgAdmin;
+	private final String flgAdmin;
 
-    public LoginUser(Integer idEmployee, String nmEmployee, String knEmployee, String mailAddress, String flgAdmin) {
+	public LoginUser(Integer idEmployee, String nmEmployee, String knEmployee, String mailAddress, String flgAdmin) {
-        this.idEmployee = idEmployee;
+		this.idEmployee = idEmployee;
-        this.nmEmployee = nmEmployee;
+		this.nmEmployee = nmEmployee;
-        this.knEmployee = knEmployee;
+		this.knEmployee = knEmployee;
-        this.mailAddress = mailAddress;
+		this.mailAddress = mailAddress;
-        this.flgAdmin = flgAdmin;
+		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);
+	}
 
-    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); }
 }

book-rent/src/main/java/com/example/demo/config/CompatiblePasswordEncoder.java

@@ -0,0 +1,38 @@
+package com.example.demo.config;
+ 
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+ 
+// データベースに保存されている平文パスワードと、BCryptでハッシュ化されたパスワードの両方を照合できるようにするクラス
+public class CompatiblePasswordEncoder implements PasswordEncoder {
+ 
+	// パスワードを安全にハッシュ化するためのクラスを生成
+	private final BCryptPasswordEncoder bcrypt = new BCryptPasswordEncoder();
+ 
+	// パスワードのハッシュ化
+	@Override
+	public String encode(CharSequence rawPassword) {
+		return bcrypt.encode(rawPassword);
+	}
+ 
+	@Override
+	public boolean matches(
+			CharSequence rawPassword,
+			String encodedPassword) {
+ 
+		// 保存済みパスワードが存在するか確認
+		if (encodedPassword == null) {
+			return false;
+		}
+ 
+		// 既存の平文パスワードに対応
+		if (!encodedPassword.startsWith("$2a$")
+				&& !encodedPassword.startsWith("$2b$")
+				&& !encodedPassword.startsWith("$2y$")) {
+			return rawPassword.toString().equals(encodedPassword);
+		}
+ 
+		// BCrypt形式のパスワードに対応
+		return bcrypt.matches(rawPassword, encodedPassword);
+	}
+}

book-rent/src/main/java/com/example/demo/config/CustomAuthenticationFailureHandler.java

@@ -0,0 +1,59 @@
+package com.example.demo.config;
+ 
+import java.io.IOException;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
+
+import com.example.demo.service.LoginAttemptService;
+ 
+// ログイン失敗時の処理
+@Component
+public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
+ 
+	private LoginAttemptService loginAttemptService;
+ 
+	public CustomAuthenticationFailureHandler(LoginAttemptService loginAttemptService) {
+		this.loginAttemptService = loginAttemptService;
+	}
+ 
+	@Override
+	public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException exception) throws IOException, ServletException {
+ 
+		// 画面から入力されたメールアドレスを取得
+		String mailAddress = request.getParameter("mailAddress");
+ 
+		if (mailAddress != null && !mailAddress.isBlank()) {
+			String mail = mailAddress.trim();
+ 
+			if (loginAttemptService.isBlocked(mail)) {
+				getRedirectStrategy().sendRedirect(
+						request, response, "/login?error=locked");
+				return;
+			}
+ 
+			// 失敗回数を１増やす
+			loginAttemptService.loginFailed(mail);
+ 
+			// すでにロック中なら失敗回数を増やさない
+			if (loginAttemptService.isBlocked(mail)) {
+				getRedirectStrategy().sendRedirect(
+						request, response, "/login?error=locked");
+				return;
+			}
+ 
+			// あと何回失敗されるとロックされるか取得
+			int remaining = loginAttemptService.getRemainingAttempts(mail);
+ 
+			getRedirectStrategy().sendRedirect(
+					request, response, "/login?error=failed&remaining=" + remaining);
+		}
+ 
+	}
+}

book-rent/src/main/java/com/example/demo/config/CustomAuthenticationSuccessHandler.java

@@ -0,0 +1,48 @@
+package com.example.demo.config;
+ 
+import java.io.IOException;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
+import org.springframework.stereotype.Component;
+
+import com.example.demo.common.Const;
+import com.example.demo.service.LoginAttemptService;
+ 
+@Component
+public class CustomAuthenticationSuccessHandler
+		extends SimpleUrlAuthenticationSuccessHandler {
+ 
+	private final LoginAttemptService loginAttemptService;
+ 
+	public CustomAuthenticationSuccessHandler(
+			LoginAttemptService loginAttemptService) {
+		this.loginAttemptService = loginAttemptService;
+		setDefaultTargetUrl("/menu");
+		setAlwaysUseDefaultTargetUrl(true);
+	}
+ 
+	@Override
+	public void onAuthenticationSuccess(
+			HttpServletRequest request,
+			HttpServletResponse response,
+			Authentication authentication)
+			throws IOException, ServletException {
+ 
+		if (authentication.getPrincipal() instanceof CustomUserDetails userDetails) {
+			String mail = userDetails.getUsername();
+ 
+			loginAttemptService.loginSucceeded(mail);
+ 
+			request.getSession(true).setAttribute(
+					Const.SESSION_LOGIN_USER,
+					userDetails.getLoginUser());
+		}
+ 
+		super.onAuthenticationSuccess(request, response, authentication);
+	}
+}

book-rent/src/main/java/com/example/demo/config/CustomUserDetails.java

@@ -0,0 +1,74 @@
+package com.example.demo.config;
+ 
+import java.util.Collection;
+import java.util.Collections;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import com.example.demo.common.LoginUser;
+import com.example.demo.service.LoginAttemptService;
+ 
+// システムの社員情報をSpring Securityが扱えるクラスに変更
+public class CustomUserDetails implements UserDetails {
+ 
+	private final LoginUser loginUser;
+	private final String password; // DBから取得した暗号化パスワードを保持
+	private final LoginAttemptService loginAttemptService;
+ 
+	public CustomUserDetails(LoginUser loginUser, String password, LoginAttemptService loginAttemptService) {
+		this.loginUser = loginUser;
+		this.password = password;
+		this.loginAttemptService = loginAttemptService;
+	}
+ 
+	@Override
+	public String getPassword() {
+		return this.password;
+	}
+ 
+	@Override
+	public String getUsername() {
+		return loginUser.getMailAddress();
+	}
+ 
+	// アカウントのロック状態の確認
+	@Override
+	public boolean isAccountNonLocked() {
+		return !loginAttemptService.isBlocked(getUsername());
+	}
+ 
+	
+	// 管理者判定メソッド
+	@Override
+	public Collection<? extends GrantedAuthority> getAuthorities() {
+		String role = loginUser.isAdmin()
+				? "ROLE_ADMIN"
+				: "ROLE_USER";
+ 
+		return Collections.singletonList( // 要素が一つだけの変更できないリストを作るメソッド
+				new SimpleGrantedAuthority(role));
+	}
+ 
+	@Override
+	public boolean isAccountNonExpired() {
+		return true;
+	}
+ 
+	@Override
+	public boolean isCredentialsNonExpired() {
+		return true;
+	}
+ 
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+ 
+	// ログイン成功後にコントローラー等でLoginUserを取り出すためのゲッター
+	public LoginUser getLoginUser() {
+		return loginUser;
+	}
+ 
+}

book-rent/src/main/java/com/example/demo/config/LoginCheckInterceptor.java

@@ -34,4 +34,5 @@ public class LoginCheckInterceptor implements HandlerInterceptor {
         }
         return true;
     }
+    
 }

book-rent/src/main/java/com/example/demo/config/SecurityConfig.java

@@ -0,0 +1,58 @@
+package com.example.demo.config;
+ 
+import org.springframework.boot.security.autoconfigure.web.servlet.PathRequest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+ 
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+ 
+	private final CustomAuthenticationFailureHandler failureHandler;
+	private final CustomAuthenticationSuccessHandler successHandler;
+ 
+	public SecurityConfig(
+			CustomAuthenticationFailureHandler failureHandler,
+			CustomAuthenticationSuccessHandler successHandler) {
+		this.failureHandler = failureHandler;
+		this.successHandler = successHandler;
+	}
+ 
+	@Bean
+	public SecurityFilterChain securityFilterChain(
+			HttpSecurity http) throws Exception {
+ 
+		http
+				.authorizeHttpRequests(authorize -> authorize
+						.requestMatchers(
+								PathRequest.toStaticResources().atCommonLocations())
+						.permitAll()
+						.requestMatchers(
+								"/", "/index", "/error", "/login")
+						.permitAll()
+						.anyRequest().authenticated())
+				.formLogin(login -> login
+						.loginPage("/login")
+						.loginProcessingUrl("/login")
+						.usernameParameter("mailAddress")
+						.passwordParameter("password")
+						.failureHandler(failureHandler)
+						.successHandler(successHandler)
+						.permitAll())
+				.logout(logout -> logout
+						.logoutUrl("/logout")
+						.logoutSuccessUrl("/login?logout")
+						.permitAll());
+ 
+		return http.build();
+	}
+ 
+	@Bean
+	public PasswordEncoder passwordEncoder() {
+		return new CompatiblePasswordEncoder();
+	}
+}

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

@@ -1,15 +1,16 @@
 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.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.demo.entity.BookCollection;
 import com.example.demo.service.BookService;
  
  
@@ -22,13 +23,24 @@ public class BookController {
         this.bookService = bookService;
     }
  
+ 
     /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
     @GetMapping("/books")
     public String list(@RequestParam(defaultValue = "") String nmBook,
                        @RequestParam(defaultValue = "") String publisher,
                        @RequestParam(defaultValue = "") String note,
+                       @RequestParam(defaultValue = "0") int page,
+                       @RequestParam(defaultValue = "10") int size,
                        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("publisher", publisher);
@@ -37,3 +49,42 @@ public class BookController {
     }
  
 }
+//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";
+//    }
+//
+//}

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

@@ -1,72 +1,68 @@
 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";
+        return "redirect:/login";
     }
  
     @GetMapping("/login")
-    public String loginForm(HttpSession session) {
+    public String loginForm(
+            HttpSession session,
+            @RequestParam(name = "error", required = false) String error,
+            @RequestParam(name = "logout", required = false) String logout,
+            @RequestParam(name = "remaining", required = false) Integer remaining,
+            Model model) {
+ 
+        // すでにログインしている場合はメニュー画面へ
         if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) {
             return "redirect:/menu";
         }
+ 
+        // ログイン失敗時のメッセージ
+        if ("locked".equals(error)) {
+            model.addAttribute(
+                "errorMessage",
+                "ログインに5回連続で失敗したため、10分間アカウントをロックしました。"
+            );
+ 
+        } else if ("failed".equals(error) && remaining != null) {
+ 
+            if (remaining == 1) {
+                model.addAttribute(
+                    "errorMessage",
+                    "メールアドレスまたはパスワードが間違っています。あと1回間違えると、10分間ログインできなくなります。"
+                );
+            } else {
+                model.addAttribute(
+                    "errorMessage",
+                    "メールアドレスまたはパスワードが間違っています。あと"
+                    + remaining
+                    + "回間違えると、10分間ログインできなくなります。"
+                );
+            }
+ 
+        } else if (error != null) {
+            model.addAttribute(
+                "errorMessage",
+                "メールアドレスまたはパスワードが間違っています。"
+            );
+ 
+        } else if (logout != null) {
+            model.addAttribute("message", "ログアウトしました。");
+        }
+ 
         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";
-    }
 }

book-rent/src/main/java/com/example/demo/entity/Employee.java

@@ -105,4 +105,5 @@ public class Employee {
 	public void setDateUpdate(LocalDateTime v) {
 		this.dateUpdate = v;
 	}
+	
 }

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

@@ -1,8 +1,9 @@
 package com.example.demo.repository;
  
 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.Modifying;
 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 (:note = '' or b.note like concat('%', :note, '%') escape '!') "
 			+ "order by b.idBook")
-	List<BookCollection> search(@Param("lending") String lending,
+	Page<BookCollection> search(
-			@Param("nm") String nm,
+	        @Param("lending") String lending,
-			@Param("publisher") String publisher,
+	        @Param("nm") String nm,
-			@Param("note") String note);
+	        @Param("publisher") String publisher,
+	        @Param("note") String note,
+	        Pageable pageable);
  
 	/**
 	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
@@ -37,3 +40,42 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
 	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
 			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
 }
+//package com.example.demo.repository;
+//
+//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);
+//}

book-rent/src/main/java/com/example/demo/repository/EmployeeRepository.java

@@ -10,4 +10,5 @@ public interface EmployeeRepository extends JpaRepository<Employee, Integer> {
 	Optional<Employee> findByMailAddressAndFlgRetirement(String mailAddress, String flgRetirement);
 
 	Optional<Employee> findByMailAddress(String mailAddress);
+	
 }

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

@@ -1,7 +1,7 @@
 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.transaction.annotation.Transactional;
 
@@ -20,8 +20,8 @@ public class BookService {
  
     /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
     @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特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
@@ -29,5 +29,39 @@ public class BookService {
         if (s == null) return "";
         return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
     }
-}
  
+ 
+}
+//package com.example.demo.service;
+//
+//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("_", "!_");
+//    }
+//}
+//

book-rent/src/main/java/com/example/demo/service/CustomUserDetailsService.java

@@ -0,0 +1,47 @@
+package com.example.demo.service;
+ 
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.common.Const;
+import com.example.demo.common.LoginUser;
+import com.example.demo.config.CustomUserDetails;
+import com.example.demo.entity.Employee;
+import com.example.demo.repository.EmployeeRepository;
+ 
+//Spring Securityから依頼を受けて、ログインする社員情報をDBから取得
+@Service
+public class CustomUserDetailsService implements UserDetailsService {
+ 
+	private final EmployeeRepository employeeRepository;
+	private final LoginAttemptService loginAttemptService;
+ 
+	public CustomUserDetailsService(
+			EmployeeRepository employeeRepository,
+			LoginAttemptService loginAttemptService) {
+		this.employeeRepository = employeeRepository;
+		this.loginAttemptService = loginAttemptService;
+	}
+ 
+	@Override
+	public UserDetails loadUserByUsername(String maillAddress) throws UsernameNotFoundException {
+ 
+		Employee employee = employeeRepository.findByMailAddressAndFlgRetirement(maillAddress.trim(), Const.RETIRE_NO)
+				.orElseThrow(() -> new UsernameNotFoundException("認証に失敗しました。"));
+				// ↑社員情報が見つからない場合は例外処理
+ 
+		// 取得したEmployeeをLoginUserに変換する
+		LoginUser loginUser = new LoginUser(
+				employee.getIdEmployee(),
+				employee.getNmEmployee(),
+				employee.getKnEmployee(),
+				employee.getMailAddress(),
+				employee.getFlgAdmin());
+ 
+		// Spring Security用の形式に変換
+		return new CustomUserDetails(loginUser, employee.getPassword(), loginAttemptService);
+	}
+ 
+}

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

@@ -7,6 +7,7 @@ import java.util.Optional;
 import java.util.regex.Pattern;
 
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,148 +18,178 @@ 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 Pattern MAIL = Pattern.compile("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");
-    private static final String MSG_DUP = "このメールアドレスは既に登録されています。";
+	private static final String MSG_DUP = "このメールアドレスは既に登録されています。";
 
-    private final EmployeeRepository employeeRepository;
+	// SecurityConfigに適用させるため
+	private final EmployeeRepository employeeRepository;
+	private final PasswordEncoder passwordEncoder;
 
-    public EmployeeService(EmployeeRepository employeeRepository) {
+	public EmployeeService(
-        this.employeeRepository = employeeRepository;
+			EmployeeRepository employeeRepository,
-    }
+			PasswordEncoder passwordEncoder) {
+		this.employeeRepository = employeeRepository;
+		this.passwordEncoder = passwordEncoder;
 
-    // ---------- 検索 ----------
+	}
 
-    @Transactional(readOnly = true)
+	// ---------- 検索 ----------
-    public Optional<Employee> findByMail(String mail) {
-        return employeeRepository.findByMailAddress(mail == null ? "" : mail.trim());
-    }
 
-    @Transactional(readOnly = true)
+	@Transactional(readOnly = true)
-    public Employee find(Integer id) {
+	public Optional<Employee> findByMail(String mail) {
-        return employeeRepository.findById(id)
+		return employeeRepository.findByMailAddress(mail == null ? "" : mail.trim());
-                .orElseThrow(() -> new BusinessException("対象の社員が見つかりません。"));
+	}
-    }
 
-    /** 編集画面の初期値（パスワードは空：管理者は変更時のみ入力） */
+	@Transactional(readOnly = true)
-    public EmployeeForm toForm(Employee e) {
+	public Employee find(Integer id) {
-        EmployeeForm f = new EmployeeForm();
+		return employeeRepository.findById(id)
-        f.setIdEmployee(e.getIdEmployee());
+				.orElseThrow(() -> new BusinessException("対象の社員が見つかりません。"));
-        f.setNmEmployee(e.getNmEmployee());
+	}
-        f.setKnEmployee(e.getKnEmployee());
-        f.setMailAddress(e.getMailAddress());
-        f.setFlgAdmin(e.getFlgAdmin());
-        f.setFlgRetirement(e.getFlgRetirement());
-        return f;
-    }
 
-    // ---------- 入力チェック ----------
+	/** 編集画面の初期値（パスワードは空：管理者は変更時のみ入力） */
+	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) {
+	public List<String> validateRegist(EmployeeForm f) {
-        f.trim();
+		f.trim();
-        List<String> e = new ArrayList<>();
+		List<String> e = new ArrayList<>();
-        checkBasic(f, e);
+		checkBasic(f, e);
-        checkMail(f, f.getIdEmployee(), e);
+		checkMail(f, null, e);
-        checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
+		checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
-        checkFlag(f.getFlgRetirement(), "退職フラグ", e);
+		return e;
-        if (f.getPassword().length() > 256) e.add("パスワードは256文字以内で入力してください。");
+	}
-        return e;
-    }
 
-    /** 一般ユーザーによる編集：パスワードのみ（必須）。 */
+	/** 管理者による編集：全項目。パスワードは空なら変更しない。 */
-    public List<String> validateUpdateBySelf(EmployeeForm f) {
+	public List<String> validateUpdateByAdmin(EmployeeForm f) {
-        f.trim();
+		f.trim();
-        List<String> e = new ArrayList<>();
+		List<String> e = new ArrayList<>();
-        if (f.getPassword().isEmpty()) e.add("パスワードを入力してください。");
+		checkBasic(f, e);
-        else if (f.getPassword().length() > 256) e.add("パスワードは256文字以内で入力してください。");
+		checkMail(f, f.getIdEmployee(), e);
-        return e;
+		checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
-    }
+		checkFlag(f.getFlgRetirement(), "退職フラグ", e);
+		if (f.getPassword().length() > 256)
+			e.add("パスワードは256文字以内で入力してください。");
+		return e;
+	}
 
-    private void checkBasic(EmployeeForm f, List<String> e) {
+	/** 一般ユーザーによる編集：パスワードのみ（必須）。 */
-        if (f.getNmEmployee().isEmpty()) e.add("社員名を入力してください。");
+	public List<String> validateUpdateBySelf(EmployeeForm f) {
-        else if (f.getNmEmployee().length() > 50) e.add("社員名は50文字以内で入力してください。");
+		f.trim();
-        // ※社員名よみの文字種（ひらがなのみ等）は設計で確定する。現状は文字数のみチェック
+		List<String> e = new ArrayList<>();
-        if (f.getKnEmployee().isEmpty()) e.add("社員名よみを入力してください。");
+		if (f.getPassword().isEmpty())
-        else if (f.getKnEmployee().length() > 100) e.add("社員名よみは100文字以内で入力してください。");
+			e.add("パスワードを入力してください。");
-    }
+		else if (f.getPassword().length() > 256)
+			e.add("パスワードは256文字以内で入力してください。");
+		return e;
+	}
 
-    private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {
+	private void checkBasic(EmployeeForm f, List<String> e) {
-        String m = f.getMailAddress();
+		if (f.getNmEmployee().isEmpty())
-        if (m.isEmpty()) { e.add("メールアドレスを入力してください。"); return; }
+			e.add("社員名を入力してください。");
-        if (m.length() > 256) { e.add("メールアドレスは256文字以内で入力してください。"); return; }
+		else if (f.getNmEmployee().length() > 50)
-        if (!MAIL.matcher(m).matches()) { e.add("メールアドレスの形式が正しくありません。"); return; }
+			e.add("社員名は50文字以内で入力してください。");
-        Optional<Employee> dup = employeeRepository.findByMailAddress(m);
+		// ※社員名よみの文字種（ひらがなのみ等）は設計で確定する。現状は文字数のみチェック
-        if (dup.isPresent() && !dup.get().getIdEmployee().equals(selfId)) e.add(MSG_DUP);
+		if (f.getKnEmployee().isEmpty())
-    }
+			e.add("社員名よみを入力してください。");
+		else if (f.getKnEmployee().length() > 100)
+			e.add("社員名よみは100文字以内で入力してください。");
+	}
 
-    private static void checkFlag(String v, String label, List<String> e) {
+	private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {
-        if (!"0".equals(v) && !"1".equals(v)) e.add(label + "が正しくありません。");
+		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
+	@Transactional
-    public void updateByAdmin(EmployeeForm f, LoginUser admin) {
+	public Integer register(EmployeeForm f, LoginUser admin) {
-        raise(validateUpdateByAdmin(f));
+		raise(validateRegist(f));
-        Employee e = find(f.getIdEmployee());
+		Employee e = new Employee();
-        e.setNmEmployee(f.getNmEmployee());
+		e.setNmEmployee(f.getNmEmployee());
-        e.setKnEmployee(f.getKnEmployee());
+		e.setKnEmployee(f.getKnEmployee());
-        e.setMailAddress(f.getMailAddress());
+		e.setMailAddress(f.getMailAddress());
-        if (!f.getPassword().isEmpty()) e.setPassword(f.getPassword());
+		e.setPassword(passwordEncoder.encode(Const.DEFAULT_PASSWORD));
-        e.setFlgAdmin(f.getFlgAdmin());
+		e.setFlgAdmin(f.getFlgAdmin());
-        e.setFlgRetirement(f.getFlgRetirement());
+		e.setFlgRetirement(Const.RETIRE_NO);
-        e.setIdUpdate(admin.getIdEmployee());
+		e.setIdUpdate(admin.getIdEmployee());
-        e.setDateUpdate(LocalDateTime.now());
+		e.setDateUpdate(LocalDateTime.now());
-        try {
+		try {
-            employeeRepository.saveAndFlush(e);
+			return employeeRepository.saveAndFlush(e).getIdEmployee();
-        } catch (DataIntegrityViolationException ex) {
+		} catch (DataIntegrityViolationException ex) {
-            throw new BusinessException(MSG_DUP);
+			throw new BusinessException(MSG_DUP); // 同時登録によるUNIQUE制約違反
-        }
+		}
-    }
+	}
 
-    /** 一般ユーザー：自分自身（セッションの社員ID）のパスワードのみ更新する。 */
+	@Transactional
-    @Transactional
+	public void updateByAdmin(EmployeeForm f, LoginUser admin) {
-    public void updateBySelf(EmployeeForm f, LoginUser self) {
+		raise(validateUpdateByAdmin(f));
-        raise(validateUpdateBySelf(f));
+		Employee e = find(f.getIdEmployee());
-        Employee e = find(self.getIdEmployee());
+		e.setNmEmployee(f.getNmEmployee());
-        e.setPassword(f.getPassword());
+		e.setKnEmployee(f.getKnEmployee());
-        e.setIdUpdate(self.getIdEmployee());
+		e.setMailAddress(f.getMailAddress());
-        e.setDateUpdate(LocalDateTime.now());
+		if (!f.getPassword().isEmpty()) {
-    }
+			e.setPassword(passwordEncoder.encode(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);
+		}
+	}
 
-    private static void raise(List<String> errors) {
+	/** 一般ユーザー：自分自身（セッションの社員ID）のパスワードのみ更新する。 */
-        if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
+	@Transactional
-    }
+	public void updateBySelf(EmployeeForm f, LoginUser self) {
+		raise(validateUpdateBySelf(f));
+		Employee e = find(self.getIdEmployee());
+		e.setPassword(passwordEncoder.encode(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));
+	}
 }

book-rent/src/main/java/com/example/demo/service/LoginAttemptService.java

@@ -0,0 +1,101 @@
+package com.example.demo.service;
+ 
+import java.time.LocalDateTime;
+import java.util.Locale;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.springframework.stereotype.Service;
+ 
+// 失敗回数とロック時間を管理
+@Service
+public class LoginAttemptService {
+ 
+	// 最大失敗回数
+	private static final int MAX_ATTEMPTS = 5;
+	// ロック時間
+	private static final int LOCK_MINUTES = 10;
+ 
+	// 失敗回数を保存
+	private final ConcurrentMap<String, AttemptState> attempts = new ConcurrentHashMap<>();
+ 
+	public static class AttemptState {
+		// 何回失敗したか
+		private final int failedAttempts;
+		// いつロックを解除するか
+		private final LocalDateTime lockedUntil;
+ 
+		private AttemptState(int failedAttempts, LocalDateTime lockedUntil) {
+			this.failedAttempts = failedAttempts;
+			this.lockedUntil = lockedUntil;
+		}
+	}
+ 
+	private String normalize(String mailAddress) {
+		return mailAddress.trim().toLowerCase(Locale.ROOT);
+	}
+ 
+	// ログイン失敗時
+	public void loginFailed(String mailAddress) {
+		String mail = normalize(mailAddress);
+		LocalDateTime now = LocalDateTime.now();
+		AttemptState current = attempts.get(mail);
+ 
+		// ロック中なら何もしない
+		if (current != null && current.lockedUntil != null
+&& now.isBefore(current.lockedUntil)) {
+			return;
+		}
+ 
+		// 失敗回数を数える
+		int count = (current == null || current.lockedUntil != null)
+				? 1
+				: current.failedAttempts + 1;
+ 
+		// 5回失敗したら10分間ロック
+		LocalDateTime lockTime = count >= MAX_ATTEMPTS
+				? now.plusMinutes(LOCK_MINUTES)
+				: null;
+ 
+		// 失敗回数とロック時間を保存
+		attempts.put(mail, new AttemptState(count, lockTime));
+	}
+ 
+	// 現在ロック中かどうか判定
+	public boolean isBlocked(String mailAddress) {
+		String mail = normalize(mailAddress);
+		AttemptState current = attempts.get(mail);
+ 
+		if (current == null) {
+			return false;
+		}
+		if (current.lockedUntil == null) {
+			return false;
+		}
+ 
+		// 10分経過したらロックを解除
+		if (!LocalDateTime.now().isBefore(current.lockedUntil)) {
+			attempts.remove(mail);
+			return false;
+		}
+ 
+		return true;
+ 
+	}
+ 
+	// ログイン成功時に、過去の失敗回数をきれいにリセットする
+	public void loginSucceeded(String mailAddress) {
+		attempts.remove(normalize(mailAddress));
+	}
+ 
+	public int getFailedAttempts(String mailAddress) {
+		AttemptState state = attempts.get(normalize(mailAddress));
+		return state == null ? 0 : state.failedAttempts;
+	}
+ 
+	public int getRemainingAttempts(String mailAddress) {
+		int failed = getFailedAttempts(mailAddress);
+		return Math.max(0, MAX_ATTEMPTS - failed);
+	}
+ 
+}

book-rent/src/main/resources/static/css/style.css

@@ -88,3 +88,34 @@ th
 {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;
+}

book-rent/src/main/resources/templates/approvalComplete.html

@@ -9,6 +9,7 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
 	<h1>完了</h1>
 	<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
 
@@ -16,7 +17,7 @@
 		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
 		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
 	</p>
-
+	</main>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalConfilm.html

@@ -9,74 +9,77 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
-	<h1>
+	<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>
 
-	</h1>
+			<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>
 
 
-	<table>
+				<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
-		<tr>
+					style="display: inline; margin-left: 10px;">
-			<th class="header">申請ID</th>
+					<button type="submit" class="sub">却下</button>
-			<td><input type="text" readonly="readonly" th:value="${r.idRequest}" /></td>
+				</form>
-		</tr>
+				<a th:href="@{/admin/applications}" style="text-decoration: none; margin-left: 10px;">
-		<tr>
+					<button type="button" class="sub">承認待ち一覧に戻る</button>
-			<th class="header">申請者名</th>
+				</a>
-			<td><input type="text" readonly="readonly" th:value="${r.nmApplicant}" /></td>
+			</div>
-		</tr>
-		<tr>
-			<th class="header">申請日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateRequest}" /></td>
-		</tr>
-		<tr>
-			<th class="header">ISBN</th>
-			<td><input type="text" readonly="readonly" th:value="${r.isbn}" /></td>
-		</tr>
-		<tr>
-			<th class="header">書籍名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmBook}" style="width: 300px;" /></td>
-		</tr>
-		<tr>
-			<th class="header">出版社</th>
-			<td><input type="text" readonly="readonly" th:value="${r.publisher}" /></td>
-		</tr>
-		<tr>
-			<th class="header">特記事項</th>
-			<td><input type="text" readonly="readonly" th:value="${r.note}" /></td>
-		</tr>
-		<tr>
-			<th class="header">貸出日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateBorrow}" /></td>
-		</tr>
-		<tr>
-			<th class="header">返却予定日</th>
-			<td><input type="text" readonly="readonly" th:value="${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">却下</button>
-		</form>
-	</div>
 
-	<br>
-	<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
 
-	<script>
+			<script>
-		function logoutSubmit() {
+				function logoutSubmit() {
-			if (confirm("ログアウトしますか？")) {
+					if (confirm("ログアウトしますか？")) {
-				window.location.href = "/logout";
+						window.location.href = "/logout";
-			}
+					}
-		}
+				}
-	</script>
+			</script>
+		</div>
+	</main>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalRejected.html

@@ -1,23 +1,25 @@
 <!DOCTYPE html>
 <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>
-	<h1>却下</h1>
+		<main class="complete-container">
-	<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
+		<h1>却下</h1>
+			<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
 
-	<p>
+			<p>
-		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
+				<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
-		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+				<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
-	</p>
+			</p>
 
+		</main>
+	</body>
 
-</body>
 
 </html>

book-rent/src/main/resources/templates/bookList.html

@@ -29,8 +29,8 @@
  
 		<div class="card">
 			<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>
 					<tr>
 						<th>蔵書ID</th>
@@ -60,8 +60,88 @@
 					</tr>
 				</tbody>
 			</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>
 	</main>
+	
 </body>
  
 </html>
+<!--<!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>-->

book-rent/src/main/resources/templates/employeeRegistComplete.html

@@ -1,20 +0,0 @@
-<!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 class="complete-container">
-        <h2>社員登録完了</h2>
-        <p th:text="${message != null ? message : '社員登録が完了しました。'}">
-            社員登録が完了しました。
-        </p>
-        <a th:href="@{/menu}">メニューへ戻る</a>
-    </main>
-</body>
-</html>

book-rent/src/main/resources/templates/employeeRegistConfirm.html

@@ -72,13 +72,14 @@
                 <input type="hidden" th:field="*{flgAdmin}">
 
                 <!-- ボタン：左に戻る、右に登録 -->
-                <div style="display: flex;
+<!--                <div style="display: flex;-->
-                            justify-content: space-between;
+<!--                            justify-content: space-between;-->
-                            align-items: center;
+<!--                            align-items: center;-->
-                            width: 100%;
+<!--                            width: 100%;-->
-                            margin-top: 20px;">
+<!--                            margin-top: 20px;">-->
 
                     <!-- 社員情報入力に戻る -->
+					<p>
                     <a class="btn sub"
                        th:href="@{/admin/employees/new}">
                         社員情報入力に戻る
@@ -88,8 +89,8 @@
                     <button type="submit" class="btn">
                         登録
                     </button>
+					</p>
 			
-                </div>
 
             </form>
 

book-rent/src/main/resources/templates/employeeRegistInput.html

@@ -1,121 +1,117 @@
-
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <meta charset="UTF-8">
+	<meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>社員登録</title>
+	<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>
+	<div th:replace="~{fragments/header :: header}"></div>
 
-    <main>
+	<main>
-        <h2>社員登録</h2>
+		<h2>社員登録</h2>
 
-        <!-- 入力エラー表示 -->
+		<!-- 入力エラー表示 -->
-        <div class="error"
+		<div class="error" th:if="${errors != null and !errors.isEmpty()}">
-             th:if="${errors != null and !errors.isEmpty()}">
+			<p th:each="error : ${errors}" th:text="${error}">
-            <p th:each="error : ${errors}"
+			</p>
-               th:text="${error}">
+		</div>
-            </p>
-        </div>
 
-        <!-- 社員登録フォーム -->
+		<!-- 社員登録フォーム -->
-        <div class="card">
+		<div class="card">
 
-            <form th:action="@{/admin/employees/new/confirm}"
+			<form th:action="@{/admin/employees/new/confirm}" th:object="${form}" method="post">
-                  th:object="${form}"
-                  method="post">
 
-                <!-- 社員名 -->
+				<!-- 社員名 -->
-                <div>
+				<div>
-                    <label for="nmEmployee">社員名</label>
+					<label for="nmEmployee">社員名</label>
-                    <input type="text"
+					<input type="text" id="nmEmployee" th:field="*{nmEmployee}">
-                           id="nmEmployee"
+				</div>
-                           th:field="*{nmEmployee}">
-                </div>
 
-                <!-- 社員名よみ -->
+				<!-- 社員名よみ -->
-                <div>
+				<div>
-                    <label for="knEmployee">社員名よみ</label>
+					<label for="knEmployee">社員名よみ</label>
-                    <input type="text"
+					<input type="text" id="knEmployee" th:field="*{knEmployee}">
-                           id="knEmployee"
+				</div>
-                           th:field="*{knEmployee}">
-                </div>
 
-                <!-- メールアドレス -->
+				<!-- メールアドレス -->
-                <div>
+				<div>
-                    <label for="mailAddress">メールアドレス</label>
+					<label for="mailAddress">メールアドレス</label>
-                    <input type="email"
+					<input type="email" id="mailAddress" th:field="*{mailAddress}">
-                           id="mailAddress"
+				</div>
-                           th:field="*{mailAddress}">
-                </div>
 
-                <!-- パスワード -->
+				<!-- パスワード -->
-                <div>
+				<div>
-                    <label for="password">パスワード</label>
+					<label for="password">パスワード</label>
-                    <input type="password"
+					<input type="password" id="password" th:field="*{password}">
-                           id="password"
+				</div>
-                           th:field="*{password}">
+				<label for="flgAdmin">管理者フラグ</label>
-                </div>
+				<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>
+				<p><a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
+					<button type="submit">登録確認</button>
+				</p>
 
-                <!-- 権限：枠線なし・横並び -->
+				<!-- 権限：枠線なし・横並び -->
-                <div style="border: none;
+				<!--                <div style="border: none;-->
-                            display: flex;
+				<!--                            display: flex;-->
-                            flex-direction: row;
+				<!--                            flex-direction: row;-->
-                            align-items: center;
+				<!--                            align-items: center;-->
-                            gap: 25px;
+				<!--                            gap: 25px;-->
-                            margin: 15px 0 25px;">
+				<!--                            margin: 15px 0 25px;">-->
 
-                    <label style="display: inline-flex;
+				<!--                    <label style="display: inline-flex;-->
-                                  align-items: center;
+				<!--                                  align-items: center;-->
-                                  gap: 5px;
+				<!--                                  gap: 5px;-->
-                                  white-space: nowrap;">
+				<!--                                  white-space: nowrap;">-->
-                        <input type="radio"
+				<!--                        <input type="radio"-->
-                               th:field="*{flgAdmin}"
+				<!--                               th:field="*{flgAdmin}"-->
-                               value="1">
+				<!--                               value="1">-->
-                        管理者
+				<!--                        管理者-->
-                    </label>
+				<!--                    </label>-->
 
-                    <label style="display: inline-flex;
+				<!--                    <label style="display: inline-flex;-->
-                                  align-items: center;
+				<!--                                  align-items: center;-->
-                                  gap: 5px;
+				<!--                                  gap: 5px;-->
-                                  white-space: nowrap;">
+				<!--                                  white-space: nowrap;">-->
-                        <input type="radio"
+				<!--                        <input type="radio"-->
-                               th:field="*{flgAdmin}"
+				<!--                               th:field="*{flgAdmin}"-->
-                               value="0">
+				<!--                               value="0">-->
-                        一般ユーザー
+				<!--                        一般ユーザー-->
-                    </label>
+				<!--                    </label>-->
 
-                </div>
+				<!--                </div>-->
 
-                <!-- ボタン：左に戻る・右に確認 -->
+				<!--                 ボタン：左に戻る・右に確認 -->
-                <div style="display: flex;
+				<!--                <div style="display: flex;-->
-                            justify-content: space-between;
+				<!--                            justify-content: space-between;-->
-                            align-items: center;
+				<!--                            align-items: center;-->
-                            width: 100%;
+				<!--                            width: 100%;-->
-                            margin-top: 20px;">
+				<!--                            margin-top: 20px;">-->
 
-                    <a class="btn sub"
+				<!--                    <a class="btn sub"-->
-                       th:href="@{/menu}">
+				<!--                       th:href="@{/menu}">-->
-                        メニューに戻る
+				<!--                        メニューに戻る-->
-                    </a>
+				<!--                    </a>-->
 
-                    <button type="submit" class="btn">
+				<!--                    <button type="submit" class="btn">-->
-                        確認
+				<!--                        確認-->
-                    </button>
+				<!--                    </button>-->
 
-                </div>
+				<!--                </div>-->
 
-            </form>
+			</form>
 
-        </div>
+		</div>
-    </main>
+	</main>
 
 </body>
+
 </html>

book-rent/src/main/resources/templates/returnComplete.html

@@ -9,6 +9,7 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
 	<h1>返却完了</h1>
 	<div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div>
 
@@ -16,6 +17,7 @@
 		<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
 		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
 	</p>
+	</main>
 </body>
 
 </html>