[add]プルダウンを追加しました

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

@@ -1,14 +1,6 @@
 package com.example.demo.controller;
 
-import org.springframework.stereotype.Controller;
+//@Controller
-import org.springframework.web.bind.annotation.GetMapping;
+
 
-@Controller
-public class BookInsertConfirmController {
-	@GetMapping("/bookInsertConfirm")
-	public String bookInsertConfirm() {
-		return "bookInsertConfirm";
-		
-	}
 
-}

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

@@ -1,13 +1,85 @@
 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.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.StorageLocationRepository;
+import com.example.demo.repository.SubCategoryRepository;
+import com.example.demo.service.BookInsertService;
 
 @Controller
 public class BookInsertController {
-	@GetMapping("bookInsert")
+	
-		public String bookInsert() {
+@Autowired
-			return "bookInsert";
+private BookInsertService bookInsertService;
-		
+
-	}
+@Autowired
-}
+private BookCategoryRepository categoryRepository;
+
+@Autowired
+private SubCategoryRepository subCategoryRepository;
+
+@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";
+	    }
+	    
+	    // 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
+	    
+	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
+	    @PostMapping("/bookInsertConfirm")
+	    public String bookInsertConfirm(BookInsert bookInsert,Model model) {
+	    	System.out.println(bookInsert);
+	    	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("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",取得結果)
+	    
+	  
+	   
+	 

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

@@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 @Controller
 public class BookLendController {
 		@PostMapping("/bookLend")
-		public String bookLend() {
+		public String welcome() {
 			return "bookLend";
 		}
 	

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

@@ -1,36 +1,13 @@
 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.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.demo.service.BookLendService;
-
 
 @Controller
 public class LendListController {
-	
-	@Autowired
-	private BookLendService lendlistService;
-	
 	@GetMapping("/lendList")
-	public String list(Model model) {
+	public String lendList() {
-		
- 		// findAllを使って、DBから一覧を取得　でバックで取得したのを確認
-		model.addAttribute("list",lendlistService.findAll());
-		
 		return "lendList";
 		
 	}
-	
-	@GetMapping("/return-book")
-	public String retun(@RequestParam(name="lendId") int returnBook){
-		
-		lendlistService.regist(returnBook);
-	
-	
-	return  "bookLendResult";
-}
 }

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

@@ -26,7 +26,7 @@ public class Book {
 	private int bookId;
 
 	// 図書管理ID（BK-1など）
-	@Column(name = "book_manage_id", nullable = true, unique = true)
+	@Column(name = "book_manage_id", nullable = true)
 	private String bookManageId;
 
 	// タイトル
@@ -78,7 +78,7 @@ public class Book {
 
 	// 寄贈者社員ID??
 	@ManyToOne
-	@JoinColumn(name = "donor_id", nullable = true)
+	@JoinColumn(name = "donor_id", nullable = false)
 	private Employee employee;
 
 	//備考

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

@@ -0,0 +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)  // 自動採番
+    @Column(name = "book_id")
+    private Integer bookId;
+    
+    @Column(name = "book_manage_id")
+    private String bookManageId;
+
+    @Column(name = "title")
+    private String title;
+    
+    @Column(name = "isbn")
+    private String isbn;
+    
+    @Column(name = "author")
+    private String author;
+    
+    @Column(name = "book_subcategory_id")
+    private Integer subcategory;
+    
+    @Column(name = "publisher")
+    private String publisher;
+    
+    @Column(name = "publication_date")
+    private LocalDate 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 //DB保存無効
+    private Integer bookCategoryId;
+    
+    
+    
+ 
+}

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

@@ -8,7 +8,6 @@ import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
@@ -29,9 +28,9 @@ public class BookLend {
 	@JoinColumn(name = "book_manage_id", referencedColumnName = "book_manage_id",nullable = false)
 	private Book book;
 
-	@ManyToOne
+	// 図書管理ID（BK-1など）
-	@JoinColumn(name = "employee_id", nullable = false)
+	@Column(name = "employee_id", nullable = false)
-	private Employee employeeBooklend;
+	private Integer employeeId;
 
 	// 貸出日
 	@Column(name = "book_lend_date", nullable = false)

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

@@ -34,7 +34,4 @@ public class Employee {
 	@OneToMany(mappedBy = "employee")
 	private List<Book> employees = new ArrayList<>();
 	
-	@OneToMany(mappedBy = "employeeBooklend")
-	private List<BookLend> employeesBooklend = new ArrayList<>();
-	
 }

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

@@ -0,0 +1,11 @@
+package com.example.demo.repository;
+
+
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.BookInsert;
+
+public interface BookInsertRepository extends JpaRepository<BookInsert,Integer> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.example.demo.repository;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-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/repository/StorageLocationRepository.java

@@ -0,0 +1,9 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.StorageLocation;
+
+public interface StorageLocationRepository extends JpaRepository<StorageLocation, Integer> {
+
+}

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

@@ -0,0 +1,12 @@
+package com.example.demo.repository;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.BookSubcategory;
+
+public interface SubCategoryRepository
+        extends JpaRepository<BookSubcategory,Integer> {
+	List<BookSubcategory> findByBookCategory_BookCategoryId(Integer bookCategoryId);
+
+}

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

@@ -0,0 +1,11 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+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

@@ -0,0 +1,47 @@
+	package com.example.demo.service;
+	
+	import java.time.LocalDate;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.BookInsert;
+import com.example.demo.repository.BookInsertRepository;
+	
+	@Service
+	public class BookInsertServiceImpl implements BookInsertService {
+	
+	    @Autowired
+	    private BookInsertRepository bookInsertRepository;
+	
+	    @Override
+	    public String regist(BookInsert book) {
+	        // DTO → エンティティへ詰め替えて保存
+	        bookInsertRepository.save(book);  // 保存
+	        return "登録が完了しました";
+	    }
+	
+	    @Override
+	    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/java/com/example/demo/service/BookLendService.java

@@ -1,34 +0,0 @@
-package com.example.demo.service;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.demo.entity.BookLend;
-import com.example.demo.repository.BookLendRepository;
-
-@Service
-public class BookLendService {
-
-	@Autowired
-	private BookLendRepository bookLendRepository;
-
-	public List<BookLend> findAll() {
-		return bookLendRepository.findBybookStatus(1);
-		
-		
-	}
-	
-	@Transactional
-	public void regist(Integer lendId) {
-	
-		BookLend booklend = bookLendRepository.findById(lendId).orElse(null);
-		
-		booklend.setBookStatus(0); 
-
-		bookLendRepository.save(booklend);
-	}
-
-}

src/main/resources/templates/bookInsert.html

@@ -8,8 +8,99 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	<form action="/bookInsertConfirm" method="GET">
+	       <br><br>
-	<input type="submit" value="確認画面へ" class="btn">
+	<h4>新しく図書を登録します。必要事項jを入力し、「登録」ボタンを押してください</h4>
+	<span style="color:red;">※は必須項目です</span>
+	<br><br>
+	<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
+ 
+		
+		<label for="bookmanageId">図書管理ID</label><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-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>
+		<br><br>
+		
+		<!--自動でサブかてを絞り込む。カテゴリをせんたくして、
+		このselectが入っているformの送信先を/bookInsert/categoryに変更、そのformを送信-->
+		<label for="category">カテゴリ</label><br>
+		<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">サブカテゴリ<span style="color:red;">※</span></label><br>
+		<select th:field="*{subcategory}">
+		    <option value="">選択してください</option>
+			<option th:each="sub:${subCategoryList}"
+				    th:value="${sub.bookSubcategoryId}"
+				    th:text="${sub.bookSubcategoryName}" required>
+				    </option>
+				</select>
+		<br><br>
+		
+		<label for="location">保管場所<span style="color:red;">※</span></label><br>
+		<select th:field="*{location}">
+		<option value="">選択してください</option>
+			<option th:each="location:${locationList}"
+		            th:value="${location.locationId}"
+		            th:text="${location.locationName}" required>
+		    </option>
+
+		</select>
+		<br><br>
+		
+		<label for="condition">図書状態<span style="color:red;">※</span></label><br>
+		<select name="condition" required>
+			<option value="">選択してください</option>
+		    <option value="1">新品同様</option>
+		    <option value="2">良好</option>
+		    <option value="3">使用感あり</option>
+		    <option value="4">傷みあり</option>
+		</select>
+		<br><br>		
+		
+		<label for="publisher">主パン者</label><br>
+				<input type="text" id="publisher" name="publisher" th:value="${bookInsert.publisher}">
+				<br><br>
+				
+				<label for="publicationDate">出版日</label><br>
+				<input type="date" id="publicationDate" name="publicationDate" th:value="${bookInsert.publicationDate}">
+				<br><br>
+	   
+		<label for="donor">寄贈者社員ID</label><br>
+		<input type="text" id="donor" name="donor" th:value="${bookInsert.donor}">
+		<br><br>
+		
+		<!--
+		<label for="description">備考</label><br>
+		<input type="text" id="description" name="description" th:value="${bookInsert.description}">
+		<br><br>
+</label>-->
+
+
+	<input type="submit" value="登録" class="btn">
+</form>
+
+
 </body>
 
 </html>

src/main/resources/templates/bookInsertConfirm.html

@@ -9,9 +9,24 @@
 <body>
 	<h1>登録内容確認</h1>
 
-	<!-- 戻る -->
+		
-	<form action="/bookInsert" method="GET">
+		<!-- もどる: 入力中の値を持って入力画面へ -->
-		<input type="submit" value="戻る" class="btn">
+		<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">
@@ -52,6 +67,7 @@
 					</button>
 
 				</form>
+				
 
 			</div>
 

src/main/resources/templates/bookLendResult.html

@@ -1,20 +0,0 @@
-<!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>
-	<h1>返却処理が完了しました。</h1>
-
-	<td>
-		<form th:action="@{/lendList}" method="get">
-			<button type="submit" th:value="貸出">貸出中図書一覧に戻る</button>
-	</td>
-	
-</body>
-
-</html>

src/main/resources/templates/lendList.html

@@ -1,62 +1,47 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html>
 
 <head>
 	<meta charset="UTF-8">
 	<title>貸出中図書一覧</title>
-	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
 	<h1>貸出中図書一覧</h1>
-
 	
-		<table>
+	<!-- action先要修正 -->
+	<form action="/lendList" method="GET">
+		<input type="submit" value="返却" class="btn">
+	</form>
 
-			<thead>
+	<!-- 以下ポップアップ -->
-				<tr>
+	<div id="registerModal" class="modal-overlay">
-					<th>社員ID</th>
-					<th>社員名</th>
-					<th>管理ID</th>
-					<th>タイトル</th>
-					<th>返却予定日</th>
 
-				</tr>
+		<div class="modal">
-			</thead>
+
+			<div class="modal-message">
+				返却処理が完了しました！
+			</div>
+
+			<div class="modal-buttons">
+
+				<!-- OK -->
+				<form method="get" action="/lendList">
+
+					<button type="submit" class="modal-btn">
+						OK
+					</button>
+
+				</form>
 
 
-			<tbody>
-				<tr th:each="booklist : ${list}">
 
-					<td th:text="*{booklist.employeeBooklend.employeeId}"></td>
+			</div>
-					<td th:text="*{booklist.employeeBooklend.employeeName}"></td>
-					<td th:text="*{booklist.book.bookManageId}"></td>
-					<td th:text="*{booklist.book.title}"></td>
-					<td th:text="*{booklist.bookReturnDate}"></td>
 
+		</div>
 
-					<td>
+	</div>
-						<form th:action="@{/return-book}" method="get">
-							<button type="submit" name="lendId" th:value="${booklist.lendId}"
-								onclick="return MoveCheck();">返却
-							</button>
-						</form>
-					</td>
 
-				</tr>
-				
-			</tbody>
-			
-		</table>
-
-
-		<script>
-
-			function MoveCheck() {
-				return window.confirm("返却処理を実行します。よろしいですか？");
-			}
-
-		</script>
 
 </body>