[add]カテゴリ・サブカテゴリのプルダウンを追加

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

@@ -1,5 +1,7 @@
 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;
@@ -8,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.SubCategoryRepository;
 import com.example.demo.service.BookInsertService;
 
 @Controller
@@ -18,10 +21,13 @@ private BookInsertService bookInsertService;
 
 @Autowired
 private BookCategoryRepository categoryRepository;
+@Autowired
+private SubCategoryRepository subCategoryRepository;
 
 	    @GetMapping("/bookInsert")
 	    public String bookInsert(Model model) {
 	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
 	    	model.addAttribute("bookInsert",new BookInsert());
 	        return "bookInsert";
 	    }
@@ -31,22 +37,36 @@ private BookCategoryRepository categoryRepository;
 	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
 	    @PostMapping("/bookInsertConfirm")
 	    public String bookInsertConfirm(BookInsert bookInsert,Model model) {
+	    	bookInsertService.save(bookInsert);
 	    	model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsertConfirm";
 	    }
 	    
 	    @PostMapping("/bookInsert")
 	    public String bookInsertBack(BookInsert bookInsert,Model model) {
+	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    	model.addAttribute("subCategoryList",new ArrayList<>());
+	    	model.addAttribute("bookInsert",bookInsert);
+	        return "bookInsert";
+	    }
 	    
-	        model.addAttribute("categoryList",categoryRepository.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("bookInsert", bookInsert);
 
-	        model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsert";
 	    }
 	    
 	
-
-	    
 	    }
 
+	//画面で選択したカテゴリbookInsert.getBookCategoryId())
+
+	    
+	  
+	   
 	 

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

@@ -1,32 +1,75 @@
 package com.example.demo.entity;
+import java.time.LocalDate;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 
 import lombok.Data;
 
 @Entity  // このクラスがDBのテーブルに対応することを表す
+@Table(name = "book")
 @Data
 public class BookInsert {
 
     @Id  // 主キー
     @GeneratedValue(strategy = GenerationType.IDENTITY)  // 自動採番
-    private Long Id;
+    @Column(name = "book_id")
+    private Integer bookId;
     
-    private String bookId;
+    @Column(name = "book_manage_id")
+    private String bookManageId;
+
+    @Column(name = "title")
     private String title;
-    private Integer isbn;
+    
+    @Column(name = "isbn")
+    private String isbn;
+    
+    @Column(name = "author")
     private String author;
-    private String category;
+    
-    private String subcategory;
+    @Column(name = "book_subcategory_id")
-    private Integer publisher;
+    private Integer subcategory;
-    private Integer publicationDate;
+    
-    private String location;
+    @Column(name = "publisher")
-    private String condition;
+    private String publisher;
-    private String donor;
+    
-    private String discription;
+    @Column(name = "publication_date")
+    private String publicationDate;
+    
+    @Column(name = "location_id")
+    private Integer location;
+    
+    @Column(name = "condition_s")
+    private Integer condition;
+    
+    @Column(name = "donor_id")
+    private Integer donor;
+    
+    @Column(name = "description")
+    private String description;
+    
+    @Column(name = "created_at")
+    private LocalDate createdAt;
+
+    @Column(name = "updated_at")
+    private LocalDate updatedAt;
+
+    @Column(name = "is_deleted")
+    private Integer isDeleted;
+    
+    @Column(name = "book_approval")
+    private Integer bookApproval;
+  
+    @Transient
+    private Integer bookCategoryId;
+    
+    
     
  
 }

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

@@ -6,6 +6,6 @@ import com.example.demo.entity.BookInsert;
 
 public interface BookInsertService {
 	String regist(BookInsert book);
-
 	List<BookInsert> findAll();
-	}
+	void save(BookInsert bookInsert);
+}

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

@@ -1,6 +1,7 @@
 	package com.example.demo.service;
 	
-	import java.util.List;
+	import java.time.LocalDate;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,8 +18,6 @@ import com.example.demo.repository.BookInsertRepository;
 	    @Override
 	    public String regist(BookInsert book) {
 	        // DTO → エンティティへ詰め替えて保存
-	    	    bookInsertRepository.save(book);
-	        book.setBookId("bk"+book.getId());
 	        bookInsertRepository.save(book);  // 保存
 	        return "登録が完了しました";
 	    }
@@ -27,7 +26,22 @@ import com.example.demo.repository.BookInsertRepository;
 	    public List<BookInsert> findAll() {
 	        return bookInsertRepository.findAll();  // 全件取得
 	    }
+	    
+	    public void save(BookInsert bookInsert) {
+	    	bookInsert.setCreatedAt(LocalDate.now());//登録日時設定
+	    	bookInsert.setUpdatedAt(LocalDate.now());//更新日時設定
+	    	bookInsert.setIsDeleted(0);//削除フラグ設定
+	    	bookInsert.setBookApproval(0);//承認フラグ(承認されていないため0)
+	    	bookInsertRepository.save(bookInsert);
+	    	//BK〇〇〇〇形式で管理IDを作る
+	    	String manageId="BK-" + bookInsert.getBookId();//BookId取得→BK形式に変換
+	    	bookInsert.setBookManageId(manageId);
+	    
+	     bookInsertRepository.save(bookInsert);//データベースに保存
+	    }
 	}
 	
+	
+	
 	// ※BookService インタフェースにも List<Review> findAll(); を追加すること
 	

src/main/resources/templates/bookInsert.html

@@ -12,18 +12,26 @@
 	<br>
 	       <br><br>
 		   
-	<form action="/bookInsertConfirm" method="POST">
+	<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
  
-	<label for="bookId">図書管理ID</label><br>
+		<label for="bookId">図書ID</label><br>
-	<input type="text" id="bookId" name="bookId" placeholder="図書管理Idを入力" th:value="${bookInsert.bookId}" required>
+		<input type="text"
-	<br><br>
+		       id="bookId"
+		       placeholder="登録時に自動採番されます" readonly>
+		<br><br>
+		
+		<label for="bookmanageId">図書管理ID</label><br>
+				<input type="text"
+				       id="bookManageId"
+				       placeholder="登録時に自動採番されます" readonly>
+				<br><br>
 
 	<label for="title">タイトル</label><br>
 	<input type="text" id="title" name="title" placeholder="タイトルを入力" th:value="${bookInsert.title}" required>
 	<br><br>
 	
 	<label for="isbn">ISBN</label><br>
-	<input type="text" id="isbn" name="isbn" th:value="${bookInsert.isbn}" required>
+	<input type="text" id="isbn" name="isbn" placeholder="ISBNを入力" th:value="${bookInsert.isbn}" required>
 		<br><br>
 	
 		<label for="title">著者名</label><br>
@@ -31,11 +39,31 @@
 		<br><br>
 		
 		<label for="category">カテゴリ</label><br>
-		<input type="text" id="category" name="category" placeholder="カテゴリを選択" th:value="${bookInsert.category}" required>
+		<select th:field="*{bookCategoryId}"
+		        onchange="
+		            this.form.action='/bookInsert/category';
+		            this.form.submit();">
+
+		    <option value="">
+		        選択してください
+		    </option>
+
+		    <option th:each="category : ${categoryList}"
+		            th:value="${category.bookCategoryId}"
+		            th:text="${category.bookCategoryName}">
+		    </option>
+
+		</select>
 		<br><br>
 		
 		<label for="subcategory">サブカテゴリ</label><br>
-		<input type="text" id="subcategory" name="subcategory" placeholder="サブカテゴリを選択" th:value="${bookInsert.subcategory}" required>
+		<select th:field="*{subcategory}">
+		    <option value="">選択してください</option>
+			<option th:each="sub:${subCategoryList}"
+				    th:value="${sub.bookSubcategoryId}"
+				    th:text="${sub.bookSubcategoryName}">
+				    </option>
+				</select>
 		<br><br>
 	
 		<label for="publisher">主パン者</label><br>
@@ -47,33 +75,36 @@
 		<br><br>
 		
 		<label for="location">保管場所</label><br>
-		<select id="location" name="location" required >
+		<select name="location">
-			<option value="undecided">未確定</option>
+			<option value="1">未確定</option>
-			<option value="area">開発エリア書棚</option>
+			<option value="2">開発エリア書棚</option>
-			<option value="rack">会議室前ラック</option>
+			<option value="3">会議室前ラック</option>
 			</select>
 		<br><br>
 		
 		<label for="condition">図書状態</label><br>
-		<select id="condition" name="condition" required th:value="${bookInsert.condition}">
+		<select name="condition">
-			<option value="new">新品同様</option>
+		    <option value="0">不明</option>
-			<option value="good">良好</option>
+		    <option value="1">新品同様</option>
-			<option value="use">使用感あり</option>
+		    <option value="2">良好</option>
-			<option value="pain">傷みあり</option>
+		    <option value="3">使用感あり</option>
-			</select>
+		    <option value="4">傷みあり</option>
+		</select>
 		<br><br>		
 	   
 		<label for="donor">寄贈者社員ID</label><br>
 		<input type="text" id="donor" name="donor" th:value="${bookInsert.donor}">
 		<br><br>
 		
-		<label for="discription">備考</label><br>
+		<!--
-		<input type="text" id="discription" name="discription" th:value="${bookInsert.discription}">
+		<label for="description">備考</label><br>
+		<input type="text" id="description" name="description" th:value="${bookInsert.description}">
 		<br><br>
-</label>
+</label>-->
 
 
 	<input type="submit" value="確認画面へ" class="btn">
+</form>
 
 
 </body>

src/main/resources/templates/bookInsertConfirm.html

@@ -13,17 +13,18 @@
 		<!-- もどる: 入力中の値を持って入力画面へ -->
 		<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.category}">
+			<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="discription" th:value="${bookInsert.discription}">
+			<input type="hidden" name="description" th:value="${bookInsert.description}">
 		    <button type="submit">もどる</button>
 		</form>
 	</form>