[edit]バグ修正をしました

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

@@ -1,7 +1,5 @@
 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;
@@ -12,6 +10,7 @@ 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;
@@ -19,86 +18,79 @@ 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 StorageLocationRepository storageLocationRepository;
 
-	    @GetMapping("/bookInsert")
-	    public String bookInsert(Model model) {
-	    	model.addAttribute("categoryList",categoryRepository.findAll());
-	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
-		model.addAttribute("locationList",storageLocationRepository.findAll());
-	    	model.addAttribute("bookInsert",new BookInsert());
-	        return "bookInsert";
-	    }
+	@Autowired
+	private BookInsertRepository bookInsertRepository;
 
-	    // 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
+	@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());
+		return "bookInsert";
+	}
 
-	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
-	    @PostMapping("/bookInsertConfirm")
-	    public String bookInsertConfirm(@Validated BookInsert bookInsert,BindingResult result,Model model) {
-	    	if(result.hasErrors()) {
-	    		model.addAttribute("categoryList",categoryRepository.findAll());
-	    		if(bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
-	    			model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
-	    			//そのカテゴリに属するサブカテゴリを持ってくる
-	    			} else{
-	    			model.addAttribute("subCategoryList",new ArrayList<>());
-	    			}
-	    		model.addAttribute("locationList",storageLocationRepository.findAll());
-	    		model.addAttribute("bookInsert", bookInsert);
-	    		return "bookInsert";
+	// 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
 
-	    	}
-	    	System.out.println(bookInsert);
-	    	bookInsertService.save(bookInsert);
-	    	model.addAttribute("bookInsert",bookInsert);
-	        return "bookInsertConfirm";
-	    }
+	// 確認画面から戻る: 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";
 
-	    //確認画面から「もどる」ボタンを押したら入力画面に戻る
-	    @PostMapping("/bookInsert")
-	    public String bookInsertBack(BookInsert bookInsert,Model model) {
-	    	model.addAttribute("categoryList",categoryRepository.findAll());
-	    	if(bookInsert.getBookCategoryId() != null) {
-	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
-	    			} else{
-	    				model.addAttribute("subCategoryList",new ArrayList<>());
-	    			}
-	    		model.addAttribute("locationList",storageLocationRepository.findAll());
-	    		model.addAttribute("bookInsert",bookInsert);
-	        return "bookInsert";
-	    }
-	    
-	    @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",取得結果)
+		}
+		bookInsertService.save(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());
+		}
+		model.addAttribute("locationList", storageLocationRepository.findAll());
+		model.addAttribute("bookInsert", bookInsert);
 
+		return "bookInsert";
+	}
 
+}
 
+//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
+//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
+//「カテゴリIDが1のサブカテゴリを取ってくる」
+//model.addAttribute("subCategoryList",取得結果)

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

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

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

@@ -3,9 +3,13 @@ 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/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/BookInsertService.java

@@ -8,4 +8,5 @@ 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

@@ -12,8 +12,16 @@ import com.example.demo.repository.BookInsertRepository;
 	@Service
 	public class BookInsertServiceImpl implements BookInsertService {
 	
-	    @Autowired
-	    private BookInsertRepository 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) {
@@ -33,15 +41,14 @@ 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.findAll();
+		return bookLendRepository.findBybookStatus(1);
 	}
 
 }

src/main/resources/templates/bookInsert.html

@@ -8,28 +8,33 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	       <br><br>
-	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください</h4>
+	       <br>
+	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください。</h4>
 	<span style="color:red;">※は必須項目です</span>
-	<br><br>
+	<br>
+	<h4>図書情報</h4>
 	<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
  
 		
 		<label for="bookmanageId">図書管理ID</label><br>
-				<input type="text"
-				       id="bookManageId"
-				       placeholder="登録時に自動採番されます" readonly>
-				<br><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>
 
 	<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="ISBNを入力" th:value="${bookInsert.isbn}"  required>
-		   <div th:if="${#fields.hasErrors('isbn')}" th:errors="*{isbn}" style="color:red">
+	<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><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>
@@ -50,30 +55,34 @@
 		<br><br>
 		
 		<label for="subcategory">サブカテゴリ<span style="color:red;">※</span></label><br>
-		<select th:field="*{subcategory}">
+		<select th:field="*{subcategory}"  required>
 		    <option value="">選択してください</option>
 			<option th:each="sub:${subCategoryList}"
 				    th:value="${sub.bookSubcategoryId}"
-				    th:text="${sub.bookSubcategoryName}" required>
+				    th:text="${sub.bookSubcategoryName}">
 				    </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}">
+		<select th:field="*{location}" required>
 		<option value="">選択してください</option>
 			<option th:each="location:${locationList}"
 		            th:value="${location.locationId}"
-		            th:text="${location.locationName}" required>
+		            th:text="${location.locationName}" >
 		    </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>
 			<option value="">選択してください</option>
-		    <option value="1">新品同様</option>
+		    <option value="1">新品</option>
 		    <option value="2">良好</option>
 		    <option value="3">使用感あり</option>
 		    <option value="4">傷みあり</option>
@@ -98,11 +107,9 @@
 		<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,30 +10,6 @@
 	<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="bookCategoryId" 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">