コメントの修正

社員のものからコピーしたままになっていたので部署に合うように変更

.classpath

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

.gitignore

@@ -1,2 +0,0 @@
-/target/
-/bin/

.project

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>em-spring</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>

.settings/.jsdtscope

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry excluding="**/node_modules/*|**/*.min.js|**/bower_components/*" kind="src" path="target/m2e-wtp/web-resources"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=17

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="17"/>
-  <installed facet="jst.web" version="4.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -1 +0,0 @@
-Window

.settings/org.eclipse.wst.validation.prefs

@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1

pom.xml

@@ -20,12 +20,6 @@
         <lombok.version>1.18.34</lombok.version>
     </properties>
     <dependencies>
-    	<dependency>
-	    	<groupId>org.projectlombok</groupId>
-    		<artifactId>lombok</artifactId>
-    		<version>1.18.30</version>
-    		<scope>provided</scope>
-		</dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

src/main/java/com/example/rhizome/aop/aspect/PermissionCheckAspect.java

@@ -1,16 +1,17 @@
 package com.example.rhizome.aop.aspect;
 
-import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
+import javax.servlet.http.HttpServletRequest;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+
-import com.example.rhizome.app.presentation.form.LoginUserForm;
-import com.example.rhizome.exception.InsufficientPermissionException;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
+import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
+import com.example.rhizome.exception.InsufficientPermissionException;
 
 /**
  * 権限チェック用のAOP
@@ -111,4 +112,3 @@ public class PermissionCheckAspect {
 
 	}
 }
-

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

@@ -1,6 +1,6 @@
 package com.example.rhizome.app.domain.service;
 
 public interface DeleteDepartment {
-	void delete(Integer idDepartment);
+	void deleteDepartment(Integer idDepartment);
 
 }

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

@@ -1,7 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import com.example.rhizome.app.domain.model.Department;
-
-public interface InsertDepartment {
-    void insert(Department department);
-}

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

@@ -12,5 +12,6 @@ public interface SearchDepartment {
 
 	List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
 
-	Department searchById(Integer idDepartment);
+	Department searchDepartmentByIdDepartment(Integer idDepartment);
+
 }

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

@@ -3,5 +3,6 @@ package com.example.rhizome.app.domain.service;
 import com.example.rhizome.app.domain.model.Department;
 
 public interface UpdateDepartment {
-    void update(Department department);
+	void updateDepartment(Department beforeDepartment, Department updateDepartment);
+
 }

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

@@ -2,19 +2,32 @@ package com.example.rhizome.app.domain.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.service.DeleteDepartment;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
+/**
+ * Department レコード削除関連の機能を持つサービス
+ */
 @Service
+@Transactional
 public class DeleteDepartmentImpl implements DeleteDepartment {
 
-    @Autowired
+	DepartmentRepository departmentRepository;
-    private DepartmentRepository departmentRepository;
 
-    @Override
+	@Autowired
-    public void delete(Integer idDepartment) {
+	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-        // JpaRepository တွင်ပါရှိသော deleteById ကို အသုံးပြု၍ ဖယ်ရှားရန်
+		this.departmentRepository = departmentRepository;
+	}
+
+	/**
+	 * idDepartment を元に department データを削除
+	 *
+	 * @param idDepartment 削除対象のidDepartment
+	 */
+	public void deleteDepartment(Integer idDepartment) {
 		departmentRepository.deleteById(idDepartment);
 	}
+
 }

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

@@ -1,29 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.service.InsertDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-@Service
-@Transactional
-public class InsertDepartmentImpl implements InsertDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public InsertDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	@Override
-	public void insert(Department department) {
-		DepartmentEntity entity = new DepartmentEntity();
-		entity.setNmDepartment(department.getNmDepartment());
-		departmentRepository.save(entity);
-	}
-}

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

@@ -1,6 +1,5 @@
 package com.example.rhizome.app.domain.service.impl;
 
-
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,10 +53,10 @@ public class SearchDepartmentImpl implements SearchDepartment {
 		return DepartmentEntity
 				.createDepartmentList(
 						departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+								.where(DepartmentRepository
-                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                        )
+								.and(DepartmentRepository
-                );
+										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
 
 	}
 
@@ -74,27 +73,16 @@ public class SearchDepartmentImpl implements SearchDepartment {
 		return DepartmentEntity
 				.createDepartmentList(
 						departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+								.where(DepartmentRepository
-                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                        )
+								.and(DepartmentRepository
-                );
+										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
 
 	}
 
-	@Override
+	//idDepartmentに合致するレコード取得
-	public Department searchById(Integer idDepartment) {
+	public Department searchDepartmentByIdDepartment(Integer idDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
+		return DepartmentEntity
-		if (idDepartment == null) {
+				.createDepartment(departmentRepository.findByIdDepartment(idDepartment).orElse(new DepartmentEntity()));
-            return null;
-        }
-        
-        return departmentRepository.findById(idDepartment)
-                .map(entity -> {
-                    List<Department> list = DepartmentEntity.createDepartmentList(List.of(entity));
-                    return list.isEmpty() ? null : list.get(0);
-                })
-                .orElse(null);
-    
-		
 	}
 }

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

@@ -2,25 +2,52 @@ package com.example.rhizome.app.domain.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 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.service.UpdateDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
+/**
+ * department の更新系の機能を集約させるサービスクラスです。
+ */
 @Service
+@Transactional
 public class UpdateDepartmentImpl implements UpdateDepartment {
 
+	DepartmentRepository departmentRepository;
+
 	@Autowired
-    private DepartmentRepository departmentRepository;
+	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
-
+		this.departmentRepository = departmentRepository;
-    @Override
-    public void update(Department department) {
-        // Model မှ Entity သို့ ပြောင်းလဲခြင်း သို့မဟုတ် သက်ဆိုင်ရာ update ကို save ဖြင့် လုပ်ဆောင်ရန်
-        DepartmentEntity entity = new DepartmentEntity();
-        entity.setIdDepartment(department.getIdDepartment());
-        entity.setNmDepartment(department.getNmDepartment());
-        
-        departmentRepository.save(entity);
 	}
+
+	/**
+	 * department の情報を元に department table のレコードを更新する
+	 *
+	 * @param beforeDepartment 更新前のデータ
+	 * @param updateDepartment 更新後のデータ
+	 */
+	public void updateDepartment(Department beforeDepartment, Department updateDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment, updateDepartment)));
+
+	}
+
+	/**
+	 * 更新前のデータと更新対象のデータをマージする
+	 *
+	 * @param beforeDepartment 更新前のデータ
+	 * @param updateDepartment 更新対象のデータ
+	 * @return マージしたデータ
+	 */
+
+	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
+		return new Department(
+				updateDepartment.getIdDepartment(),
+				updateDepartment.getNmDepartment());
+
+	}
+
 }

src/main/java/com/example/rhizome/app/infra/entity/DepartmentEntity.java

@@ -6,15 +6,22 @@
  */
 package com.example.rhizome.app.infra.entity;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.example.rhizome.app.domain.model.Department;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
-
 /**
  * Department テーブルの Entity
  *
@@ -53,8 +60,8 @@ public class DepartmentEntity {
 				.stream()
 				.map(departmentEntity -> new Department(
 						departmentEntity.getIdDepartment(),
-                        departmentEntity.getNmDepartment()
+						departmentEntity.getNmDepartment()))
-                )).toList();
+				.toList();
 	}
 
 	/**
@@ -66,7 +73,20 @@ public class DepartmentEntity {
 	public static DepartmentEntity convertFrom(Department department) {
 		return new DepartmentEntity(
 				department.getIdDepartment(),
-                department.getNmDepartment()
+				department.getNmDepartment());
-        );
 	}
+
+	public static Optional<Department> createDepartmentList(Optional<DepartmentEntity> departmentEntityList) {
+
+		return departmentEntityList.map(departmentEntity -> new Department(departmentEntity.getIdDepartment(),
+				departmentEntity.getNmDepartment()));
+	}
+
+	public static Department createDepartment(DepartmentEntity DepartmentEntity) {
+		// 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
+		return new Department(
+				DepartmentEntity.getIdDepartment(),
+				DepartmentEntity.getNmDepartment());
+	}
+
 }

src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java

@@ -1,11 +1,13 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import java.util.Optional;
+
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
 
 /**
  * Specification:
@@ -20,12 +22,11 @@ import org.springframework.stereotype.Repository;
  * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
  */
 @Repository
-public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
+public interface DepartmentRepository
-
+		extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
 
 	static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-        return idDepartment == null ?
+		return idDepartment == null ? null :
-                null :
 		// 戻り値の型 Specification<DepartmentEntity> にキャスト
 				(Specification<DepartmentEntity>)
 				// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
@@ -34,17 +35,22 @@ public interface DepartmentRepository extends JpaRepository<DepartmentEntity, In
 	}
 
 	static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
-                null :
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-                (Specification<DepartmentEntity>)
+						.like(root.get("nmDepartment"), nmDepartment);
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), nmDepartment);
 	}
 
-
 	static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
-                null :
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-                (Specification<DepartmentEntity>)
+						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
 	}
+
+	static void deleteBy(Integer id) {
+
+	}
+
+	//idで検索
+	Optional<DepartmentEntity> findByIdDepartment(Integer idDepartment);
+
 }

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

@@ -1,47 +1,125 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 
+/**
+ * 削除処理のコントローラ
+ */
 @Controller
 public class DeleteDepartmentController {
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
+
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
 	DeleteDepartment deleteDepartment;
+	SearchDepartment searchDepartment;
+	SearchEmployee searchEmployee;
 
 	@Autowired
-    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment) {
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+			HttpSession httpSession, SearchEmployee searchEmployee) {
 		this.httpSession = httpSession;
 		this.deleteDepartment = deleteDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
 	}
 
+	/**
+	 * 削除処理のコントローラ
+	 *
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
 	@SessionCheck
-    @PostMapping("/deleteDepartmentInput")
+	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
 	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-        final String DELETE_COMPLETE = "削除しました。";
-
 		try {
-            // ဌာန ဖယ်ရှားခြင်း လုပ်ဆောင်ချက်
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-            deleteDepartment.delete(idDepartment);
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+			// 削除処理実施
-            return "forward:/selectDepartment";
+			deleteExec(
+					model,
+					idDepartment,
+					LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
+
+			// 検索画面に遷移
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
 
 		} catch (Exception e) {
+			// ログイン情報の破棄
 			httpSession.invalidate();
+
 			e.printStackTrace();
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
 		}
 	}
+
+	/**
+	 * 削除処理実施
+	 *
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @param idDepartment 削除対象のdepartmentId
+	 * @param loginUser  ログインユーザー情報
+	 */
+	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
+
+		final String DELETE_COMPLETE = "削除しました。";
+		final String ID_TO_DELETED_IS_UNKNOWN = "削除対象のIDが不明です。";
+		final String YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT = "1名以上が所属している部署は削除出来ません。";
+
+		if (searchDepartment.searchDepartmentByIdDepartment(idDepartment) == null) {
+			// エラーメッセージをセット
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ID_TO_DELETED_IS_UNKNOWN));
+			return;
+		}
+
+		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT));
+			return;
+		}
+		// 削除を実施
+		deleteDepartment.deleteDepartment(idDepartment);
+
+		// 削除完了したメッセージをセット
+		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+
+	}
 }

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

@@ -1,78 +0,0 @@
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.service.InsertDepartment;
-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.MessageForm;
-
-@Controller
-public class InsertDepartmentController {
-
-    private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-    HttpSession httpSession;
-    InsertDepartment insertDepartment;
-
-    @Autowired
-    public InsertDepartmentController(HttpSession httpSession, InsertDepartment insertDepartment) {
-        this.httpSession = httpSession;
-        this.insertDepartment = insertDepartment;
-    }
-
-    /**
-     * 部署登録入力画面を表示する
-     */
-    @SessionCheck
-    @RequestMapping(value = "/insertDepartmentInput", method = {RequestMethod.GET, RequestMethod.POST})
-    public String showInsertDepartment(Model model) {
-        try {
-            model.addAttribute("departmentForm", new DepartmentForm());
-            return "insertDepartmentInput";
-        } catch (Exception e) {
-            httpSession.invalidate();
-            e.printStackTrace();
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-    }
-
-    /**
-     * 部署情報の登録を実行する
-     */
-    @SessionCheck
-    @PostMapping("/insertDepartmentResult")
-    public String insertDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
-        final String INSERT_COMPLETE = "登録しました。";
-
-        try {
-            Department department = new Department(null, departmentForm.getNmDepartment());
-            insertDepartment.insert(department);
-
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(INSERT_COMPLETE));
-            return "forward:/selectDepartment";
-
-        } catch (Exception e) {
-            httpSession.invalidate();
-            e.printStackTrace();
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-    }
-}

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

@@ -1,41 +1,114 @@
 package com.example.rhizome.app.presentation.controller;
 
-import java.util.List;
+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.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
+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.model.Department;
 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
-    private SearchDepartment searchDepartment;
+	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 searchConditionDepartmentForm 検索画面のフォーム
+	 * @param model                       ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
 	@SessionCheck
-    @GetMapping("/showSelectDepartment")
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-    public String showSelectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm) {
+	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-        return "selectDepartment";
+		try {
+
+			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			// 作成した部署一覧をセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			// 検索条件を元に検索を実施
+			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;
 		}
 
-    /** 部署検索処理 */
-    @PostMapping("/selectDepartment")
-    public String selectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-        List<Department> departmentList = searchDepartment.searchByWithLike(
-                SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm)
-        );
-
-        model.addAttribute("departmentFormList", DepartmentForm.convertFrom(departmentList));
-        return "selectDepartment";
 	}
+
+	/**
+	 * 部署検索画面表示処理コントローラ
+	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
+	 *
+	 * @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()));
+
+		// 検索ページに遷移
+		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+	}
+
 }

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

@@ -9,81 +9,77 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.UpdateDepartment;
+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.MessageForm;
+import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 
+/**
+ * 更新対象の Department が存在するか確認する為のコントローラ
+ */
 @Controller
 public class UpdateDepartmentController {
 
+	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
 	HttpSession httpSession;
 	SearchDepartment searchDepartment;
-    UpdateDepartment updateDepartment; // 追加
+	SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
-    public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, UpdateDepartment updateDepartment) {
+	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo) {
 		this.httpSession = httpSession;
 		this.searchDepartment = searchDepartment;
-        this.updateDepartment = updateDepartment; // 追加
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}
 
-    @SessionCheck
+	@ModelAttribute
-    @PostMapping("/updateDepartmentInput")
+	public SearchConditionEmployeeForm searchConditionEmployeeForm() {
-    public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+		return new SearchConditionEmployeeForm();
-        final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-
-        try {
-            Department department = searchDepartment.searchById(idDepartment);
-
-            if (department == null) {
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-                return "forward:/selectDepartment";
-            }
-
-            model.addAttribute("departmentForm", DepartmentForm.convertFrom(department));
-            return "updateDepartmentInput";
-
-        } catch (Exception e) {
-            httpSession.invalidate();
-            e.printStackTrace();
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
 	}
 
 	/**
-     * 部署情報の更新を実行する
+	 * 更新対象の department が存在するか確認する為のコントローラ
+	 *
+	 * @param idDepartment 更新対象の employee の id
+	 * @param model      ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
 	 */
+	@PermissionCheck
 	@SessionCheck
-    @RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DAPERTMENT, method = RequestMethod.POST)
-    public String updateDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
+	public String showUpdateDepatment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-        final String UPDATE_COMPLETE = "更新しました。";
+		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-
 		try {
-            Department department = new Department(departmentForm.getIdDepartment(), departmentForm.getNmDepartment());
+			// 部署一覧を取得し画面に返す値としてセット
-            updateDepartment.update(department);
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-
+					DepartmentForm.convertFrom(searchDepartment.searchDepartmentByIdDepartment(idDepartment)));
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-            return "forward:/selectDepartment";
 
+			// Update画面に遷移
+			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
 		} catch (Exception e) {
+			// ログイン情報の破棄
 			httpSession.invalidate();
+
 			e.printStackTrace();
+
+			// エラーログ出力
 			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
 			return TransitionTargetPageNameKeyword.ERROR_HTML;
+
 		}
 	}
 }

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

@@ -0,0 +1,129 @@
+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.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.SearchEmployee;
+import com.example.rhizome.app.domain.service.UpdateDepartment;
+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.MessageForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
+
+/**
+ * employee を更新して結果を返す為のコントローラ
+ */
+@Controller
+public class UpdateDepartmentResultController {
+
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	HttpSession httpSession;
+	SearchDepartment searchDepartment;
+	SearchEmployee searchEmployee;
+	UpdateDepartment updateDepartment;
+
+	@Autowired
+	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
+			SearchEmployee searchEmployee, UpdateDepartment updateDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
+		this.updateDepartment = updateDepartment;
+	}
+
+	/**
+	 * 更新結果画面表示処理
+	 *
+	 * @param updateDepartmentInfoForm 更新画面のフォーム
+	 * @param model                  ビューにデータを渡すためのコンテナ
+	 * @return 遷移先の画面
+	 */
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
+	public String employeeUpdateResult(@ModelAttribute UpdateDepartmentInfoForm updateDepartmentInfoForm, Model model) {
+
+		final String DEPARTMENT_WITH_THE_SAME_NAME = "既に同名の部署が存在するか、値が変更されていません。";
+		final String NOTHING = "項目が空欄です。";
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
+
+		final String UPDATE_COMPLETE = "更新が完了しました。";
+
+		try {
+
+			// 部署一覧取得
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			// 既に登録済みの部署名が存在するか
+			if (searchDepartment.searchBy(
+					new SearchConditionDepartment(null, updateDepartmentInfoForm.getNmDepartment())).size() != 0) {
+				System.out.println("同一部署名");
+				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(DEPARTMENT_WITH_THE_SAME_NAME));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
+
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+			//　画面から渡ってきた値が必須を満たしているか(空白チェック)
+			if (!UpdateDepartmentInfoForm.hasErrorParameter(updateDepartmentInfoForm)) {
+				System.out.println("部署必須否");
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
+
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			// 更新前のデータを取得
+			Department beforeDepartment = searchDepartment
+					.searchDepartmentByIdDepartment(updateDepartmentInfoForm.getIdDepartment());
+			if (beforeDepartment.getIdDepartment() == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
+
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			// 画面用の型からビジネスロジック用のモデルに変換し、Updateを実行
+			updateDepartment.updateDepartment(beforeDepartment,
+					updateDepartmentInfoForm.convertTo(updateDepartmentInfoForm));
+
+			// 更新結果のメッセージを画面にセットし一覧画面に遷移
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+
+			// forward 先で不用意な動作をしないために updateDepartmentInfoForm をクリア
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
+
+		} catch (Exception e) {
+			// ログイン情報の破棄
+			httpSession.invalidate();
+			e.printStackTrace();
+			// エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			// エラー画面遷移
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+
+	}
+
+}

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

@@ -10,9 +10,11 @@ public class PageReturnAttributeKeyword {
 
 	public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
 	public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+
 	public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
 	public static final String LOGIN_INFO_FORM = "loginInfoForm";
 	public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
 	public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
+	public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentInfoForm";
 
 }

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

@@ -47,7 +47,17 @@ public class TransitionTargetPageNameKeyword {
 
 	// Department
 	// HTML
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
 	// 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 = "/deleteDepartment";
+	public static final String INSERT_DEPARTMENT_INPUT = "/";
+	public static final String INSERT_DEPARTMENT_CONFIRM = "/";
+	public static final String INSERT_DEPARTMENT = "/";
+	public static final String SHOW_UPDATE_DAPERTMENT = "/showUpdateDepartment";
+	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
 
 	/**
 	 * 管理者向けのページリストを返す
@@ -70,8 +80,12 @@ public class TransitionTargetPageNameKeyword {
 				SELECT_EMPLOYEE_INFO,
 				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
 				SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
+				UPDATE_EMPLOYEE_RESULT,
-        );
+				SELECT_DEPARTMENT_INFO,
+				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+				DELETE_DEPARTMENT,
+				SHOW_UPDATE_DAPERTMENT,
+				UPDATE_DEPARTMENT_RESULT);
 	}
 
 	/**
@@ -86,8 +100,7 @@ public class TransitionTargetPageNameKeyword {
 				INDEX_LOGIN,
 				LOGOUT,
 				DO_LOGIN,
-                PERSONAL_UPDATE_RESULT
+				PERSONAL_UPDATE_RESULT);
-        );
 	}
 
 }

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

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

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

@@ -0,0 +1,91 @@
+package com.example.rhizome.app.presentation.form;
+
+import java.util.List;
+
+import com.example.rhizome.app.domain.model.Department;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 画面から渡ってきた更新内容をまとめ、再度画面に表示する為のクラス
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateDepartmentInfoForm {
+
+	/**
+	 * 	部署ID
+	 */
+	private Integer idDepartment;
+	/**
+	 * 部署名
+	 */
+	private String nmDepartment;
+
+	/**
+	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentInfoForm に
+	 * 変換します。
+	 *
+	 * @param department business 層の Department インスタンス
+	 * @return 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンス
+	 */
+	public static UpdateDepartmentInfoForm convertFrom(Department department) {
+		return new UpdateDepartmentInfoForm(
+				department.getIdDepartment(),
+				department.getNmDepartment());
+	}
+
+	/**
+	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentInfoForm に
+	 * 変換します。（リスト版）
+	 *
+	 * @param departmentList business 層の Department インスタンスのリスト
+	 * @return 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンスのリスト
+	 */
+	public static List<UpdateDepartmentInfoForm> convertFrom(List<Department> departmentList) {
+		return departmentList.stream().map(UpdateDepartmentInfoForm::convertFrom).toList();
+	}
+
+	/**
+	 * 画面用（presentation 層）の UpdateDepartmentInfoForm クラスから business 層の Department クラスに
+	 * 変換します。
+	 *
+	 * @param updateDepartmentInfoForm 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンス
+	 * @return business 層の Department インスタンス
+	 */
+	public static Department convertTo(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+		return new Department(
+				updateDepartmentInfoForm.getIdDepartment(),
+				updateDepartmentInfoForm.getNmDepartment());
+	}
+
+	/**
+	 * 画面から渡ってきたパラメータのチェック
+	 *
+	 * @param updateDepartmentInfoForm 画面から渡ってきたパラメータ
+	 * @return true: エラー無し　false:エラーあり（必須を満たしていない）
+	 */
+	public static boolean hasErrorParameter(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+
+		boolean errorFlag = !isNullOrBlank(updateDepartmentInfoForm.getNmDepartment());
+
+		return errorFlag;
+	}
+
+	/**
+	 * 仮引数を null or 空 判定する
+	 *
+	 * @param str 判定対象の文字列
+	 * @return true:null or 空 false:null or 空 では無い
+	 */
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+		return str.isBlank();
+	}
+
+}

src/main/resources/templates/insertDepartmentInput.html

@@ -1,76 +0,0 @@
-<!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="/insertDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
-		th:object="${departmentForm}">
-		<div class="msgBox error" th:if="${messageError != null}">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
-		</div>
-		<table>
-			<tr>
-				<th class="header">部署ID</th>
-				<td>
-					<label>
-						<input class="readOnly" readonly="readonly" type="text"value="自動で設定されます" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<label>
-
-						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-							type="text" />
-					</label>
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録" />
-				</td>
-			</tr>
-		</table>
-	</form>
-	<a href="javascript:selectSubmit()">一覧に戻る</a>
-</body>
-
-<script>
-	function selectSubmit() {
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartment');
-
-		// 動的送信用のHidden
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
-
-		form.appendChild(inputField);
-
-		// フォームをDOMに追加
-		document.body.appendChild(form);
-
-		form.submit();
-	}
-</script>
-
-</html>

src/main/resources/templates/menu.html

@@ -14,36 +14,36 @@
 </head>
 
 <body>
-	<h1>
+<h1>
     メインメニュー　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
     </div>
-	</h1>
+</h1>
-	<table class="menuClass">
+<table class="menuClass">
     <tr>
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><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>
+    <tr>
         <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
         </td>
-			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。
+        <td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-			</td>
     </tr>
-		<!-- ဒီနေရာမှာ ဌာနရှာဖွေခြင်း (部署検索) ကို ထည့်ပါ -->
+
     <tr>
-			<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a>
+        <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
-			</td>
+        <td class="description">新規で部署追加を行います。</td>
-			<td class="description">新規でユーザ追加を行います。
-			</td>
-			<!-- ဒီနေရာမှာ ဌာနအသစ်ထည့်သွင်းခြင်း (部署登録) ကို ထည့်ပါ -->
-			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
-			</td>
-			<td class="description">新規で部署追加を行います。
-			</td>
     </tr>
-	</table>
+
+</table>
 </body>
 
 <script type="text/javascript">
@@ -69,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

@@ -2,118 +2,116 @@
 <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>
-	<link rel="stylesheet" th:href="@{/css/all.css}">
-	<link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">
-	<title>部署検索</title>
-</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>部署検索条件入力
+<h1>
+    検索条件入力　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
     </div>
-	</h1>
+</h1>
+<form action="selectDepartmentInfo"
+      method="post"
+      th:object="${searchConditionDepartmentForm}">
 
-	<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 id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+                <input placeholder="部署ID"
+                       th:field="*{idDepartment}"
+                       type="number"/>
             </td>
         </tr>
         <tr>
             <th class="header">部署名</th>
             <td>
-					<input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+                <input placeholder="部署名"
+                       th:field="*{nmDepartment}"
+                       type="text"/>
             </td>
         </tr>
+        
         <tr>
             <td class="btnArea" colspan="2">
-					<input type="submit" value="検索" />
+                <input type="submit" value="検索"/>
             </td>
             <td class="btnArea" colspan="2">
-					<button type="button" onclick="clearInput()">クリア</button>
+                <button onclick="clearInput()">クリア</button>
             </td>
         </tr>
     </table>
-	</form>
+</form>
-
+<div class="header-spacing"></div>
-	<div class="header-spacing"></div>
+<a href="showMenu">メニューに戻る</a>
-	<a href="showMenu">メニューに戻る</a>
+<div class="header-spacing"></div>
-	<div class="header-spacing"></div>
+<h1><span>検索結果</span></h1>
-	<h1><span>検索結果</span></h1>
+<div class="header-spacing"></div>
-	<div class="header-spacing"></div>
+<th:block th:if="${messageInfo != null}">
-
+    <script th:inline="javascript">
-	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+        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: 100px;">部署ID</th>
+            <th style="width: 60px;">部署ID</th>
-					<th style="width: 200px;">部署名</th>
+            <th style="width: 100px;">部署名</th>
-					<th style="width: 200px;">操作</th>
+            <th style="width: 150px;">操作</th>
         </tr>
         </thead>
         <tbody>
-				<tr th:each="departmentForm : ${departmentFormList}">
+        <tr th:each="departmentInfoForm : ${departmentFormList}">
-					<td th:text="${departmentForm.idDepartment}"></td>
+			
-					<td th:text="${departmentForm.nmDepartment}"></td>
+            <td th:text="${departmentInfoForm.idDepartment}"></td>
+            <td th:text="${departmentInfoForm.nmDepartment}"></td>
             <td>
-						<button type="button"
+                <!-- 更新フォーム -->
-							th:onclick="'updateDepartment(' + ${departmentForm.idDepartment} + ')'">更新</button>
+                <form action="showUpdateDepartment" method="post" style="display: inline;">
-						<button type="button"
+                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
-							th:onclick="'deleteDepartment(' + ${departmentForm.idDepartment} + ')'">削除</button>
+                    <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:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+    <!-- 検索結果が0件の場合 -->
     検索結果はありません。
-	</th:block>
+</th:block>
+
+</body>
+<script type="text/javascript">
 
-	<script type="text/javascript">
     function clearInput() {
         document.getElementById('idDepartment').value = '';
         document.getElementById('nmDepartment').value = '';
-		}
+        document.getElementById('idDepartment').selectedIndex = 0;
-		// 部署更新用のJavaScript
-		function updateDepartment(idDepartment) {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'updateDepartmentInput'); // Update Controller ၏ URL သို့မဟုတ် Path
-
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "idDepartment");
-			inputField.setAttribute("value", idDepartment);
-
-			form.appendChild(inputField);
-			document.body.appendChild(form);
-			form.submit();
     }
 
 
-		// 部署削除用のJavaScript
+</script>
-		function deleteDepartment(idDepartment) {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'deleteDepartmentInput'); // Delete Controller ၏ URL သို့မဟုတ် Path
-
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "idDepartment");
-			inputField.setAttribute("value", idDepartment);
-
-			form.appendChild(inputField);
-			document.body.appendChild(form);
-			form.submit();
-		}
-	</script>
-</body>
-
 </html>

src/main/resources/templates/selectEmployee.html

@@ -14,7 +14,7 @@
 </head>
 <body>
 <h1>
-    検索条件入力</h1>
+    検索条件入力　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>

src/main/resources/templates/updateDepartmentInput.html

@@ -2,25 +2,29 @@
 <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">
+    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
     <title>部署情報更新</title>
 </head>
 
 <body>
-	<h1>
+<h1>
-		部署情報更新
+    部署情報更新　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
     </div>
-	</h1>
+</h1>
-	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
+<form action="/updateDepartmentResult"
-		th:object="${departmentForm}">
+      method="post"
+      onsubmit="return confirm('本当によろしいですか？');"
+      th:object="${departmentFormList}"
+ > 
     <div class="msgBox error" th:if="${messageError != null}">
         <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
     </div>
@@ -29,7 +33,11 @@
             <th class="header">部署ID</th>
             <td>
                 <label>
-						<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
+                    <input class="readOnly"
+                           readonly="readonly"
+                           th:field="*{idDepartment}"
+                           type="text"
+                    />
                 </label>
             </td>
         </tr>
@@ -37,31 +45,36 @@
             <th class="header">部署名</th>
             <td>
                 <label>
-						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
+                    <input maxlength="50"
-							type="text" />
+                           placeholder="部署名"
+                           required="required"
+                           th:field="*{nmDepartment}"
+                           type="text"
+                    />
                 </label>
             </td>
         </tr>
         <tr>
             <td class="btnArea" colspan="2">
-					<input type="submit" value="更新" />
+                <input type="submit" value="更新"/>
             </td>
         </tr>
     </table>
-	</form>
+</form>
-	<a href="javascript:selectSubmit()">一覧に戻る</a>
+<a href="javascript:selectSubmit()">一覧に戻る</a>
 </body>
 
 <script>
     function selectSubmit() {
         const form = document.createElement('form');
         form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartment');
+        form.setAttribute('action', 'departmentAll');
 
         // 動的送信用のHidden
+        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
         const inputField = document.createElement("input");
         inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
+        inputField.setAttribute("value", "departmentAll");
 
         form.appendChild(inputField);
 
@@ -70,6 +83,6 @@
 
         form.submit();
     }
-</script>
 
+</script>
 </html>