[ADD&EDIT]部署検索機能の記述

src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java

@@ -1,14 +1,18 @@
 package com.example.rhizome.app.domain.service;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
-import java.util.List;
-
 public interface SearchDepartment {
     List<Department> selectAll();
 
     List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-
+    
     List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
+    
+    Department searchByIdDepartment(Integer idDepartment);
+    
+    List<Department> searchByNmDepartment(String nmDepartment);
 }

src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java

@@ -1,17 +1,18 @@
 package com.example.rhizome.app.domain.service.impl;
 
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -79,4 +80,29 @@ public class SearchDepartmentImpl implements SearchDepartment {
                 );
 
     }
+    
+    @Override
+    public Department searchByIdDepartment(Integer idDepartment) {
+
+        SearchConditionDepartment condition =
+                new SearchConditionDepartment(idDepartment, null);
+
+        List<Department> list = searchBy(condition);
+
+        if (list.isEmpty()) {
+            return null;
+        }
+
+        return list.get(0);
+    }
+    
+    @Override
+    public List<Department> searchByNmDepartment(String nmDepartment) {
+
+        SearchConditionDepartment condition =
+                new SearchConditionDepartment(null, nmDepartment);
+
+        return searchBy(condition);
+    }
+    
 }

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

@@ -0,0 +1,114 @@
+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();
+    }
+    
+    @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.DEPARTMENT_INFO_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
+            
+            // 検索ページに遷移
+            return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+
+
+        } catch (Exception e) {
+        	System.out.println(e);
+            // ログイン情報の破棄
+            httpSession.invalidate();
+
+            e.printStackTrace();
+
+            // エラーログ出力
+            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+            // エラー画面遷移
+            return TransitionTargetPageNameKeyword.ERROR_HTML;
+            
+        }
+
+    }
+    
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
+    public String select(Model model) {
+    	System.out.println("全件メソッド");
+
+        // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+        // 作成した部署一覧をセット
+        model.addAttribute(
+                PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                DepartmentForm.convertFrom(searchDepartment.selectAll())
+        );
+
+        // 検索条件を元に検索を実施
+        model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_INFO_FORM_LIST,
+                DepartmentForm.convertFrom(
+                        searchDepartment.searchBy(
+                                SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm())
+                        )));
+
+        // 検索ページに遷移
+        return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+    }
+    
+
+}

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

@@ -0,0 +1,54 @@
+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/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="selectDepartment"
+	      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>件数:</div>
+	<div th:text="${DepartmentInfoFormList.size()}"></div>
+	<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="${DepartmentInfoFormList != null and DepartmentInfoFormList.size() > 0}">
+	    <!-- 検索結果が1件以上ある場合 -->
+	    <table class="table-grid table-striped table-hover">
+	        <thead>
+	        <tr>
+	            <th style="width: 160px;">部署ID</th>
+	            <th style="width: 300px;">部署名</th>
+	            <th style="width: 150px;">操作</th>
+	        </tr>
+	        </thead>
+	        <tbody>
+	        <tr th:each="DepartmentForm : ${DepartmentInfoFormList}">
+	            <td th:text="${DepartmentForm.idDepartment}"></td>
+	            <td th:text="${DepartmentForm.nmDepartment}"></td>
+	            <td>
+	                <!-- 更新フォーム -->
+	                <form action="showUpdateDepartment" method="post" style="display: inline;">
+	                    <input name="idDepartment" th:value="${DepartmentForm.idDepartment}" type="hidden">
+	                    <input type="submit" value="更新">
+	                </form>
+	                <!-- 削除フォーム -->
+	                <form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
+	                      style="display: inline;">
+	                    <input name="idDepartment" th:value="${DepartmentForm.idDepartment}" type="hidden">
+	                    <input type="submit" value="削除">
+	                </form>
+	            </td>
+	        </tr>
+	        </tbody>
+	    </table>
+	</th:block>
+	<th:block th:if="${DepartmentInfoFormList == null or DepartmentInfoFormList.size() == 0}">
+	    <!-- 検索結果が0件の場合 -->
+	    検索結果はありません。
+	</th:block>
+
+	</body>
+	
+	<script type="text/javascript">
+
+	    function clearInput() {
+	        document.getElementById('idDepartment').value = '';
+	        document.getElementById('nmDepartment').value = '';
+		}
+	</script>
+</html>