プルNG

book-rent/src/main/java/com/example/demo/controller/BookController.java

@@ -1,16 +1,15 @@
 package com.example.demo.controller;
 
 
-import java.util.List;
-import java.util.stream.IntStream;
 
-import org.springframework.data.domain.Page;
+
+	
+
 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.entity.BookCollection;
 import com.example.demo.service.BookService;
 
 
@@ -23,24 +22,13 @@ public class BookController {
         this.bookService = bookService;
     }
 
- 
     /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
     @GetMapping("/books")
     public String list(@RequestParam(defaultValue = "") String nmBook,
                        @RequestParam(defaultValue = "") String publisher,
                        @RequestParam(defaultValue = "") String note,
-                       @RequestParam(defaultValue = "0") int page,
-                       @RequestParam(defaultValue = "10") int size,
                        Model model) {
- 
+        model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
-    	 Page<BookCollection> bookPage =
-    			 bookService.searchLendable(nmBook, publisher, note, page, size);
-    	 List<Integer> pageNumbers =
-    			 IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
- 
-        model.addAttribute("books", bookPage);
-        model.addAttribute("bookPage", bookPage);
-        model.addAttribute("pageNumbers", pageNumbers);
         // 検索条件を保持
         model.addAttribute("nmBook", nmBook);
         model.addAttribute("publisher", publisher);
@@ -49,42 +37,3 @@ public class BookController {
     }
 
 }
-//package com.example.demo.controller;
-//
-//
-//
-//
-//	
-//
-//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.BookService;
-//
-//
-///** BOOK-01：書籍検索（bookList.html） */
-//@Controller
-//public class BookController {
-//    private final BookService bookService;
-//
-//    public BookController(BookService bookService) {
-//        this.bookService = bookService;
-//    }
-//
-//    /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
-//    @GetMapping("/books")
-//    public String list(@RequestParam(defaultValue = "") String nmBook,
-//                       @RequestParam(defaultValue = "") String publisher,
-//                       @RequestParam(defaultValue = "") String note,
-//                       Model model) {
-//        model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
-//        // 検索条件を保持
-//        model.addAttribute("nmBook", nmBook);
-//        model.addAttribute("publisher", publisher);
-//        model.addAttribute("note", note);
-//        return "bookList";
-//    }
-//
-//}

book-rent/src/main/java/com/example/demo/repository/BookCollectionRepository.java

@@ -1,9 +1,8 @@
 package com.example.demo.repository;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -23,12 +22,10 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
 			+ "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
 			+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
 			+ "order by b.idBook")
-	Page<BookCollection> search(
+	List<BookCollection> search(@Param("lending") String lending,
-	        @Param("lending") String lending,
+			@Param("nm") String nm,
-	        @Param("nm") String nm,
+			@Param("publisher") String publisher,
-	        @Param("publisher") String publisher,
+			@Param("note") String note);
-	        @Param("note") String note,
-	        Pageable pageable);
 
 	/**
 	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
@@ -40,42 +37,3 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
 	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
 			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
 }
-//package com.example.demo.repository;
-//
-//import java.time.LocalDateTime;
-//import java.util.List;
-//
-//import org.springframework.data.jpa.repository.JpaRepository;
-//import org.springframework.data.jpa.repository.Modifying;
-//import org.springframework.data.jpa.repository.Query;
-//import org.springframework.data.repository.query.Param;
-//
-//import com.example.demo.entity.BookCollection;
-//
-//public interface BookCollectionRepository extends JpaRepository<BookCollection, Integer> {
-//
-//	/**
-//	 * 貸出可の蔵書を部分一致(AND)で検索する。
-//	 * 空文字の条件は「指定なし」。LIKE の特殊文字は呼び出し側で '!' を使ってエスケープ済み。
-//	 */
-//	@Query("select b from BookCollection b "
-//			+ "where b.flgLending = :lending "
-//			+ "and (:nm = '' or b.nmBook like concat('%', :nm, '%') escape '!') "
-//			+ "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
-//			+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
-//			+ "order by b.idBook")
-//	List<BookCollection> search(@Param("lending") String lending,
-//			@Param("nm") String nm,
-//			@Param("publisher") String publisher,
-//			@Param("note") String note);
-//
-//	/**
-//	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
-//	 * 戻り値が0なら、既に他の操作で状態が変わっている（状態不整合）。
-//	 */
-//	@Modifying(clearAutomatically = true, flushAutomatically = true)
-//	@Query("update BookCollection b set b.flgLending = :to, b.idUpdate = :uid, b.dateUpdate = :now "
-//			+ "where b.idBook = :id and b.flgLending = :from")
-//	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
-//			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
-//}

book-rent/src/main/java/com/example/demo/service/BookService.java

@@ -1,7 +1,7 @@
 package com.example.demo.service;
 
-import org.springframework.data.domain.Page;
+import java.util.List;
-import org.springframework.data.domain.PageRequest;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,8 +20,8 @@ public class BookService {
 
     /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
     @Transactional(readOnly = true)
-    public Page<BookCollection> searchLendable(String nmBook, String publisher, String note,int page, int size) {
+    public List<BookCollection> searchLendable(String nmBook, String publisher, String note) {
-        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),PageRequest.of(page, size));
+        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note));
     }
 
     /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
@@ -29,39 +29,5 @@ public class BookService {
         if (s == null) return "";
         return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
     }
- 
- 
 }
-//package com.example.demo.service;
+
-//
-//import java.util.List;
-//
-//import org.springframework.stereotype.Service;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import com.example.demo.common.Const;
-//import com.example.demo.entity.BookCollection;
-//import com.example.demo.repository.BookCollectionRepository;
-//
-///** BOOK-01：書籍検索 */
-//@Service
-//public class BookService {
-//    private final BookCollectionRepository bookRepository;
-//
-//    public BookService(BookCollectionRepository bookRepository) {
-//        this.bookRepository = bookRepository;
-//    }
-//
-//    /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
-//    @Transactional(readOnly = true)
-//    public List<BookCollection> searchLendable(String nmBook, String publisher, String note) {
-//        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note));
-//    }
-//
-//    /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
-//    static String normalize(String s) {
-//        if (s == null) return "";
-//        return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
-//    }
-//}
-//

book-rent/src/main/resources/static/css/style.css

@@ -88,34 +88,3 @@ th
 {display:block;
 	margin:8px 0
 }
-
-/* Responsive (ဖုန်းစခရင်သေးများတွင် အောက်သို့ ဆင်းသွားစေရန်) */
-@media (max-width: 600px) {
-    .login-container-flex {
-        flex-direction: column;
-        align-items: center;
-        text-align: center;
-    }
-    .form-content-area {
-        width: 100%;
-    }
-    input[type=text], input[type=password], input[type=email] {
-        max-width: 100% !important;
-    }
-}
-/* ページネーション */
-.page-number {
-    display: inline-block;
-    background: #eaf4f6;
-    color: #176a78;
-    border: 1px solid #d4e3e6;
-    border-radius: 4px;
-    padding: 7px 12px;
-    margin: 2px;
-    text-decoration: none;
-    font-size: 14px;
-}
- 
-.page-number:hover {
-    background: #d5edf1;
-}

book-rent/src/main/resources/templates/bookList.html

@@ -29,8 +29,8 @@
 
 		<div class="card">
 			<h2>検索結果</h2>
-			<p th:if="${bookPage.isEmpty()}">該当する書籍はありません。</p>
+			<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>
-			<table th:unless="${bookPage.isEmpty()}">
+			<table th:unless="${#lists.isEmpty(books)}">
 				<thead>
 					<tr>
 						<th>蔵書ID</th>
@@ -60,88 +60,8 @@
 					</tr>
 				</tbody>
 			</table>
-			<a class="page-number"
-			   th:if="${bookPage.hasPrevious()}"
-			   th:href="@{/books(page=${bookPage.number-1}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}">前へ</a>
-			<span th:each="pageNum : ${pageNumbers}">
-			    <a class="page-number"
-				   th:href="@{/books(page=${pageNum}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}"
-			       th:text="${pageNum + 1}"></a>
-			</span>
-			<a class="page-number"
-			   th:if="${bookPage.hasNext()}"
-			   th:href="@{/books(page=${bookPage.number+1}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}">次へ</a>
-			
 		</div>
 	</main>
-	
 </body>
 
 </html>
-<!--<!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>-->
-<!--	<div th:replace="~{fragments/header :: header}"></div>-->
-<!--	<main>-->
-<!--		<h1>書籍一覧</h1>-->
-<!--		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>-->
-<!--		<div class="card">-->
-<!--			<form th:action="@{/books}" method="get">-->
-<!--				<label for="nmBook">書籍名</label>-->
-<!--				<input type="text" id="nmBook" name="nmBook" th:value="${nmBook}">-->
-<!--				<label for="publisher">出版社</label>-->
-<!--				<input type="text" id="publisher" name="publisher" th:value="${publisher}">-->
-<!--				<label for="note">特記事項</label>-->
-<!--				<input type="text" id="note" name="note" th:value="${note}">-->
-<!--				<p><button type="submit">検索</button>-->
-<!--					<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
-<!--					<a class="btn" th:if="${session.loginUser.admin}" th:href="@{/admin/books/new}">書籍新規登録</a>-->
-<!--				</p>-->
-<!--			</form>-->
-<!--		</div>-->
-
-<!--		<div class="card">-->
-<!--			<h2>検索結果</h2>-->
-<!--			<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>-->
-<!--			<table th:unless="${#lists.isEmpty(books)}">-->
-<!--				<thead>-->
-<!--					<tr>-->
-<!--						<th>蔵書ID</th>-->
-<!--						<th>ISBN</th>-->
-<!--						<th>書籍名</th>-->
-<!--						<th>書籍名よみ</th>-->
-<!--						<th>出版社</th>-->
-<!--						<th>特記事項</th>-->
-<!--						<th>操作</th>-->
-<!--					</tr>-->
-<!--				</thead>-->
-<!--				<tbody>-->
-<!--					<tr th:each="b : ${books}">-->
-<!--						<td th:text="${b.idBook}"></td>-->
-<!--						<td th:text="${b.isbn}"></td>-->
-<!--						<td th:text="${b.nmBook}"></td>-->
-<!--						<td th:text="${b.knBook}"></td>-->
-<!--						<td th:text="${b.publisher}"></td>-->
-<!--						<td th:text="${b.note}"></td>-->
-<!--						<td>-->
-<!--							 一般：貸出申請(LOAN-01) ／ 管理者：編集(BOOK-03) -->
-<!--							<a class="btn" th:unless="${session.loginUser.admin}"-->
-<!--								th:href="@{/loan/apply(idBook=${b.idBook})}">貸出申請</a>-->
-<!--							<a class="btn" th:if="${session.loginUser.admin}"-->
-<!--								th:href="@{/admin/books/edit(idBook=${b.idBook})}">編集</a>-->
-<!--						</td>-->
-<!--					</tr>-->
-<!--				</tbody>-->
-<!--			</table>-->
-<!--		</div>-->
-<!--	</main>-->
-<!--</body>-->
-
-<!--</html>-->