第一段階目 部署検索機能

src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java

@@ -0,0 +1,123 @@
+package com.example.rhizome.app.presentation.controller;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+
+/**
+ * 部署画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
+ */
+@Controller
+public class SelectDepartmentController {
+
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	SearchDepartment searchDepartment;
+	SearchEmployeeInfo searchEmployeeInfo;
+
+	@Autowired
+	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
+	}
+
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	/**
+	 * 社員検索画面表示処理コントローラ
+	 *
+	 * @param searchConditionEmployeeForm 検索画面のフォーム
+	 * @param model                       ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
+	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+		try {
+
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			// 検索条件を元に検索を実施
+			//取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
+			//						model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(
+			//								searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm)));
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
+					searchDepartment
+							.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
+
+			// 検索ページに遷移
+			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+
+		} catch (Exception e) {
+			// ログイン情報の破棄
+			httpSession.invalidate();
+			e.printStackTrace();
+
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+
+	}
+
+	/**
+	 * 社員検索画面表示処理コントローラ
+	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
+	 *
+	 * @param model ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
+	public String select(Model model) {
+
+		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+		// 作成した部署一覧をセット
+		model.addAttribute(
+				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+				DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+		// 検索条件を元に検索を実施
+		//		model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,
+		//				EmployeeInfoForm.convertFrom(
+		//						searchEmployeeInfo.searchBy(
+		//								SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm()))));
+
+		// 検索ページに遷移
+		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+	}
+
+}

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java

@@ -5,14 +5,14 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
  */
 public class PageReturnAttributeKeyword {
 
-    public static final String MESSAGE_ERROR = "messageError";
+	public static final String MESSAGE_ERROR = "messageError";
-    public static final String MESSAGE_INFO = "messageInfo";
+	public static final String MESSAGE_INFO = "messageInfo";
 
-    public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
+	public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
-    public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+	public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
-    public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
+	public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
-    public static final String LOGIN_INFO_FORM = "loginInfoForm";
+	public static final String LOGIN_INFO_FORM = "loginInfoForm";
-    public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
+	public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
-    public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
+	public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
 
 }

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java

@@ -7,87 +7,96 @@ import java.util.Set;
  */
 public class TransitionTargetPageNameKeyword {
 
-    // 共通
+	// 共通
-    public static final String LOGIN_HTML = "login";
+	public static final String LOGIN_HTML = "login";
 
-    // 一般向け
+	// 一般向け
-    public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
+	public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
-    public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
+	public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
 
-    // 管理者向け
+	// 管理者向け
-    public static final String MENU_HTML = "menu";
+	public static final String MENU_HTML = "menu";
-    public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
+	public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
-    public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
+	public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
-    public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
-    public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
+	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-    public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
 
-    public static final String ERROR_HTML = "error";
+	public static final String ERROR_HTML = "error";
 
-    // 共通(Controller)
+	// 共通(Controller)
-    public static final String INDEX_BLANK = "";
+	public static final String INDEX_BLANK = "";
-    public static final String INDEX_SLASH = "/";
+	public static final String INDEX_SLASH = "/";
-    public static final String INDEX_LOGIN = "/login";
+	public static final String INDEX_LOGIN = "/login";
-    public static final String LOGOUT = "/logout";
+	public static final String LOGOUT = "/logout";
-    public static final String DO_LOGIN = "/doLogin";
+	public static final String DO_LOGIN = "/doLogin";
 
-    // 一般向け(Controller)
+	// 一般向け(Controller)
-    public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
+	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
 
-    // 管理者向け(Controller)
+	// 管理者向け(Controller)
-    public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+	public static final String DELETE_EMPLOYEE = "/deleteEmployee";
-    public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
+	public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
-    public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
+	public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
-    public static final String INSERT_EMPLOYEE = "/insertEmployee";
+	public static final String INSERT_EMPLOYEE = "/insertEmployee";
-    public static final String SHOW_MENU = "/showMenu";
+	public static final String SHOW_MENU = "/showMenu";
-    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
+	public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
+	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
+	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
-    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
+	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
-    // Department
+	// Department
-    // HTML
+	// HTML
-    // Controller
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+	// Controller
+	public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
+	public static final String DELETE_DEPARTMENT = "a";
+	public static final String INSERT_DEPARTMENT_INPUT = "i";
+	public static final String INSERT_DEPARTMENT_CONFIRM = "u";
+	public static final String INSERT_DEPARTMENT = "e";
+	public static final String SHOW_UPDATE_DAPERTMENT = "o";
+	public static final String UPDATE_DEPARTMENT_RESULT = "k";
 
-    /**
+	/**
-     * 管理者向けのページリストを返す
+	 * 管理者向けのページリストを返す
-     *
+	 *
-     * @return 管理者向けのページリスト
+	 * @return 管理者向けのページリスト
-     */
+	 */
-    public static Set<String> getAdminPageList() {
+	public static Set<String> getAdminPageList() {
 
-        return Set.of(
+		return Set.of(
-                INDEX_BLANK,
+				INDEX_BLANK,
-                INDEX_SLASH,
+				INDEX_SLASH,
-                INDEX_LOGIN,
+				INDEX_LOGIN,
-                LOGOUT,
+				LOGOUT,
-                DO_LOGIN,
+				DO_LOGIN,
-                DELETE_EMPLOYEE,
+				DELETE_EMPLOYEE,
-                INSERT_EMPLOYEE_INPUT,
+				INSERT_EMPLOYEE_INPUT,
-                INSERT_EMPLOYEE_CONFIRM,
+				INSERT_EMPLOYEE_CONFIRM,
-                INSERT_EMPLOYEE,
+				INSERT_EMPLOYEE,
-                SHOW_MENU,
+				SHOW_MENU,
-                SELECT_EMPLOYEE_INFO,
+				SELECT_EMPLOYEE_INFO,
-                SELECT_EMPLOYEE_INFO_FORM_EMPTY,
+				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
-                SHOW_UPDATE_EMPLOYEE,
+				SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
+				UPDATE_EMPLOYEE_RESULT,
-        );
+				SELECT_DEPARTMENT_INFO,
-    }
+				SELECT_DEPARTMENT_INFO_FORM_EMPTY);
+	}
 
-    /**
+	/**
-     * 一般向けのページリストを返す
+	 * 一般向けのページリストを返す
-     *
+	 *
-     * @return 一般向けのページリスト
+	 * @return 一般向けのページリスト
-     */
+	 */
-    public static Set<String> getUserPageList() {
+	public static Set<String> getUserPageList() {
-        return Set.of(
+		return Set.of(
-                INDEX_BLANK,
+				INDEX_BLANK,
-                INDEX_SLASH,
+				INDEX_SLASH,
-                INDEX_LOGIN,
+				INDEX_LOGIN,
-                LOGOUT,
+				LOGOUT,
-                DO_LOGIN,
+				DO_LOGIN,
-                PERSONAL_UPDATE_RESULT
+				PERSONAL_UPDATE_RESULT);
-        );
+	}
-    }
 
 }

src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java

@@ -0,0 +1,51 @@
+package com.example.rhizome.app.presentation.form;
+
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SearchConditionDepartmentForm {
+
+	/**
+	 * 部署ID
+	 */
+	private Integer idDepartment;
+	/**
+	 * 部署名
+	 */
+	private String nmDepartment;
+
+	/**
+	 * business 層の SearchConditionEmployee クラスから画面用（presentation 層）の SearchConditionEmployeeForm に
+	 * 変換します。
+	 *
+	 * @param searchConditionEmployee business 層の SearchConditionEmployee インスタンス
+	 * @return 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
+	 */
+	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
+		return new SearchConditionDepartmentForm(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+
+	/**
+	 * 画面用（presentation 層）の SearchConditionEmployeeForm クラスから business 層の SearchConditionEmployee クラスに
+	 * 変換します。
+	 *
+	 * @param searchConditionEmployeeForm 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
+	 * @return business 層の SearchConditionEmployee インスタンス
+	 */
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
+		return new SearchConditionDepartment(
+				searchConditionDepartmentForm.getIdDepartment(),
+				searchConditionDepartmentForm.getNmDepartment());
+	}
+}

src/main/resources/templates/menu.html

@@ -32,6 +32,16 @@
         <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
         <td class="description">新規でユーザ追加を行います。</td>
     </tr>
+    <tr>
+        <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+        </td>
+        <td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+    </tr>
+
+    <tr>
+        <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+        <td class="description">新規で部署追加を行います。</td>
+    </tr>
 
 </table>
 </body>
@@ -59,7 +69,7 @@
     function selectDepartmentSubmit() {
         const form = document.createElement('form');
         form.setAttribute('method', 'post');
-        form.setAttribute('action', 'selectDepartment');
+        form.setAttribute('action', 'selectDepartmentInfo');
 
         // 動的送信用のHidden
         // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない

src/main/resources/templates/selectDepartment.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <!-- 外部のスクリプトファイルを読み込む -->
+    <script th:src="@{/js/common.js}"></script>
+    <!-- CSSの読み込み -->
+    <link rel="stylesheet" th:href="@{/css/all.css}">
+    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
+    <title>検索</title>
+
+</head>
+<body>
+<h1>
+    検索条件入力　　　
+    <div class="rightSection">
+        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+    </div>
+</h1>
+<form action="selectDepartmentInfo"
+      method="post"
+      th:object="${searchConditionDepartmentForm}">
+
+    <div class="msgBox error" th:if="${messageError} != null">
+        <span class="error" th:text="${messageError.message}"></span>
+    </div>
+    <table>
+        <tr>
+            <th class="header">部署ID</th>
+            <td>
+                <input placeholder="部署	ID"
+                       th:field="*{idDepartment}"
+                       type="number"/>
+            </td>
+        </tr>
+        <tr>
+            <th class="header">部署名</th>
+            <td>
+                <input placeholder="部署名"
+                       th:field="*{nmDepartment}"
+                       type="text"/>
+            </td>
+        </tr>
+        
+        <tr>
+            <td class="btnArea" colspan="2">
+                <input type="submit" value="検索"/>
+            </td>
+            <td class="btnArea" colspan="2">
+                <button onclick="clearInput()">クリア</button>
+            </td>
+        </tr>
+    </table>
+</form>
+<div class="header-spacing"></div>
+<a href="showMenu">メニューに戻る</a>
+<div class="header-spacing"></div>
+<h1><span>検索結果</span></h1>
+<div class="header-spacing"></div>
+<th:block th:if="${messageInfo != null}">
+    <script th:inline="javascript">
+        alert([[${messageInfo.message}]]);
+    </script>
+</th:block>
+<div class="header-spacing"></div>
+<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+    <!-- 検索結果が1件以上ある場合 -->
+    <table class="table-grid table-striped table-hover">
+        <thead>
+        <tr>
+            <th style="width: 60px;">部署ID</th>
+            <th style="width: 100px;">部署名</th>
+            <th style="width: 150px;">操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="departmentInfoForm : ${departmentFormList}">
+			
+            <td th:text="${departmentInfoForm.idDepartment}"></td>
+            <td th:text="${departmentInfoForm.nmDepartment}"></td>
+            <td>
+                <!-- 更新フォーム -->
+                <form action="showUpdateDepatment" method="post" style="display: inline;">
+                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
+                    <input type="submit" value="更新">
+                </form>
+                <!-- 削除フォーム -->
+                <form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
+                      style="display: inline;">
+                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
+                    <input type="submit" value="削除">
+                </form>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</th:block>
+<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+    <!-- 検索結果が0件の場合 -->
+    検索結果はありません。
+</th:block>
+
+</body>
+<script type="text/javascript">
+
+    function clearInput() {
+        document.getElementById('idDepartment').value = '';
+        document.getElementById('nmDepartment').value = '';
+        document.getElementById('idDepartment').selectedIndex = 0;
+    }
+
+
+</script>
+</html>