2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'm_shimizu' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2

Browse Source
This commit is contained in:
KYAW　ZIN　HEIN
2026-10-21 14:28:51 +09:00
parent 6f56164c13 7d5d038a9e
commit 103acf1106
10 changed files with 330 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
book-rent/pom.xml
View File

@@ -30,67 +30,54 @@
<properties> <properties>
<java.version>21</java.version> <java.version>21</java.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</dependency> </dependency>
<dependency> <!-- webmvcから通常のwebスターターに変更 -->
<groupId>org.springframework.boot</groupId> <dependency>
<artifactId>spring-boot-starter-webmvc</artifactId> <groupId>org.springframework.boot</groupId>
</dependency> <artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId> <dependency>
<artifactId>spring-boot-devtools</artifactId> <groupId>org.springframework.boot</groupId>
<scope>runtime</scope> <artifactId>spring-boot-devtools</artifactId> <!-- ここを修正 -->
<optional>true</optional> <scope>runtime</scope>
</dependency> <optional>true</optional>
<dependency> </dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@@ -135,5 +122,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

21
book-rent/src/main/java/com/example/demo/controller/LoginController.java
View File

@@ -1,6 +1,6 @@
package com.example.demo.controller; package com.example.demo.controller;
import java.util.Optional; import java.util.Optional;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
@@ -15,21 +15,21 @@ import org.springframework.web.bind.annotation.RequestParam;
import com.example.demo.common.Const; import com.example.demo.common.Const;
import com.example.demo.common.LoginUser; import com.example.demo.common.LoginUser;
import com.example.demo.service.AuthService; import com.example.demo.service.AuthService;
/** AUTH-01：ログイン／ログアウト（login.html） */ /** AUTH-01：ログイン／ログアウト（login.html） */
@Controller @Controller
public class LoginController { public class LoginController {
private final AuthService authService; private final AuthService authService;
public LoginController(AuthService authService) { public LoginController(AuthService authService) {
this.authService = authService; this.authService = authService;
} }
@GetMapping("/") @GetMapping("/")
public String root() { public String root() {
return "redirect:/menu"; return "redirect:/menu";
} }
@GetMapping("/login") @GetMapping("/login")
public String loginForm(HttpSession session) { public String loginForm(HttpSession session) {
if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) { if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) {
@@ -37,14 +37,14 @@ public class LoginController {
} }
return "login"; return "login";
} }
@PostMapping("/login") @PostMapping("/login")
public String login(@RequestParam(defaultValue = "") String mailAddress, public String login(@RequestParam(defaultValue = "") String mailAddress,
@RequestParam(defaultValue = "") String password, @RequestParam(defaultValue = "") String password,
HttpServletRequest request, Model model) { HttpServletRequest request, Model model) {
String mail = mailAddress.trim(); String mail = mailAddress.trim();
model.addAttribute("mailAddress", mail); // 入力値を保持（パスワードは保持しない） model.addAttribute("mailAddress", mail); // 入力値を保持（パスワードは保持しない）
if (mail.isEmpty() || password.isEmpty()) { if (mail.isEmpty() || password.isEmpty()) {
model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。"); model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。");
return "login"; return "login";
@@ -63,11 +63,10 @@ public class LoginController {
request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get()); request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get());
return "redirect:/menu"; return "redirect:/menu";
} }
@PostMapping("/logout") @PostMapping("/logout")
public String logout(HttpSession session) { public String logout(HttpSession session) {
session.invalidate(); session.invalidate();
return "redirect:/login"; return "redirect:/login";
} }
} }

4
book-rent/src/main/java/com/example/demo/controller/MenuController.java
View File

@@ -2,7 +2,7 @@ package com.example.demo.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
/** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */ /** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */
@Controller @Controller
public class MenuController { public class MenuController {
@@ -10,4 +10,4 @@ public class MenuController {
public String menu() { public String menu() {
return "menu"; return "menu";
} }
} }

103
book-rent/src/main/java/com/example/demo/form/EmployeeForm.java
View File

@@ -1,33 +1,82 @@
package com.example.demo.form; package com.example.demo.form;
/** 社員登録・編集フォーム */ /** 社員登録・編集フォーム */
public class EmployeeForm { public class EmployeeForm {
private Integer idEmployee; private Integer idEmployee;
private String nmEmployee = ""; private String nmEmployee = "";
private String knEmployee = ""; private String knEmployee = "";
private String mailAddress = ""; private String mailAddress = "";
private String password = ""; private String password = "";
private String flgAdmin = "0"; private String flgAdmin = "0";
private String flgRetirement = "0"; private String flgRetirement = "0";
public void trim() { public void trim() {
nmEmployee = t(nmEmployee); knEmployee = t(knEmployee); mailAddress = t(mailAddress); nmEmployee = t(nmEmployee);
flgAdmin = t(flgAdmin); flgRetirement = t(flgRetirement); knEmployee = t(knEmployee);
if (password == null) password = ""; mailAddress = t(mailAddress);
} flgAdmin = t(flgAdmin);
private static String t(String s) { return s == null ? "" : s.trim(); } flgRetirement = t(flgRetirement);
if (password == null)
password = "";
}
public Integer getIdEmployee() { return idEmployee; } private static String t(String s) {
public void setIdEmployee(Integer v) { this.idEmployee = v; } return s == null ? "" : s.trim();
public String getNmEmployee() { return nmEmployee; } }
public void setNmEmployee(String v) { this.nmEmployee = v; }
public String getKnEmployee() { return knEmployee; } public Integer getIdEmployee() {
public void setKnEmployee(String v) { this.knEmployee = v; } return idEmployee;
public String getMailAddress() { return mailAddress; } }
public void setMailAddress(String v) { this.mailAddress = v; }
public String getPassword() { return password; } public void setIdEmployee(Integer v) {
public void setPassword(String v) { this.password = v; } this.idEmployee = v;
public String getFlgAdmin() { return flgAdmin; } }
public void setFlgAdmin(String v) { this.flgAdmin = v; }
public String getFlgRetirement() { return flgRetirement; } public String getNmEmployee() {
public void setFlgRetirement(String v) { this.flgRetirement = v; } return nmEmployee;
}
public void setNmEmployee(String v) {
this.nmEmployee = v;
}
public String getKnEmployee() {
return knEmployee;
}
public void setKnEmployee(String v) {
this.knEmployee = v;
}
public String getMailAddress() {
return mailAddress;
}
public void setMailAddress(String v) {
this.mailAddress = v;
}
public String getPassword() {
return password;
}
public void setPassword(String v) {
this.password = v;
}
public String getFlgAdmin() {
return flgAdmin;
}
public void setFlgAdmin(String v) {
this.flgAdmin = v;
}
public String getFlgRetirement() {
return flgRetirement;
}
public void setFlgRetirement(String v) {
this.flgRetirement = v;
}
} }

2
book-rent/src/main/resources/application.properties
View File

@@ -10,4 +10,4 @@ spring.jpa.open-in-view=false
spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
spring.thymeleaf.cache=false spring.thymeleaf.cache=false
server.servlet.session.timeout=30m server.servlet.session.timeout=30m

20
book-rent/src/main/resources/templates/employeeRegistComplete.html Normal file
View File

@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>社員登録完了画面</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<!-- 共通ヘッダー -->
<div th:replace="~{fragments/header :: header}"></div>
<main class="complete-container">
<h2>社員登録完了</h2>
<p th:text="${message != null ? message : '社員登録が完了しました。'}">
社員登録が完了しました。
</p>
<a th:href="@{/menu}">メニューへ戻る</a>
</main>
</body>
</html>

79
book-rent/src/main/resources/templates/employeeRegistConfirm.html Normal file
View File

@@ -0,0 +1,79 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<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="${errors != null and !errors.isEmpty()}">
<p th:each="error : ${errors}"
th:text="${error}">
</p>
</div>
<div class="card">
<p>以下の内容で登録します。内容を確認してください。</p>
<!-- 登録ボタン -->
<form th:action="@{/admin/employees/new/execute}"
th:object="${form}"
method="post">
<table>
<tr>
<th>社員名</th>
<td th:text="*{nmEmployee}"></td>
</tr>
<tr>
<th>社員名よみ</th>
<td th:text="*{knEmployee}"></td>
</tr>
<tr>
<th>メールアドレス</th>
<td th:text="*{mailAddress}"></td>
</tr>
<tr>
<th>パスワード</th>
<td>********</td>
</tr>
<tr>
<th>権限</th>
<td th:text="*{flgAdmin == '1' ? '管理者' : '一般'}"></td>
</tr>
</table>
<!-- 登録処理に必要な値を引き継ぐ -->
<input type="hidden" th:field="*{nmEmployee}">
<input type="hidden" th:field="*{knEmployee}">
<input type="hidden" th:field="*{mailAddress}">
<input type="hidden" th:field="*{password}">
<input type="hidden" th:field="*{flgAdmin}">
<div class="actions">
<button type="submit" class="btn">
登録
</button>
</div>
</form>
<!-- 入力画面へ戻る -->
<form th:action="@{/admin/employees/new/input}"
th:object="${form}"
method="post">
<input type="hidden" th:field="*{nmEmployee}">
<input type="hidden" th:field="*{knEmployee}">
<input type="hidden" th:field="*{mailAddress}">
<input type="hidden" th:field="*{password}">
<input type="hidden" th:field="*{flgAdmin}">
<div class="back-link">
<button type="submit" class="sub">
社員情報入力に戻る
</button>
</div>
</form>
</div>
</main>
</body>
</html>

69
book-rent/src/main/resources/templates/employeeRegistInput.html Normal file
View File

@@ -0,0 +1,69 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>社員登録画面</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<!-- 共通ヘッダー -->
<div th:replace="~{fragments/header :: header}"></div>
<!-- 社員登録入力画面 -->
<main>
<h2>社員登録</h2>
<!-- 入力エラー表示 -->
<div th:if="${errors != null and !errors.isEmpty()}">
<p th:each="error : ${errors}"
th:text="${error}"
class="error">
</p>
</div>
<form th:action="@{/admin/employees/new/confirm}"
th:object="${form}"
method="post">
<div>
<label for="nmEmployee">社員名</label>
<input type="text"
id="nmEmployee"
th:field="*{nmEmployee}">
</div>
<div>
<label for="knEmployee">社員名よみ</label>
<input type="text"
id="knEmployee"
th:field="*{knEmployee}">
</div>
<div>
<label for="mailAddress">メールアドレス</label>
<input type="email"
id="mailAddress"
th:field="*{mailAddress}">
</div>
<div>
<label for="password">パスワード</label>
<input type="password"
id="password"
th:field="*{password}">
</div>
<fieldset>
<legend>権限</legend>
<label>
<input type="radio"
th:field="*{flgAdmin}"
value="0">
一般
</label>
<label>
<input type="radio"
th:field="*{flgAdmin}"
value="1">
管理者
</label>
</fieldset>
<button type="submit">登録確認</button>
</form>
<a th:href="@{/menu}">メニューへ戻る</a>
</main>
</body>
</html>

42
book-rent/src/main/resources/templates/login.html
View File

@@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>ログイン</title> <title>ログイン</title>
<link rel="stylesheet" th:href="@{/css/style.css}"> <link rel="stylesheet" th:href="@{/css/style.css}">
</head> </head>
<body> <body>
<main> <main>
<h1>書籍貸出管理システム</h1> <h1>書籍貸出管理システム</h1>
@@ -24,43 +24,43 @@
</div> </div>
</main> </main>
</body> </body>
</html> </html>
<!--<!DOCTYPE html>--> <!--<!DOCTYPE html>-->
<!--<html xmlns:th="http://www.thymeleaf.org">--> <!--<html xmlns:th="http://www.thymeleaf.org">-->
<!--<head>--> <!--<head>-->
<!-- <meta charset="UTF-8">--> <!-- <meta charset="UTF-8">-->
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0">--> <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
<!-- 外部スクリプトの読み込み --> <!-- 外部スクリプトの読み込み -->
<!-- <script th:src="@{/js/common.js}"></script>--> <!-- <script th:src="@{/js/common.js}"></script>-->
<!-- CSSの読み込み --> <!-- CSSの読み込み -->
<!-- <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">--> <!-- <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">-->
<!-- <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">--> <!-- <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">-->
<!-- <title>ログイン</title>--> <!-- <title>ログイン</title>-->
<!--</head>--> <!--</head>-->
<!--<body>--> <!--<body>-->
<!-- <div class="loginContainer">--> <!-- <div class="loginContainer">-->
<!-- <h1>ログイン</h1>--> <!-- <h1>ログイン</h1>-->
<!-- <form th:action="@{/doLogin}"--> <!-- <form th:action="@{/doLogin}"-->
<!-- method="post"--> <!-- method="post"-->
<!-- th:object="${loginInfoForm}">--> <!-- th:object="${loginInfoForm}">-->
<!-- エラーメッセージ --> <!-- エラーメッセージ -->
<!-- <div class="msgBox error"--> <!-- <div class="msgBox error"-->
<!-- th:if="${messageError != null}">--> <!-- th:if="${messageError != null}">-->
<!-- <span class="error"--> <!-- <span class="error"-->
<!-- th:text="${messageError.message}"></span>--> <!-- th:text="${messageError.message}"></span>-->
<!-- </div>--> <!-- </div>-->
<!-- <table>--> <!-- <table>-->
<!-- メールアドレス --> <!-- メールアドレス -->
<!-- <tr>--> <!-- <tr>-->
@@ -75,7 +75,7 @@
<!-- />--> <!-- />-->
<!-- </td>--> <!-- </td>-->
<!-- </tr>--> <!-- </tr>-->
<!-- パスワード --> <!-- パスワード -->
<!-- <tr>--> <!-- <tr>-->
<!-- <th class="header">パスワード</th>--> <!-- <th class="header">パスワード</th>-->
@@ -89,7 +89,7 @@
<!-- />--> <!-- />-->
<!-- </td>--> <!-- </td>-->
<!-- </tr>--> <!-- </tr>-->
<!-- ボタン --> <!-- ボタン -->
<!-- <tr>--> <!-- <tr>-->
<!-- <td class="btnArea" colspan="2">--> <!-- <td class="btnArea" colspan="2">-->
@@ -97,7 +97,7 @@
<!-- type="submit"--> <!-- type="submit"-->
<!-- value="ログイン"--> <!-- value="ログイン"-->
<!-- />--> <!-- />-->
<!-- <button--> <!-- <button-->
<!-- type="button"--> <!-- type="button"-->
<!-- onclick="clearInput()">--> <!-- onclick="clearInput()">-->
@@ -106,11 +106,11 @@
<!-- </td>--> <!-- </td>-->
<!-- </tr>--> <!-- </tr>-->
<!-- </table>--> <!-- </table>-->
<!-- </form>--> <!-- </form>-->
<!-- </div>--> <!-- </div>-->
<!-- 入力内容のリセット --> <!-- 入力内容のリセット -->
<!-- <script>--> <!-- <script>-->
<!-- function clearInput() {--> <!-- function clearInput() {-->
@@ -118,6 +118,6 @@
<!-- document.getElementById('password').value = '';--> <!-- document.getElementById('password').value = '';-->
<!-- }--> <!-- }-->
<!-- </script>--> <!-- </script>-->
<!--</body>--> <!--</body>-->
<!--</html>--> <!--</html>-->

3
book-rent/src/main/resources/templates/menu.html
View File

@@ -23,3 +23,6 @@
</main> </main>
</body> </body>
</html> </html>