[EDIT]:図書一覧画面から貸出処理画面に遷移後、図書情報を引き継ぐ処理を追加

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

@@ -1,16 +1,15 @@
 package com.example.demo.controller;
 
+import java.util.ArrayList;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.entity.BookInsert;
 import com.example.demo.repository.BookCategoryRepository;
-import com.example.demo.repository.BookInsertRepository;
 import com.example.demo.repository.StorageLocationRepository;
 import com.example.demo.repository.SubCategoryRepository;
 import com.example.demo.service.BookInsertService;
@@ -18,79 +17,69 @@ import com.example.demo.service.BookInsertService;
 @Controller
 public class BookInsertController {
 	
-	@Autowired
-	private BookInsertService bookInsertService;
+@Autowired
+private BookInsertService bookInsertService;
 
-	@Autowired
-	private BookCategoryRepository categoryRepository;
+@Autowired
+private BookCategoryRepository categoryRepository;
 
-	@Autowired
-	private SubCategoryRepository subCategoryRepository;
+@Autowired
+private SubCategoryRepository subCategoryRepository;
 
-	@Autowired
-	private StorageLocationRepository storageLocationRepository;
-
-	@Autowired
-	private BookInsertRepository bookInsertRepository;
+@Autowired 
+private StorageLocationRepository storageLocationRepository;
 
 	    @GetMapping("/bookInsert")
 	    public String bookInsert(Model model) {
-		model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-		model.addAttribute("bookInsert", new BookInsert());
-		model.addAttribute("categoryList", categoryRepository.findAll());
-		model.addAttribute("subCategoryList", subCategoryRepository.findAll());
-		model.addAttribute("locationList", storageLocationRepository.findAll());
-		model.addAttribute("bookInsert", new BookInsert());
+	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+		model.addAttribute("locationList",storageLocationRepository.findAll());
+	    	model.addAttribute("bookInsert",new BookInsert());
 	        return "bookInsert";
 	    }
 	    
 	    // 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
 	    
 	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
-	//入力内容確認してOKであれば確認画面へ
 	    @PostMapping("/bookInsertConfirm")
-	public String bookInsertConfirm(@Validated BookInsert bookInsert, BindingResult result, Model model) {
-		if (result.hasErrors()) {
-			model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-			model.addAttribute("categoryList", categoryRepository.findAll());
-			if (bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
-				model.addAttribute("subCategoryList",
-						subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
-				//そのカテゴリに属するサブカテゴリを持ってくる
-			} else {
-				model.addAttribute("subCategoryList", subCategoryRepository.findAll());
-			}
-			model.addAttribute("locationList",storageLocationRepository.findAll());
-			model.addAttribute("bookInsert", bookInsert);
-			return "bookInsert";
-
-		}
+	    public String bookInsertConfirm(BookInsert bookInsert,Model model) {
+	    	System.out.println(bookInsert);
 	    	bookInsertService.save(bookInsert);
-		model.addAttribute("bookInsert", bookInsert);
+	    	model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsertConfirm";
 	    }
 	    
-	@PostMapping("/bookInsert/category")
-	public String changeCategory(BookInsert bookInsert, Model model) {
-		//カテゴリプルダウンに表示するデータを取得
-		model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-		model.addAttribute("categoryList", categoryRepository.findAll());
-		if (bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
-			model.addAttribute("subCategoryList",
-					subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
-			//そのカテゴリに属するサブカテゴリを持ってくる
-		} else {
-			model.addAttribute("subCategoryList", subCategoryRepository.findAll());
+	    @PostMapping("/bookInsert")
+	    public String bookInsertBack(BookInsert bookInsert,Model model) {
+	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    	model.addAttribute("subCategoryList",new ArrayList<>());
+	    	model.addAttribute("locationList",storageLocationRepository.findAll());
+	    	model.addAttribute("bookInsert",bookInsert);
+	        return "bookInsert";
 	    }
-		model.addAttribute("locationList", storageLocationRepository.findAll());
+	    
+	    @PostMapping("/bookInsert/category")
+	    public String changeCategory(BookInsert bookInsert,Model model) {
+	    	    //カテゴリプルダウンに表示するデータを取得
+	    		model.addAttribute("categoryList",categoryRepository.findAll());
+
+	        model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+	        model.addAttribute("locationList",storageLocationRepository.findAll());
 	        model.addAttribute("bookInsert", bookInsert);
 
 	        return "bookInsert";
 	    }
 	    
-}
 	    
-//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
-//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
-//「カテゴリIDが1のサブカテゴリを取ってくる」
-//model.addAttribute("subCategoryList",取得結果)
+	
+	    }
+
+
+	//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
+	//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
+	//「カテゴリIDが1のサブカテゴリを取ってくる」
+	//model.addAttribute("subCategoryList",取得結果)
+	    
+	  
+	   
+	 

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

@@ -1,21 +1,59 @@
 package com.example.demo.controller;
 
+import java.util.List;
+
 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 com.example.demo.service.EmployeeService;
+
+import lombok.RequiredArgsConstructor;
 
 @Controller
+@RequiredArgsConstructor
 public class BookLendController {
 	
+	@Autowired
+	private final BookServiceImpl bookServiceImpl;
+
 	@Autowired
 	private EmployeeRepository employeeRepository;
 	
-	@PostMapping("/bookLend")
-	public String bookLend(Model model) {
+	@Autowired
+	private EmployeeService employeeService;
+
+//	@PostMapping("/bookLend")
+//	public String bookLend(Model model) {
+//		return "bookLend";
+//	}
+	
+//	@PostMapping("/bookLend/{id}")
+//	public String bookLend(@PathVariable int id, Model model) {
+//		System.out.println(id);
+//		model.addAttribute("book", bookServiceImpl.findById(id));
+//		return "bookLend";
+//	}
+	
+	@PostMapping("/bookLend/{id}")
+	public String bookLend(@PathVariable int id,Employee employee, Model model) {
+		
+		// 図書ID取得
+		model.addAttribute("book", bookServiceImpl.findById(id));
+		
+		// 社員ID取得（プルダウン用）
+		List<Employee> empList = employeeService.findAll();
+
+		model.addAttribute("bookLend", employeeService.findAll());
+		
+//		model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId()));
+//		model.addAttribute("bookLend", employee);
+		
 		return "bookLend";
 	}
 

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

@@ -1,11 +1,8 @@
 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;
@@ -14,9 +11,7 @@ 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;
@@ -26,20 +21,12 @@ import lombok.RequiredArgsConstructor;
 public class LoginController {
 
 	private final LoginService loginService;
-	@Autowired
-	private EmployeeRepository employeeRepository;
-
 
 	// Boot起動直後にログイン画面に移動する用のメソッド
 	@GetMapping("/")
-	public String index(Model model,HttpSession session) {
+	public String index(HttpSession session) {
 		if (session.getAttribute("loginEmployee") != null) {
-			if(session.getAttribute("EmployeeId") != null) {
-				
-				List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
-				model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
-			}
-				return "topmenu";
+			return "redirect:/topmenu";
 		}
 		return "redirect:/login";
 	}
@@ -47,12 +34,7 @@ public class LoginController {
 	@GetMapping("/login")
 	public String loginForm(Model model, HttpSession session) {
 		if (session.getAttribute("loginEmployee") != null) {
-			if(session.getAttribute("EmployeeId") != null) {
-				
-				List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
-				model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
-			}
-			return "topmenu";
+			return "redirect:/topmenu";
 		}
 
 		model.addAttribute("loginForm", new LoginForm());
@@ -79,13 +61,7 @@ public class LoginController {
 		}
 
 		session.setAttribute("loginEmployee", accountEntity);
-		
-		List<Employee> emrp = employeeRepository.findByEmployeeId(accountEntity.getEmployee().getEmployeeId());
-		model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
-		session.setAttribute("EmployeeId", accountEntity.getEmployee().getEmployeeId());
-		
-
-		return "topmenu";
+		return "redirect:/topmenu";
 	}
 	
 	// ログアウト処理
@@ -97,13 +73,7 @@ public class LoginController {
 
 	// 各画面からトップメニューへの遷移用
 	@GetMapping("/topmenu")
-	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());
-		}
+	public String showTopMenu() {
 		return "topmenu";
 	}
 }

src/main/java/com/example/demo/entity/BookInsert.java

@@ -8,7 +8,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
-import jakarta.validation.constraints.Pattern;
 
 import lombok.Data;
 
@@ -28,7 +27,6 @@ public class BookInsert {
     @Column(name = "title")
     private String title;
     
-    @Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
     @Column(name = "isbn")
     private String isbn;
     
@@ -68,7 +66,7 @@ public class BookInsert {
     @Column(name = "book_approval")
     private Integer bookApproval;
   
-    @Transient 
+    @Transient //DB保存無効
     private Integer bookCategoryId;
     
     

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

@@ -3,13 +3,9 @@ package com.example.demo.repository;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
 
 import com.example.demo.entity.BookInsert;
 
-@Repository
 public interface BookInsertRepository extends JpaRepository<BookInsert,Integer> {
 
-	BookInsert findFirstByOrderByBookIdDesc();//bookIDが一番大きいデータを取得
-
-	}
+}

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

@@ -8,5 +8,4 @@ public interface BookInsertService {
 	String regist(BookInsert book);
 	List<BookInsert> findAll();
 	void save(BookInsert bookInsert);
-	String createBookManageId(); 
-	}
+}

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

@@ -15,14 +15,6 @@ import com.example.demo.repository.BookInsertRepository;
 	    @Autowired
 	    private BookInsertRepository bookInsertRepository;
 	
-	@Override
-	public String createBookManageId() { //次に表示する図書管理IDを作る
-	    		BookInsert book =bookInsertRepository.findFirstByOrderByBookIdDesc();
-	    			if(book ==null){
-	                return "BK-1";}
-	    			return "BK-"+(book.getBookId()+1); //いまのIDの次のIDを返す
-	    }
-	    
 	    @Override
 	    public String regist(BookInsert book) {
 	        // DTO → エンティティへ詰め替えて保存
@@ -41,14 +33,15 @@ import com.example.demo.repository.BookInsertRepository;
 	    	bookInsert.setIsDeleted(0);//削除フラグ設定
 	    	bookInsert.setBookApproval(0);//承認フラグ(承認されていないため0)
 	    	bookInsertRepository.save(bookInsert);
-	    	//BK-〇形式で管理IDを作る
-	    	String manageId="BK-"+bookInsert.getBookId();//BookId取得→BK形式に変換
+	    	//BK〇〇〇〇形式で管理IDを作る
+	    	String manageId="BK-" + bookInsert.getBookId();//BookId取得→BK形式に変換
 	    	bookInsert.setBookManageId(manageId);
 	    
 	     bookInsertRepository.save(bookInsert);//データベースに保存
 	    }
 	}
 	
+	
+	
 	// ※BookService インタフェースにも List<Review> findAll(); を追加すること
 	
-	

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

@@ -15,7 +15,7 @@ public class BookLendService {
 	private BookLendRepository bookLendRepository;
 
 	public List<BookLend> findAll() {
-		return bookLendRepository.findBybookStatus(1);
+		return bookLendRepository.findAll();
 	}
 
 }

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/resources/templates/book.html

@@ -80,6 +80,7 @@
 				<tbody>
 					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
 
+						<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">
-								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
+							<form method="post" th:action="@{/bookLend/{id}(id=${book.bookId})}">
+								<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/bookInsert.html

@@ -8,33 +8,26 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	       <br>
-	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください。</h4>
+	       <br><br>
+	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください</h4>
 	<span style="color:red;">※は必須項目です</span>
-	<br>
-	<h4>図書情報</h4>
+	<br><br>
 	<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
  
 		
 		<label for="bookmanageId">図書管理ID</label><br>
-				<input type="text" id="bookManageId" th:value="${nextBookManageId}" readonly>
-				<div style="font-size:12px; color:rgb(128, 128, 128);">
-				※例：BK-1、BK-2...
-				</div>
-				<br>
+				<input type="text"
+				       id="bookManageId"
+				       placeholder="登録時に自動採番されます" readonly>
+				<br><br>
 
 	<label for="title">タイトル<span style="color:red;">※</span></label><br>
 	<input type="text" id="title" name="title" placeholder="タイトルを入力" th:value="${bookInsert.title}" required>
 	<br><br>
 	
 	<label for="isbn">ISBN<span style="color:red;">※</span></label><br>
-	<input type="text" id="isbn" name="isbn" placeholder="例：978-4-123-45678-9" th:value="${bookInsert.isbn}"  required>
-	<div style="font-size:12px; color:rgb(128, 128, 128);">
-	※ハイフン(4つ)を含む形式で入力してください
-	</div>
-	<div th:if="${#fields.hasErrors('isbn')}" th:errors="*{isbn}" style="color:red">
-		   </div>
-		<br>
+	<input type="text" id="isbn" name="isbn" placeholder="例:978-1-23-456789-0" th:value="${bookInsert.isbn}" required>
+		<br><br>
 	
 		<label for="title">著者名<span style="color:red;">※</span></label><br>
 		<input type="text" id="author" name="author" placeholder="著者名を入力" th:value="${bookInsert.author}" required>
@@ -55,34 +48,30 @@
 		<br><br>
 		
 		<label for="subcategory">サブカテゴリ<span style="color:red;">※</span></label><br>
-		<select th:field="*{subcategory}"  required>
+		<select th:field="*{subcategory}">
 		    <option value="">選択してください</option>
 			<option th:each="sub:${subCategoryList}"
 				    th:value="${sub.bookSubcategoryId}"
-				    th:text="${sub.bookSubcategoryName}">
+				    th:text="${sub.bookSubcategoryName}" required>
 				    </option>
 				</select>
-				<div th:if="${#fields.hasErrors('subcategory')}" th:errors="*{subcategory}" style="color:red">
-						</div>
 		<br><br>
 		
 		<label for="location">保管場所<span style="color:red;">※</span></label><br>
-		<select th:field="*{location}" required>
+		<select th:field="*{location}">
 		<option value="">選択してください</option>
 			<option th:each="location:${locationList}"
 		            th:value="${location.locationId}"
-		            th:text="${location.locationName}" >
+		            th:text="${location.locationName}" required>
 		    </option>
 
 		</select>
-		<div th:if="${#fields.hasErrors('location')}" th:errors="*{location}" style="color:red">
-		</div>
 		<br><br>
 		
 		<label for="condition">図書状態<span style="color:red;">※</span></label><br>
-		<select th:field="*{condition}" required>
+		<select name="condition" required>
 			<option value="">選択してください</option>
-		    <option value="1">新品</option>
+		    <option value="1">新品同様</option>
 		    <option value="2">良好</option>
 		    <option value="3">使用感あり</option>
 		    <option value="4">傷みあり</option>
@@ -107,9 +96,11 @@
 		<br><br>
 </label>-->
 
-<input type="submit" value="登録" onclick="return confirm('この内容で登録しますか？');">
 
+	<input type="submit" value="登録" class="btn">
 </form>
+
+
 </body>
 
 </html>

src/main/resources/templates/bookInsertConfirm.html

@@ -10,6 +10,30 @@
 	<h1>登録内容確認</h1>
 
 		
+		<!-- もどる: 入力中の値を持って入力画面へ -->
+		<form method="post" th:action="@{/bookInsert}" >
+		    <input type="hidden" name="bookId" th:value="${bookInsert.bookId}">
+			<input type="hidden" name="bookmanageId" th:value="${bookInsert.bookManageId}">
+		    <input type="hidden" name="title" th:value="${bookInsert.title}">
+			<input type="hidden" name="isbn" th:value="${bookInsert.isbn}">
+			<input type="hidden" name="author" th:value="${bookInsert.author}">
+			<input type="hidden" name="category" th:value="${bookInsert.bookCategoryId}">
+			<input type="hidden" name="subcategory" th:value="${bookInsert.subcategory}">
+			<input type="hidden" name="publisher" th:value="${bookInsert.publisher}">
+			<input type="hidden" name="publicationDate" th:value="${bookInsert.publicationDate}">
+			<input type="hidden" name="location" th:value="${bookInsert.location}">
+			<input type="hidden" name="condition" th:value="${bookInsert.condition}">
+			<input type="hidden" name="donor" th:value="${bookInsert.donor}">
+			<input type="hidden" name="description" th:value="${bookInsert.description}">
+		    <button type="submit">もどる</button>
+		</form>
+	</form>
+	<!-- 完了 -->
+	<form action="/book" method="GET">
+		<input type="submit" value="完了" class="btn">
+	</form>
+	<div id="registerModal" class="modal-overlay">
+
 		<div class="modal">
 
 			<div class="modal-message">

src/main/resources/templates/topmenu.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html>
 
 <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,7 +61,6 @@
 	<hr>
 
 	<!-- ===== 管理者のみ ===== -->
-	<th th:if="${session.loginEmployee.adminFlag == 1}">		
 
 	<a class="card" href="/bookInsert">
 
@@ -72,7 +71,6 @@
 		</p>
 	</a>
 
-
 	<hr>
 
 
@@ -105,12 +103,7 @@
 			初期パスワードを<br> 変更します。
 		</p>
 	</a>
-	</th>
 
 </body>
 
-<script>
-  var admin =getElementByID
-</script>
-
 </html>