2026_09_5H_Spring_KIZAKI/ShareBooks_new
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya

Browse Source
This commit is contained in:
h-seya
2026-09-28 12:57:21 +09:00
parent d6134fab10 79fd664f86
commit fa1846dbd7
8 changed files with 109 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/example/demo/controller/BookInsertController.java
View File

@@ -10,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.StorageLocationRepository;
import com.example.demo.repository.SubCategoryRepository;
import com.example.demo.service.BookInsertService;
@@ -21,13 +22,18 @@ 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";
}
@@ -37,6 +43,7 @@ private SubCategoryRepository subCategoryRepository;
// 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
@PostMapping("/bookInsertConfirm")
public String bookInsertConfirm(BookInsert bookInsert,Model model) {
System.out.println(bookInsert);
bookInsertService.save(bookInsert);
model.addAttribute("bookInsert",bookInsert);
return "bookInsertConfirm";
@@ -46,6 +53,7 @@ private SubCategoryRepository subCategoryRepository;
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";
}
@@ -56,16 +64,21 @@ private SubCategoryRepository subCategoryRepository;
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())
//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
//「カテゴリIDが1のサブカテゴリを取ってくる」
//model.addAttribute("subCategoryList",取得結果)

7
src/main/java/com/example/demo/entity/AccountEntity.java
View File

@@ -5,6 +5,8 @@ import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.Getter;
@@ -28,8 +30,9 @@ public class AccountEntity {
@Column(name="login_info_id")
private Integer loginInfoId;
@Column(name="employee_id")
private Integer employeeId;
@ManyToOne
@JoinColumn(name = "employee_id")
private Employee employee;
@Column(name="password_hash")
private String passwordHash;

4
src/main/java/com/example/demo/entity/BookInsert.java
View File

@@ -40,7 +40,7 @@ public class BookInsert {
private String publisher;
@Column(name = "publication_date")
private String publicationDate;
private LocalDate publicationDate;
@Column(name = "location_id")
private Integer location;
@@ -66,7 +66,7 @@ public class BookInsert {
@Column(name = "book_approval")
private Integer bookApproval;
@Transient
@Transient //DB保存無効
private Integer bookCategoryId;

2
src/main/java/com/example/demo/repository/AccountRepository.java
View File

@@ -6,6 +6,6 @@ import com.example.demo.entity.AccountEntity;
public interface AccountRepository extends JpaRepository<AccountEntity,Integer>{
AccountEntity findByEmployeeId (Integer employeeId);
AccountEntity findByEmployee_EmployeeId (Integer employeeId);
}

9
src/main/java/com/example/demo/repository/StorageLocationRepository.java Normal file
View File

@@ -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> {
}

2
src/main/java/com/example/demo/service/LoginService.java
View File

@@ -16,7 +16,7 @@ public class LoginService {
public AccountEntity login(LoginForm form) {
AccountEntity accountEntity =
accountRepository.findByEmployeeId(form.getEmployeeId());
accountRepository.findByEmployee_EmployeeId(form.getEmployeeId());
if(accountEntity == null) {
return null;

51
src/main/resources/templates/book.html
View File

@@ -8,9 +8,33 @@
</head>
<body>
<div class="header-bar">
<div class="header-left">
ShareBooks
</div>
<div class="header-right">
<span class="user">
<span th:text="${session.loginEmployee.employee.employeeName}"></span>
(<span th:text="${session.loginEmployee.adminFlag == 1 ? '管理者' : '一般'}"></span>)
</span>
<a class="button-link" th:href="@{/logout}">
ログアウト
</a>
</div>
</div>
<div class="container">
<h1>社内図書一覧</h1>
<div class="float-end">
<a th:href="@{/topmenu}">トップメニューへ</a>
</div>
<form class="input-group" th:action="@{/searchBooks}" th:object="${bookSearchForm}" method="get">
@@ -22,19 +46,16 @@
</button>
</form>
<form method="post" th:action="@{/clearBookList}">
<button class="button button-secondary" type="submit">
クリア
</button>
</form>
<p>※「タイトル」「出版社」「著者名」で検索</p>
<form method="get" action="bookLend">
<table class="table table-striped">
<thead>
<tr>
@@ -52,7 +73,7 @@
<th>更新日時</th>
<th>寄贈者</th>
<th>貸出状態</th>
<th>操作</th>
<th th:if="${session.loginEmployee.adminFlag == 1}">操作</th>
</tr>
</thead>
@@ -81,7 +102,8 @@
<td
th:text="*{book.bookLends != null ? (book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}">
</td>
<td>
<td th:if="${session.loginEmployee.adminFlag == 1}">
<form method="post" action="/bookLend">
<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
<button type="submit"
@@ -91,26 +113,29 @@
</form>
<form method="post" action="/updateconfirm">
<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
<button type="submit">更新</button>
<button type="submit">
更新
</button>
</form>
<form method="get" action="/delete">
<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
<button type="submit">削除</button>
<button type="submit">
削除
</button>
</form>
</td>
</tr>
<tr th:if="${#lists.isEmpty(book)}">
<td colspan="15">
該当する図書がありません
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>

84
src/main/resources/templates/bookInsert.html
View File

@@ -8,17 +8,12 @@
<body>
<h1>新規図書登録入力</h1>
<br>
<br><br>
<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください</h4>
<span style="color:red;">※は必須項目です</span>
<br><br>
<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
<label for="bookId">図書ID</label><br>
<input type="text"
id="bookId"
placeholder="登録時に自動採番されます" readonly>
<br><br>
<label for="bookmanageId">図書管理ID</label><br>
<input type="text"
@@ -26,71 +21,70 @@
placeholder="登録時に自動採番されます" readonly>
<br><br>
<label for="title">タイトル</label><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</label><br>
<input type="text" id="isbn" name="isbn" placeholder="ISBNを入力" th:value="${bookInsert.isbn}" required>
<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">著者名</label><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}">
<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>
<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}">
th:text="${sub.bookSubcategoryName}" required>
</option>
</select>
<br><br>
<label for="publisher">主パン者</label><br>
<input type="text" id="publisher" name="publisher" th:value="${bookInsert.publisher}">
<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="publicationDate">出版日</label><br>
<input type="date" id="publicationDate" name="publicationDate" th:value="${bookInsert.publicationDate}">
<br><br>
<label for="location">保管場所</label><br>
<select name="location">
<option value="1">未確定</option>
<option value="2">開発エリア書棚</option>
<option value="3">会議室前ラック</option>
</select>
<br><br>
<label for="condition">図書状態</label><br>
<select name="condition">
<option value="0">不明</option>
<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}">
@@ -103,7 +97,7 @@
</label>-->
<input type="submit" value="確認画面へ" class="btn">
<input type="submit" value="登録" class="btn">
</form>