[edit] 「削除済み図書が表示されるバグ」の修正をしました

src/main/java/com/example/demo/controller/BookLendController.java

@@ -3,14 +3,21 @@ package com.example.demo.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import com.example.demo.entity.Employee;
 import com.example.demo.repository.EmployeeRepository;
+import com.example.demo.service.BookServiceImpl;
+
+import lombok.RequiredArgsConstructor;
 
 @Controller
+@RequiredArgsConstructor
 public class BookLendController {
 	
+	@Autowired
+	private final BookServiceImpl bookServiceImpl;
+
 	@Autowired
 	private EmployeeRepository employeeRepository;
 
@@ -19,12 +26,13 @@ public class BookLendController {
 		return "bookLend";
 	}
 	
-	// 社員IDを取得してプルダウンに表示させる
+	@PostMapping("/bookLend/{id}")
-	@PostMapping("/bookLend/employeeId")
+	public String bookLend(@PathVariable int id, Model model) {
-	public String selectEmployeeId(Employee employee, Model model) {
+		System.out.println(id);
-		model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId()));
+		model.addAttribute("book", bookServiceImpl.findById(id));
-		model.addAttribute("bookLend", employee);
 		return "bookLend";
 	}
 	
+	
+
 }

src/main/java/com/example/demo/controller/LoginController.java

@@ -1,8 +1,11 @@
 package com.example.demo.controller;
 
+import java.util.List;
+
 import jakarta.servlet.http.HttpSession;
 import jakarta.validation.Valid;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -11,7 +14,9 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.entity.AccountEntity;
+import com.example.demo.entity.Employee;
 import com.example.demo.form.LoginForm;
+import com.example.demo.repository.EmployeeRepository;
 import com.example.demo.service.LoginService;
 
 import lombok.RequiredArgsConstructor;
@@ -21,12 +26,20 @@ import lombok.RequiredArgsConstructor;
 public class LoginController {
 
 	private final LoginService loginService;
+	@Autowired
+	private EmployeeRepository employeeRepository;
+
 
 	// Boot起動直後にログイン画面に移動する用のメソッド
 	@GetMapping("/")
-	public String index(HttpSession session) {
+	public String index(Model model,HttpSession session) {
 		if (session.getAttribute("loginEmployee") != null) {
-			return "redirect:/topmenu";
+			if(session.getAttribute("EmployeeId") != null) {
+				
+				List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+				model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+			}
+				return "topmenu";
 		}
 		return "redirect:/login";
 	}
@@ -34,7 +47,12 @@ public class LoginController {
 	@GetMapping("/login")
 	public String loginForm(Model model, HttpSession session) {
 		if (session.getAttribute("loginEmployee") != null) {
-			return "redirect:/topmenu";
+			if(session.getAttribute("EmployeeId") != null) {
+				
+				List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+				model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+			}
+			return "topmenu";
 		}
 
 		model.addAttribute("loginForm", new LoginForm());
@@ -61,7 +79,13 @@ public class LoginController {
 		}
 
 		session.setAttribute("loginEmployee", accountEntity);
-		return "redirect:/topmenu";
+		
+		List<Employee> emrp = employeeRepository.findByEmployeeId(accountEntity.getEmployee().getEmployeeId());
+		model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+		session.setAttribute("EmployeeId", accountEntity.getEmployee().getEmployeeId());
+		
+
+		return "topmenu";
 	}
 	
 	// ログアウト処理
@@ -73,7 +97,13 @@ public class LoginController {
 
 	// 各画面からトップメニューへの遷移用
 	@GetMapping("/topmenu")
-	public String showTopMenu() {
+	public String showTopMenu(Model model,HttpSession session) {
+		
+		if(session.getAttribute("EmployeeId") != null) {
+			
+			List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+			model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+		}
 		return "topmenu";
 	}
 }

src/main/java/com/example/demo/repository/BookLendRepository.java

@@ -1,5 +1,7 @@
 package com.example.demo.repository;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -8,4 +10,6 @@ import com.example.demo.entity.BookLend;
 @Repository
 public interface BookLendRepository extends JpaRepository<BookLend, Integer> {
 
+	List<BookLend> findBybookStatus(Integer bookStatus);
+	
 }

src/main/java/com/example/demo/service/BookServiceImpl.java

@@ -1,14 +1,20 @@
 package com.example.demo.service;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
 
 import com.example.demo.entity.Book;
 import com.example.demo.repository.BookRepository;
 
+import lombok.RequiredArgsConstructor;
+
 @Service
+@RequiredArgsConstructor
 public class BookServiceImpl {
 
 	@Autowired
@@ -18,8 +24,18 @@ public class BookServiceImpl {
 		return bookRepository.findAll();
 	}
 
-	public List<Book> findBooks(String keyword){ 
+	public List<Book> findBooks(String keyword) {
 		return bookRepository.searchBooks(keyword);
 	}
 
+	public Book findById(int bookId) {
+		Optional<Book> book = bookRepository.findById(bookId);
+		if (book.isEmpty()) {
+			throw new ResponseStatusException(
+					HttpStatus.NOT_FOUND, "図書情報が見つかりません");
+		}
+
+		return book.get();
+	}
+
 }

src/main/java/com/example/demo/service/EmployeeService.java

@@ -0,0 +1,24 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.Employee;
+import com.example.demo.repository.EmployeeRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class EmployeeService {
+
+	@Autowired
+	private EmployeeRepository employeeRepository;
+	
+	public List<Employee> findAll() {
+		return employeeRepository.findAll();
+	}
+	
+}

src/main/resources/templates/book.html

@@ -78,8 +78,9 @@
 				</thead>
 
 				<tbody>
-					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
+					<tr th:each="book : ${book}" th:if="${book.bookManageId != null && book.isDeleted != 1}">
 
+						<td th:hidden="*{book.bookId}"></td>
 						<td th:text="*{book.bookManageId}"></td>
 						<td th:text="*{book.isbn}"></td>
 						<td th:text="*{book.title}"></td>
@@ -106,8 +107,8 @@
 						
 						<td th:if="${session.loginEmployee.adminFlag == 1}">
 							
-							<form method="post" action="/bookLend">
+							<form method="post" th:action="@{/bookLend/{id}(id=${book.bookId})}">
-								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
+								<input type="hidden" name="id" th:value="*{book.bookId}">
 								<button type="submit"
 									th:disabled="*{book.bookLends != null && book.bookLends.bookStatus == 1}">
 									貸出

src/main/resources/templates/bookLend.html

@@ -13,54 +13,37 @@
 	</h1>
 
 	<p>
-		以下の図書を貸出します。貸出先と貸出日・返却予定日を入力してください。
+		以下の図書を貸出します。貸出先の社員IDと返却予定日を入力してください。
 	</p>
 
 	<h2>
 		図書情報
 	</h2>
 
+	<form id="lendForm" action="bookLendConfirm" method="post">
+
 		<div class="card-body">
 			<table class="info-table">
+				<thead>
 					<tr>
-				<th>
+						<th>図書管理ID</th>
-					図書管理ID
+						<th>図書タイトル</th>
-				</th>
+						<th>著者名</th>
+						<th>ISBN</th>
+					</tr>
+				</thead>
 
-				<td>
+				<tbody>
-					（図書管理IDをここに表示させる）
+					<tr th:each="book : ${book}">
-				</td>
+						<td th:hidden="*{book.bookId}"></td>
+						<td th:text="*{book.bookManageId}"></td>
+						<td th:text="*{book.title}"></td>
+						<td th:text="*{book.author}"></td>
+						<td th:text="*{book.isbn}"></td>
 					</tr>
 
-			<tr>
+				</tbody>
-				<th>
-					図書タイトル
-				</th>
 
-				<td>
-					（タイトルをここに表示させる）
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					著者名
-				</th>
-
-				<td>
-					（著者名をここに表示させる）
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					ISBN
-				</th>
-
-				<td>
-					（ISBNをここに表示させる）
-				</td>
-			</tr>
 			</table>
 		</div>
 
@@ -76,34 +59,11 @@
 					社員ID
 				</label>
 
-<!--			<select th:field="*{employeeId}" onchange="this.form.action='/bookLend/employeeId';this.form.submit();">-->
+				<input type="text" id="employeeId" placeholder="社員IDを入力してください">
-
-			<select name="employeeId" id="employeeSelect">
-				
-				<option value="">
-					社員IDを選択してください
-				</option>
-
-<!--				<option th:each="employee : ${employeeList}" th:value="${employee.employeeId}">-->
-<!--				</option>-->
-
-				<option value="1">1</option>
-				<option value="2">2</option>
-				<option value="3">3</option>
-				<option value="4">4</option>
 
 				</select>
 			</div>
 
-		<div class="form-row">
-			<label for="employeeName">
-				社員名
-			</label>
-
-			<input type="text" id="employeeName" value="" placeholder="社員名が表示されます" readonly>
-
-		</div>
-
 		</div>
 
 		<h2>
@@ -115,35 +75,19 @@
 			<div class="date-box">
 
 				<label>
-				貸出日(自動取得)
+					貸出日（現在の日付が自動で設定されます。)
 				</label>
 
-			<input type="date" id="loanDate" name="loanDate" value="">
+				<p th:text="${#calendars.format(#calendars.createNowForTimeZone('Asia/Tokyo'), 
-
+				'yyyy年MM月dd日')}">
-			<div class="note">
+				</p>
-				※ 現在の日付が自動で設定されます。
-			</div>
 
 			</div>
 
 			<div class="date-box">
 
 				<label>
-				貸出期間日数
+					返却予定日（必ず指定してください。）
-			</label>
-
-			<input type="text" id="loanDays" placeholder="日数を入力してください">
-
-			<div class="note">
-				※ 数値（1以上）で入力してください。
-			</div>
-
-		</div>
-
-		<div class="date-box">
-
-			<label>
-				返却予定日（必須）
 				</label>
 
 				<input type="date" id="returnDate" name="returnDate">
@@ -160,34 +104,18 @@
 
 		</div>
 
-	<div class="warning-area">
+		<h3>
-
-		<strong>
 			注意事項
-		</strong>
+		</h3>
 
-		<ul>
+		<p>
-			<li>
 			貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。
-			</li>
+		</p>
 
-			<li>
+		<input type="submit" name="submit" onclick="submitLend()" value="貸出する">
-				返却予定日を必ず指定してください。
+<!--		<button type="button" class="btn btn-primary" onclick="submitLend()">-->
-			</li>
-		</ul>
 
-	</div>
+		<input type="reset" name="reset" value="入力内容をクリア">
-
-	<form id="lendForm" action="bookLendConfirmation" method="post">
-		<div class="button-area">
-
-			<div class="right-buttons">
-				<button type="button" class="btn btn-primary" onclick="submitLend()">
-					貸出する
-				</button>
-			</div>
-
-		</div>
 
 	</form>
 
@@ -201,6 +129,19 @@
 			}
 		}
 
+		// カレンダーを当日以前の日付を入力できないようにする
+		const today = new Date();
+		function dateFormat(today, format) {
+			format = format.replace("YYYY", today.getFullYear());
+			format = format.replace("MM", ("0" + (today.getMonth() + 1)).slice(-2));
+			format = format.replace("DD", ("0" + today.getDate()).slice(-2));
+			return format;
+		}
+
+		const data = dateFormat(today, 'YYYY-MM-DD');
+		const field = document.getElementById('returnDate');
+		field.setAttribute("min", data);
+
 	</script>
 
 </body>

src/main/resources/templates/topmenu.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 	
 <head>
 	<meta charset="UTF-8">
@@ -17,7 +17,7 @@
 		<div class="header-right">
 
 			<span class="user">
-				テストユーザー（一般）
+				<h1 th:text="${LoginName}"></h1>
 			</span>
 
 			<a class="button-link" th:href="@{/logout}">
@@ -61,6 +61,7 @@
 	<hr>
 
 	<!-- ===== 管理者のみ ===== -->
+	<th th:if="${session.loginEmployee.adminFlag == 1}">		
 
 		<a class="card" href="/bookInsert">
 
@@ -71,6 +72,7 @@
 		</p>
 	</a>
 	
+
 	<hr>
 
 
@@ -103,7 +105,12 @@
 			初期パスワードを<br> 変更します。
 		</p>
 	</a>
+	</th>
 
 </body>
 
+<script>
+  var admin =getElementByID
+</script>
+
 </html>