不具合の修正

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

@@ -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.BookInsertRepository;
 import com.example.demo.repository.StorageLocationRepository;
 import com.example.demo.repository.SubCategoryRepository;
 import com.example.demo.service.BookInsertService;
@@ -29,8 +30,13 @@ private SubCategoryRepository subCategoryRepository;
 @Autowired 
 private StorageLocationRepository storageLocationRepository;
 
+@Autowired
+private BookInsertRepository bookInsertRepository;
+
 	    @GetMapping("/bookInsert")
 	    public String bookInsert(Model model) {
+	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+	    	model.addAttribute("bookInsert",new BookInsert());
 	    	model.addAttribute("categoryList",categoryRepository.findAll());
 	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
 		model.addAttribute("locationList",storageLocationRepository.findAll());
@@ -44,6 +50,7 @@ private StorageLocationRepository storageLocationRepository;
 	    @PostMapping("/bookInsertConfirm")
 	    public String bookInsertConfirm(@Validated BookInsert bookInsert,BindingResult result,Model model) {
 	    	if(result.hasErrors()) {
+	    		model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
 	    		model.addAttribute("categoryList",categoryRepository.findAll());
 	    		if(bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
 	    			model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
@@ -56,7 +63,6 @@ private StorageLocationRepository storageLocationRepository;
 	    		return "bookInsert";
 	    		
 	    	}
-	    	System.out.println(bookInsert);
 	    	bookInsertService.save(bookInsert);
 	    	model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsertConfirm";
@@ -65,8 +71,9 @@ private StorageLocationRepository storageLocationRepository;
 	    //確認画面から「もどる」ボタンを押したら入力画面に戻る
 	    @PostMapping("/bookInsert")
 	    public String bookInsertBack(BookInsert bookInsert,Model model) {
+	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
 	    	model.addAttribute("categoryList",categoryRepository.findAll());
-	    	if(bookInsert.getBookCategoryId() != null) {
+	    	if(bookInsert.getBookCategoryId() !=null) {
 	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
 	    			} else{
 	    				model.addAttribute("subCategoryList",subCategoryRepository.findAll());
@@ -79,6 +86,7 @@ private StorageLocationRepository storageLocationRepository;
 	    @PostMapping("/bookInsert/category")
 	    public String changeCategory(BookInsert bookInsert,Model model) {
 	    	    //カテゴリプルダウンに表示するデータを取得
+	    		model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
 	    		model.addAttribute("categoryList",categoryRepository.findAll());
 	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
 	        model.addAttribute("locationList",storageLocationRepository.findAll());
@@ -87,10 +95,9 @@ private StorageLocationRepository storageLocationRepository;
 	        return "bookInsert";
 	    }
 	    
+}
 	    
 
-	    }
-
 
 	//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
 	//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));

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/BookInsert.java

@@ -28,8 +28,7 @@ public class BookInsert {
     @Column(name = "title")
     private String title;
     
-    @Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",
-    		message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
+    @Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
     @Column(name = "isbn")
     private String isbn;
     
@@ -69,7 +68,7 @@ public class BookInsert {
     @Column(name = "book_approval")
     private Integer bookApproval;
   
-    @Transient //DB保存無効
+    @Transient 
     private Integer bookCategoryId;
     
     

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

@@ -3,9 +3,13 @@ package com.example.demo.repository;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
 import com.example.demo.entity.BookInsert;
 
+@Repository
 public interface BookInsertRepository extends JpaRepository<BookInsert,Integer> {
 
-}
+	BookInsert findFirstByOrderByBookIdDesc();//bookIDが一番大きいデータを取得
+
+	}

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

@@ -8,4 +8,5 @@ public interface BookInsertService {
 	String regist(BookInsert book);
 	List<BookInsert> findAll();
 	void save(BookInsert bookInsert);
-}
+	String createBookManageId(); 
+	}

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

@@ -12,8 +12,16 @@ import com.example.demo.repository.BookInsertRepository;
 	@Service
 	public class BookInsertServiceImpl implements BookInsertService {
 	
-	    @Autowired
-	    private BookInsertRepository bookInsertRepository;
+	@Autowired
+	private BookInsertRepository bookInsertRepository;
+	
+	@Override
+	public String createBookManageId() { //次に表示する図書管理IDを作る
+	    		BookInsert book =bookInsertRepository.findFirstByOrderByBookIdDesc();
+	    			if(book ==null){
+	                return "BK-1";}
+	    			return "BK-"+(book.getBookId()+1); //いまのIDの次のIDを返す
+	    }
 	    
 	    @Override
 	    public String regist(BookInsert book) {
@@ -33,15 +41,14 @@ import com.example.demo.repository.BookInsertRepository;
 	    	bookInsert.setIsDeleted(0);//削除フラグ設定
 	    	bookInsert.setBookApproval(0);//承認フラグ(承認されていないため0)
 	    	bookInsertRepository.save(bookInsert);
-	    	//BK〇〇〇〇形式で管理IDを作る
-	    	String manageId="BK-" + bookInsert.getBookId();//BookId取得→BK形式に変換
+	    	//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

@@ -17,12 +17,10 @@
  
 		
 		<label for="bookmanageId">図書管理ID</label><br>
-				<input type="text"
-				       id="bookManageId"
-				       placeholder="登録時に自動採番されます" readonly>
-					   <div style="font-size:12px; color:rgb(128, 128, 128);">
-					   	※例：BK-1、BK-2...
-					   	</div>
+				<input type="text" id="bookManageId" th:value="${nextBookManageId}" readonly>
+				<div style="font-size:12px; color:rgb(128, 128, 128);">
+				※例：BK-1、BK-2...
+				</div>
 				<br>
 
 	<label for="title">タイトル<span style="color:red;">※</span></label><br>
@@ -109,11 +107,9 @@
 		<br><br>
 </label>-->
 
+<input type="submit" value="登録" onclick="return confirm('この内容で登録しますか？');">
 
-	<input type="submit" value="登録" class="btn">
 </form>
-
-
 </body>
 
 </html>

src/main/resources/templates/bookInsertConfirm.html

@@ -10,30 +10,6 @@
 	<h1>登録内容確認</h1>
 
 
-		<!-- もどる: 入力中の値を持って入力画面へ -->
-		<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="bookCategoryId" 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">
-		<input type="submit" value="完了" class="btn">
-	</form>
-	<div id="registerModal" class="modal-overlay">
-
 		<div class="modal">
 
 			<div class="modal-message">

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,16 +61,18 @@
 	<hr>
 
 	<!-- ===== 管理者のみ ===== -->
+	<th th:if="${session.loginEmployee.adminFlag == 1}">		
 
-	<a class="card" href="/bookInsert">
+		<a class="card" href="/bookInsert">
 
-		<h3>新規図書登録</h3>
+			<h3>新規図書登録</h3>
 
 		<p>
 			図書の登録申請を<br> 行います。
 		</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>