From 004ea0d5b9b85cbd56c314b62f3d44c5f92a7026 Mon Sep 17 00:00:00 2001
From: h-seya <2026_04_00278@it-college.co.jp>
Date: Thu, 24 Sep 2026 16:04:12 +0900
Subject: [PATCH] =?UTF-8?q?[ADD]:=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=83=BB=E3=83=AD=E3=82=B0=E3=82=A2=E3=82=A6=E3=83=88=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/LoginController.java      | 79 +++++++++++++++---
 .../{Account.java => AccountEntity.java}      |  6 +-
 .../java/com/example/demo/form/LoginForm.java | 17 ++++
 .../demo/repository/AccountRepository.java    | 11 +++
 .../example/demo/service/LoginService.java    | 31 +++++++
 src/main/resources/templates/login.html       | 42 +++++-----
 src/main/resources/templates/topmenu.html     | 81 ++++++++++++-------
 7 files changed, 206 insertions(+), 61 deletions(-)
 rename src/main/java/com/example/demo/entity/{Account.java => AccountEntity.java} (89%)
 create mode 100644 src/main/java/com/example/demo/form/LoginForm.java
 create mode 100644 src/main/java/com/example/demo/repository/AccountRepository.java
 create mode 100644 src/main/java/com/example/demo/service/LoginService.java

diff --git a/src/main/java/com/example/demo/controller/LoginController.java b/src/main/java/com/example/demo/controller/LoginController.java
index 7961482..4e469fc 100644
--- a/src/main/java/com/example/demo/controller/LoginController.java
+++ b/src/main/java/com/example/demo/controller/LoginController.java
@@ -1,24 +1,79 @@
 package com.example.demo.controller;
 
+import jakarta.servlet.http.HttpSession;
+import jakarta.validation.Valid;
+
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import com.example.demo.entity.AccountEntity;
+import com.example.demo.form.LoginForm;
+import com.example.demo.service.LoginService;
+
+import lombok.RequiredArgsConstructor;
+
 @Controller
+@RequiredArgsConstructor
 public class LoginController {
 
-    @GetMapping("/login")
-    public String showLogin() {
-        return "login";
-    }
+	private final LoginService loginService;
 
-    @PostMapping("/doLogin")
-    public String doLogin() {
-        return "redirect:/topmenu";
-    }
+	// Boot起動直後にログイン画面に移動する用のメソッド
+	@GetMapping("/")
+	public String index(HttpSession session) {
+		if (session.getAttribute("loginEmployee") != null) {
+			return "redirect:/topmenu";
+		}
+		return "redirect:/login";
+	}
 
-    @GetMapping("/topmenu")
-    public String showTopMenu() {
-        return "topmenu";
-    }
+	@GetMapping("/login")
+	public String loginForm(Model model, HttpSession session) {
+		if (session.getAttribute("loginEmployee") != null) {
+			return "redirect:/topmenu";
+		}
+
+		model.addAttribute("loginForm", new LoginForm());
+		return "login";
+	}
+
+	// 実際のログイン処理
+	@PostMapping("/login")
+	public String doLogin(
+			@Valid @ModelAttribute LoginForm loginForm,
+			BindingResult bindingResult,
+			Model model,
+			HttpSession session) {
+
+		if (bindingResult.hasErrors()) {
+			return "login";
+		}
+
+		AccountEntity accountEntity = loginService.login(loginForm);
+		if (accountEntity == null) {
+			model.addAttribute("loginError",
+					"ログインIDまたはパスワードが正しくありません");
+			return "login";
+		}
+
+		session.setAttribute("loginEmployee", accountEntity);
+		return "redirect:/topmenu";
+	}
+	
+	// ログアウト処理
+	@GetMapping("/logout")
+	public String logout(HttpSession session) {
+		session.invalidate();
+		return "redirect:/login";
+	}
+
+	// 各画面からトップメニューへの遷移用
+	@GetMapping("/topmenu")
+	public String showTopMenu() {
+		return "topmenu";
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/entity/Account.java b/src/main/java/com/example/demo/entity/AccountEntity.java
similarity index 89%
rename from src/main/java/com/example/demo/entity/Account.java
rename to src/main/java/com/example/demo/entity/AccountEntity.java
index 6379036..fc90022 100644
--- a/src/main/java/com/example/demo/entity/Account.java
+++ b/src/main/java/com/example/demo/entity/AccountEntity.java
@@ -21,15 +21,15 @@ import lombok.Setter;
 @Getter
 @Setter
 @NoArgsConstructor
-public class Account {
+public class AccountEntity {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name="login_info_id")
-	private int loginInfoId;
+	private Integer loginInfoId;
 	
 	@Column(name="employee_id")
-	private int employeeId;
+	private Integer employeeId;
 	
 	@Column(name="password_hash")
 	private String passwordHash;
diff --git a/src/main/java/com/example/demo/form/LoginForm.java b/src/main/java/com/example/demo/form/LoginForm.java
new file mode 100644
index 0000000..2a5a7ab
--- /dev/null
+++ b/src/main/java/com/example/demo/form/LoginForm.java
@@ -0,0 +1,17 @@
+package com.example.demo.form;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
+@Data
+public class LoginForm {
+
+	@NotNull(message = "社員IDを入力してください")
+	private Integer employeeId;
+
+	@NotBlank(message = "パスワードを入力してください")
+	private String passwordHash;
+
+}
diff --git a/src/main/java/com/example/demo/repository/AccountRepository.java b/src/main/java/com/example/demo/repository/AccountRepository.java
new file mode 100644
index 0000000..db7d155
--- /dev/null
+++ b/src/main/java/com/example/demo/repository/AccountRepository.java
@@ -0,0 +1,11 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.AccountEntity;
+
+public interface AccountRepository extends JpaRepository<AccountEntity,Integer>{
+	
+	AccountEntity findByEmployeeId (Integer employeeId);
+
+}
diff --git a/src/main/java/com/example/demo/service/LoginService.java b/src/main/java/com/example/demo/service/LoginService.java
new file mode 100644
index 0000000..c87eead
--- /dev/null
+++ b/src/main/java/com/example/demo/service/LoginService.java
@@ -0,0 +1,31 @@
+package com.example.demo.service;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.AccountEntity;
+import com.example.demo.form.LoginForm;
+import com.example.demo.repository.AccountRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class LoginService {
+	
+	private final AccountRepository accountRepository;
+	
+	public AccountEntity login(LoginForm form) {
+		AccountEntity accountEntity = 
+				accountRepository.findByEmployeeId(form.getEmployeeId());
+		
+		if(accountEntity == null) {
+			return null;
+		}
+		
+		if(!accountEntity.getPasswordHash().equals(form.getPasswordHash()))
+			return null;
+		
+		return accountEntity;
+	}
+
+}
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 06b4373..70f5aac 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -1,29 +1,35 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
+
 <head>
-<meta charset="UTF-8">
-<title>ログイン</title>
+	<meta charset="UTF-8">
+	<title>ログイン</title>
 </head>
+
 <body>
-	
+
 	<h1>ログイン</h1>
-	<form action="doLogin"
-	      method="post"
-	      th:object="${loginInfoForm}">
 
-	    <div class="msgBox error" th:if="${messageError} != null">
-	        <span class="error" th:text="${messageError.message}"></span>
-	    </div>
+	<p class="message message-error" th:if="${loginError}" th:text="${loginError}">
+	</p>
 
-	    <table>
-	            <tr>
-	            <td class="btnArea" colspan="2">
-	                <input type="submit" value="ログイン"/>
-	                <button onclick="clearInput()">リセット</button>
-	            </td>
-	        </tr>
-	    </table>
+	<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}">
+			<p class="field-error" th:errors="*{employeeId}"></p>
+		</div>
+
+		<div class="form-group">
+			<label for="passwordHash">パスワード</label>
+			<input id="passwordHash" type="password" th:field="*{passwordHash}">
+			<p class="field-error" th:errors="*{passwordHash}"></p>
+		</div>
+
+		<input type="submit" value="ログイン">
+		<input type="reset" value="リセット">
 	</form>
 
 </body>
+
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/topmenu.html b/src/main/resources/templates/topmenu.html
index 83c566d..2fff6ee 100644
--- a/src/main/resources/templates/topmenu.html
+++ b/src/main/resources/templates/topmenu.html
@@ -1,31 +1,55 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-<meta charset="UTF-8">
-<title>トップメニュー</title>
+	<meta charset="UTF-8">
+	<title>トップメニュー</title>
 </head>
+
 <body>
+
+	<div class="header-bar">
+
+		<div class="header-left">
+			ShareBooks
+		</div>
+
+		<div class="header-right">
+
+			<span class="user">
+				テストユーザー（一般）
+			</span>
+
+			<a class="button-link" th:href="@{/logout}">
+				ログアウト
+			</a>
+		
+		</div>
+
+
+	</div>
+
 	<h1>
 		メインメニュー
 	</h1>
-	
-	
+
+
 	<!-- ===== 共通：社内図書一覧 ===== -->
-		<form method="post" name="社内図書一覧" action="book">
-		    <a href="javascript:form1.submit()">リンク名</a>
-				<button type="submit" class="btn-book">
+	<form method="post" name="社内図書一覧" action="book">
+		<a href="javascript:form1.submit()">リンク名</a>
+		<button type="submit" class="btn-book">
 
-				<h3>社内図書一覧</h3>
+			<h3>社内図書一覧</h3>
 
-				<p>
-					登録されている図書の<br> 一覧を表示します。
-				</p>
-				</button>
-		</form>
-		<hr> <!--区切り線-->
+			<p>
+				登録されている図書の<br> 一覧を表示します。
+			</p>
+		</button>
+	</form>
+	<hr> <!--区切り線-->
 
 	<!-- ===== 共通：寄贈申請 ===== -->
-	
+
 	<a class="card" href="/bookApproval">
 
 		<h3>寄贈申請</h3>
@@ -34,11 +58,11 @@
 			寄贈申請フォームの<br> 入力を行います。
 		</p>
 	</a>
-	
+
 	<hr>
-	
+
 	<!-- ===== 管理者のみ ===== -->
-	
+
 	<a class="card" href="/bookInsert">
 
 		<h3>新規図書登録</h3>
@@ -49,19 +73,19 @@
 	</a>
 
 	<hr>
-	
-	
+
+
 	<a class="card" href="/lendList">
-		
+
 		<h3>貸出中図書一覧</h3>
 
 		<p>
 			貸出中図書の<br> 一覧を表示します。
-		</p> 
+		</p>
 	</a>
-	
+
 	<hr>
-	
+
 	<a class="card" href="/approvalReceive">
 
 		<h3>寄贈申請受信BOX</h3>
@@ -70,16 +94,17 @@
 			寄贈申請の<br> 受信一覧を確認します。
 		</p>
 	</a>
-	
+
 	<hr>
-	
-	<a class="card" href="/">
+
+	<a class="card" href="/passwordChange">
 		<h3>パスワード変更</h3>
-		
+
 		<p>
 			初期パスワードを<br> 変更します。
 		</p>
 	</a>
 
 </body>
+
 </html>
\ No newline at end of file