不具合の修正

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

@@ -1,52 +1,30 @@
 package com.example.demo.controller;
 
-import java.time.LocalDate;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import com.example.demo.service.BookLendService;
-import com.example.demo.service.BookServiceImpl;
-
-import lombok.RequiredArgsConstructor;
+import com.example.demo.entity.Employee;
+import com.example.demo.repository.EmployeeRepository;
 
 @Controller
-@RequiredArgsConstructor
 public class BookLendController {
 
 	@Autowired
-	private final BookServiceImpl bookServiceImpl;
-	
-	@Autowired
-	private final BookLendService bookLendService;
+	private EmployeeRepository employeeRepository;
 
 	@PostMapping("/bookLend")
 	public String bookLend(Model model) {
 		return "bookLend";
 	}
 	
-	@PostMapping("/bookLend/{id}")
-	public String bookLend(@PathVariable int id, Model model) {
-		model.addAttribute("book", bookServiceImpl.findById(id));
+	// 社員IDを取得してプルダウンに表示させる
+	@PostMapping("/bookLend/employeeId")
+	public String selectEmployeeId(Employee employee, Model model) {
+		model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId()));
+		model.addAttribute("bookLend", employee);
 		return "bookLend";
 	}
 
-	// 貸出処理
-	@PostMapping("/bookLend/confirm")
-	public String bookLendConfirm(
-			@RequestParam(name = "bookId") int bookId,
-			@RequestParam(name = "bookManageId") String bookManageId,
-			@RequestParam(name = "employeeId") int employeeId,
-			@RequestParam(name = "returnDate") LocalDate bookReturnDate,
-			Model model) {
-
-		bookLendService.save(bookId,bookManageId,employeeId,bookReturnDate);
-		
-		return "redirect:/book";
-	}
-
 }

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

@@ -1,8 +1,11 @@
 package com.example.demo.controller;
 
+import java.util.List;
+
 import jakarta.servlet.http.HttpSession;
 import jakarta.validation.Valid;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -11,7 +14,9 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.entity.AccountEntity;
+import com.example.demo.entity.Employee;
 import com.example.demo.form.LoginForm;
+import com.example.demo.repository.EmployeeRepository;
 import com.example.demo.service.LoginService;
 
 import lombok.RequiredArgsConstructor;
@@ -21,12 +26,20 @@ import lombok.RequiredArgsConstructor;
 public class LoginController {
 
 	private final LoginService loginService;
+	@Autowired
+	private EmployeeRepository employeeRepository;
+
 
 	// Boot起動直後にログイン画面に移動する用のメソッド
 	@GetMapping("/")
-	public String index(HttpSession session) {
+	public String index(Model model,HttpSession session) {
 		if (session.getAttribute("loginEmployee") != null) {
-			return "redirect:/topmenu";
+			if(session.getAttribute("EmployeeId") != null) {
+				
+				List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+				model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+			}
+				return "topmenu";
 		}
 		return "redirect:/login";
 	}
@@ -34,7 +47,12 @@ public class LoginController {
 	@GetMapping("/login")
 	public String loginForm(Model model, HttpSession session) {
 		if (session.getAttribute("loginEmployee") != null) {
-			return "redirect:/topmenu";
+			if(session.getAttribute("EmployeeId") != null) {
+				
+				List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+				model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+			}
+			return "topmenu";
 		}
 
 		model.addAttribute("loginForm", new LoginForm());
@@ -56,12 +74,18 @@ public class LoginController {
 		AccountEntity accountEntity = loginService.login(loginForm);
 		if (accountEntity == null) {
 			model.addAttribute("loginError",
-					"ログインIDまたはパスワードが正しくありません");
+					"社員IDまたはパスワードが正しくありません");
 			return "login";
 		}
 
 		session.setAttribute("loginEmployee", accountEntity);
-		return "redirect:/topmenu";
+		
+		List<Employee> emrp = employeeRepository.findByEmployeeId(accountEntity.getEmployee().getEmployeeId());
+		model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+		session.setAttribute("EmployeeId", accountEntity.getEmployee().getEmployeeId());
+		
+
+		return "topmenu";
 	}
 	
 	// ログアウト処理
@@ -73,7 +97,13 @@ public class LoginController {
 
 	// 各画面からトップメニューへの遷移用
 	@GetMapping("/topmenu")
-	public String showTopMenu() {
+	public String showTopMenu(Model model,HttpSession session) {
+		
+		if(session.getAttribute("EmployeeId") != null) {
+			
+			List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+			model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+		}
 		return "topmenu";
 	}
 }

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

@@ -1,6 +1,6 @@
 package com.example.demo.entity;
 
-import java.time.LocalDate;
+import java.sql.Date;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -35,11 +35,11 @@ public class BookLend {
 
 	// 貸出日
 	@Column(name = "book_lend_date", nullable = false)
-	private LocalDate bookLendDate;
+	private Date bookLendDate;
 
 	// 返却日
 	@Column(name = "book_return_date", nullable = false)
-	private LocalDate bookReturnDate;
+	private Date bookReturnDate;
 
 	// 貸出状態
 	@Column(name = "book_status", nullable = false)

src/main/java/com/example/demo/form/BookLendForm.java

@@ -1,27 +1,7 @@
 package com.example.demo.form;
 
-import java.sql.Date;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-
-import com.example.demo.entity.Book;
-import com.example.demo.entity.Employee;
-
 // 図書の貸出処理に使用予定
 
 public class BookLendForm {
 
-	private Book book;
-
-	@NotBlank(message = "社員IDの入力は必須です")
-	private Employee employeeBooklend;
-	
-	private Date bookLendDate;
-
-	@NotNull(message = "返却日の入力は必須です")
-	private Date bookReturnDate;
-	
-	private Integer bookStatus;
-
 }

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

@@ -1,7 +1,5 @@
 package com.example.demo.repository;
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,6 +8,4 @@ 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/BookLendService.java

@@ -1,17 +1,12 @@
 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.Book;
 import com.example.demo.entity.BookLend;
-import com.example.demo.entity.Employee;
 import com.example.demo.repository.BookLendRepository;
-import com.example.demo.repository.BookRepository;
-import com.example.demo.repository.EmployeeRepository;
 
 @Service
 public class BookLendService {
@@ -19,37 +14,8 @@ public class BookLendService {
 	@Autowired
 	private BookLendRepository bookLendRepository;
 
-	@Autowired
-	private BookRepository bookRepository;
-	
-	@Autowired
-	private EmployeeRepository employeeRepository;
-
 	public List<BookLend> findAll() {
 		return bookLendRepository.findAll();
 	}
 
-	public void save(int bookId, String bookManageId, int employeeId,
-			LocalDate bookReturnDate) {
-
-		BookLend bookLend = new BookLend();
-		
-		
-		Book book = bookRepository.findById(bookId)
-		        .orElseThrow(
-		                () -> new IllegalArgumentException("対象の本が見つかりません"));
-		
-		Employee employee = employeeRepository.findById(employeeId)
-		        .orElseThrow(
-		                () -> new IllegalArgumentException("対象のが見つかりません"));
-
-		bookLend.setBook(book);
-		bookLend.setEmployeeBooklend(employee);
-		bookLend.setBookLendDate(LocalDate.now());
-		bookLend.setBookReturnDate(bookReturnDate);
-		bookLend.setBookStatus(1);
-
-		bookLendRepository.save(bookLend);
-	}
-
 }

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

@@ -1,20 +1,14 @@
 package com.example.demo.service;
 
 import java.util.List;
-import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.web.server.ResponseStatusException;
 
 import com.example.demo.entity.Book;
 import com.example.demo.repository.BookRepository;
 
-import lombok.RequiredArgsConstructor;
-
 @Service
-@RequiredArgsConstructor
 public class BookServiceImpl {
 
 	@Autowired
@@ -28,14 +22,4 @@ public class BookServiceImpl {
 		return bookRepository.searchBooks(keyword);
 	}
 
-	public Book findById(int bookId) {
-		Optional<Book> book = bookRepository.findById(bookId);
-		if (book.isEmpty()) {
-			throw new ResponseStatusException(
-					HttpStatus.NOT_FOUND, "図書情報が見つかりません");
-		}
-
-		return book.get();
-	}
-
 }

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

@@ -1,24 +0,0 @@
-package com.example.demo.service;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.example.demo.entity.Employee;
-import com.example.demo.repository.EmployeeRepository;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class EmployeeService {
-
-	@Autowired
-	private EmployeeRepository employeeRepository;
-	
-	public List<Employee> findAll() {
-		return employeeRepository.findAll();
-	}
-	
-}

src/main/resources/templates/book.html

@@ -80,7 +80,6 @@
 				<tbody>
 					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
 
-						<td th:hidden="*{book.bookId}"></td>
 						<td th:text="*{book.bookManageId}"></td>
 						<td th:text="*{book.isbn}"></td>
 						<td th:text="*{book.title}"></td>
@@ -107,8 +106,8 @@
 						
 						<td th:if="${session.loginEmployee.adminFlag == 1}">
 							
-							<form method="post" th:action="@{/bookLend/{id}(id=${book.bookId})}">
-								<input type="hidden" name="id" th:value="*{book.bookId}">
+							<form method="post" action="/bookLend">
+								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit"
 									th:disabled="*{book.bookLends != null && book.bookLends.bookStatus == 1}">
 									貸出

src/main/resources/templates/bookLend.html

@@ -13,38 +13,54 @@
 	</h1>
 
 	<p>
-		以下の図書を貸出します。貸出先の社員IDと返却予定日を入力してください。
+		以下の図書を貸出します。貸出先と貸出日・返却予定日を入力してください。
 	</p>
 
 	<h2>
 		図書情報
 	</h2>
 
-	<form th:action="@{/bookLend/confirm}" method="POST"
-			id="lendForm">
-
 	<div class="card-body">
 		<table class="info-table">
-				<thead>
 			<tr>
-						<th>図書管理ID</th>
-						<th>図書タイトル</th>
-						<th>著者名</th>
-						<th>ISBN</th>
-					</tr>
-				</thead>
+				<th>
+					図書管理ID
+				</th>
 
-				<tbody>
-					<tr>
-<!--						<td th:hidden="*{book.bookId}"></td>-->
-						<td th:text="*{book.bookManageId}"></td>
-						<td th:text="*{book.title}"></td>
-						<td th:text="*{book.author}"></td>
-						<td th:text="*{book.isbn}"></td>
+				<td>
+					（図書管理IDをここに表示させる）
+				</td>
 			</tr>
 
-				</tbody>
+			<tr>
+				<th>
+					図書タイトル
+				</th>
 
+				<td>
+					（タイトルをここに表示させる）
+				</td>
+			</tr>
+
+			<tr>
+				<th>
+					著者名
+				</th>
+
+				<td>
+					（著者名をここに表示させる）
+				</td>
+			</tr>
+
+			<tr>
+				<th>
+					ISBN
+				</th>
+
+				<td>
+					（ISBNをここに表示させる）
+				</td>
+			</tr>
 		</table>
 	</div>
 
@@ -60,11 +76,34 @@
 				社員ID
 			</label>
 
-				<input type="text" name="employeeId" placeholder="社員IDを入力してください">
+<!--			<select th:field="*{employeeId}" onchange="this.form.action='/bookLend/employeeId';this.form.submit();">-->
+
+			<select name="employeeId" id="employeeSelect">
+				
+				<option value="">
+					社員IDを選択してください
+				</option>
+
+<!--				<option th:each="employee : ${employeeList}" th:value="${employee.employeeId}">-->
+<!--				</option>-->
+
+				<option value="1">1</option>
+				<option value="2">2</option>
+				<option value="3">3</option>
+				<option value="4">4</option>
 				
 			</select>
 		</div>
 
+		<div class="form-row">
+			<label for="employeeName">
+				社員名
+			</label>
+
+			<input type="text" id="employeeName" value="" placeholder="社員名が表示されます" readonly>
+
+		</div>
+
 	</div>
 
 	<h2>
@@ -76,19 +115,35 @@
 		<div class="date-box">
 
 			<label>
-					貸出日（現在の日付が自動で設定されます。)
+				貸出日(自動取得)
 			</label>
 
-				<p th:text="${#calendars.format(#calendars.createNowForTimeZone('Asia/Tokyo'), 
-							'yyyy年MM月dd日')}">
-				</p>
+			<input type="date" id="loanDate" name="loanDate" value="">
+
+			<div class="note">
+				※ 現在の日付が自動で設定されます。
+			</div>
 
 		</div>
 
 		<div class="date-box">
 
 			<label>
-					返却予定日（必ず指定してください。）
+				貸出期間日数
+			</label>
+
+			<input type="text" id="loanDays" placeholder="日数を入力してください">
+
+			<div class="note">
+				※ 数値（1以上）で入力してください。
+			</div>
+
+		</div>
+
+		<div class="date-box">
+
+			<label>
+				返却予定日（必須）
 			</label>
 
 			<input type="date" id="returnDate" name="returnDate">
@@ -105,20 +160,34 @@
 
 	</div>
 
-		<h3>
+	<div class="warning-area">
+
+		<strong>
 			注意事項
-		</h3>
+		</strong>
 
-		<p>
+		<ul>
+			<li>
 				貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。
-		</p>
+			</li>
 
-		<input type="hidden" name="bookManageId" th:value="${book.bookManageId}">
-		<input type="hidden" name="bookId" th:value="${book.bookId}">
+			<li>
+				返却予定日を必ず指定してください。
+			</li>
+		</ul>
 
-		<input type="submit" name="submit" onclick="submitLend()" value="貸出する">
+	</div>
 
-		<input type="reset" name="reset" value="入力内容をクリア">
+	<form id="lendForm" action="bookLendConfirmation" method="post">
+		<div class="button-area">
+
+			<div class="right-buttons">
+				<button type="button" class="btn btn-primary" onclick="submitLend()">
+					貸出する
+				</button>
+			</div>
+
+		</div>
 
 	</form>
 
@@ -132,19 +201,6 @@
 			}
 		}
 
-		// カレンダーを当日以前の日付を入力できないようにする
-		const today = new Date();
-		function dateFormat(today, format) {
-			format = format.replace("YYYY", today.getFullYear());
-			format = format.replace("MM", ("0" + (today.getMonth() + 1)).slice(-2));
-			format = format.replace("DD", ("0" + today.getDate()).slice(-2));
-			return format;
-		}
-
-		const data = dateFormat(today, 'YYYY-MM-DD');
-		const field = document.getElementById('returnDate');
-		field.setAttribute("min", data);
-
 	</script>
 
 </body>

src/main/resources/templates/login.html

@@ -4,6 +4,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>ログイン</title>
+
 </head>
 
 <body>
@@ -16,7 +17,7 @@
 	<form th:action="@{/login}" th:object="${loginForm}" method="post">
 		<div class="form-group">
 			<label for="employeeId">社員ID</label>
-			<input id="employeeId" type="text" th:field="*{employeeId}">
+			<input id="employeeId" type="text" th:field="*{employeeId}"pattern="^[0-9]+$"title="数値以外は入力しないでください">
 			<p class="field-error" th:errors="*{employeeId}"></p>
 		</div>
 

src/main/resources/templates/topmenu.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 	
 <head>
 	<meta charset="UTF-8">
@@ -17,7 +17,7 @@
 		<div class="header-right">
 
 			<span class="user">
-				テストユーザー（一般）
+				<h1 th:text="${LoginName}"></h1>
 			</span>
 
 			<a class="button-link" th:href="@{/logout}">
@@ -61,6 +61,7 @@
 	<hr>
 
 	<!-- ===== 管理者のみ ===== -->
+	<th th:if="${session.loginEmployee.adminFlag == 1}">		
 
 		<a class="card" href="/bookInsert">
 
@@ -71,6 +72,7 @@
 		</p>
 	</a>
 	
+
 	<hr>
 
 
@@ -95,6 +97,7 @@
 	</a>
 
 	<hr>
+	</th>
 
 	<a class="card" href="/passwordChange">
 		<h3>パスワード変更</h3>
@@ -104,6 +107,11 @@
 		</p>
 	</a>
 	
+
 </body>
 
+<script>
+  var admin =getElementByID
+</script>
+
 </html>