2026_0910_AI_5G_Java_MUN/em-spring
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 2026_0910_AI_5G_Java_MUN:o-matsuda
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:s-sakiyama 2026_0910_AI_5G_Java_MUN:s-ikeda 2026_0910_AI_5G_Java_MUN:m-endo 2026_0910_AI_5G_Java_MUN:a-takayama 2026_0910_AI_5G_Java_MUN:y-ogawa 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:y-nakano 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:h-hein 2026_0910_AI_5G_Java_MUN:m_shimizu
..
compare: 2026_0910_AI_5G_Java_MUN:182f901a4d26cdd6bbe92dff3d549ccc46020766
Branches Tags
2026_0910_AI_5G_Java_MUN:s-sakiyama 2026_0910_AI_5G_Java_MUN:s-ikeda 2026_0910_AI_5G_Java_MUN:m-endo 2026_0910_AI_5G_Java_MUN:a-takayama 2026_0910_AI_5G_Java_MUN:y-ogawa 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:y-nakano 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:h-hein 2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m_shimizu

4 Commits
o-matsuda ... 182f901a4d

Author SHA1 Message Date
s-sakiyama
182f901a4d コメントの修正 
社員のものからコピーしたままになっていたので部署に合うように変更
 2026-10-14 16:33:42 +09:00
s-sakiyama
0f1141e689 第3段階 部署更新機能 2026-10-14 15:48:42 +09:00
s-sakiyama
815d957a31 第2段階　部署削除機能 2026-10-13 16:26:40 +09:00
s-sakiyama
4c134b81b8 第一段階目　部署検索機能 2026-10-13 10:23:24 +09:00
44 changed files with 1101 additions and 1086 deletions
Expand all files Collapse all files

41
.classpath
View File

@@ -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>

1
.gitignore vendored
View File

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

37
.project
View File

@@ -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.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</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>

13
.settings/.jsdtscope
View File

@@ -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>

6
.settings/org.eclipse.core.resources.prefs
View File

@@ -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

11
.settings/org.eclipse.jdt.core.prefs
View File

@@ -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=enabled
org.eclipse.jdt.core.compiler.source=17

10
.settings/org.eclipse.wst.common.component
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="EM-Spring-0.0.1-SNAPSHOT">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="context-root" value="EM-Spring"/>
<property name="java-output-path" value="/em-spring/target/classes"/>
</wb-module>
</project-modules>

7
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@@ -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>

1
.settings/org.eclipse.wst.jsdt.ui.superType.container
View File

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

1
.settings/org.eclipse.wst.jsdt.ui.superType.name
View File

@@ -1 +0,0 @@
Window

2
.settings/org.eclipse.wst.validation.prefs
View File

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

158
src/main/java/com/example/rhizome/aop/aspect/PermissionCheckAspect.java
View File

@@ -1,16 +1,17 @@
package com.example.rhizome.aop.aspect; 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.Aspect;
import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; 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 * 権限チェック用のAOP
@@ -19,96 +20,95 @@ import javax.servlet.http.HttpServletRequest;
@Component @Component
public class PermissionCheckAspect { public class PermissionCheckAspect {
HttpServletRequest request; HttpServletRequest request;
@Autowired @Autowired
public PermissionCheckAspect(HttpServletRequest request) { public PermissionCheckAspect(HttpServletRequest request) {
this.request = request; this.request = request;
} }
// Aspectのフックを定義（今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング） // Aspectのフックを定義（今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング）
@Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)") @Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
public void permissionCheckMethod() { public void permissionCheckMethod() {
} }
/** /**
* 権限チェック * 権限チェック
*/ */
@Before("permissionCheckMethod()") @Before("permissionCheckMethod()")
public void checkPermission() { public void checkPermission() {
// ログインユーザの取得 // ログインユーザの取得
LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER); LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
// ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移 // ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移
if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) { if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
throw new InsufficientPermissionException("不正な遷移です"); throw new InsufficientPermissionException("不正な遷移です");
} }
} }
/** /**
* 遷移先のURLとログインユーザの権限から、遷移可否を判定する * 遷移先のURLとログインユーザの権限から、遷移可否を判定する
* *
* @param targetURL 遷移したいURL * @param targetURL 遷移したいURL
* @param loginUserForm リクエスト元のユーザ * @param loginUserForm リクエスト元のユーザ
* @return true:遷移可 false:遷移不可 * @return true:遷移可 false:遷移不可
*/ */
private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) { private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
// 管理者権限 // 管理者権限
if (isAdminTransition(targetURL, loginUserForm)) { if (isAdminTransition(targetURL, loginUserForm)) {
return true; return true;
} }
// 一般権限 // 一般権限
if (isUserTransition(targetURL, loginUserForm)) { if (isUserTransition(targetURL, loginUserForm)) {
return true; return true;
} }
// アクセス不許可の場合の処理（不正アクセス画面に遷移） // アクセス不許可の場合の処理（不正アクセス画面に遷移）
return false; return false;
} }
/** /**
* 管理者用のアカウントで管理者向けのページアクセスか * 管理者用のアカウントで管理者向けのページアクセスか
* *
* @param targetURL 遷移したいURL * @param targetURL 遷移したいURL
* @param loginUserForm リクエスト元のユーザ * @param loginUserForm リクエスト元のユーザ
* @return true:遷移可 false:遷移不可 * @return true:遷移可 false:遷移不可
*/ */
private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) { private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
// 管理者か // 管理者か
if (!loginUserForm.isAdminUser()) { if (!loginUserForm.isAdminUser()) {
return false; return false;
} }
// 管理者向けのページ遷移か // 管理者向けのページ遷移か
if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) { if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
return false; return false;
} }
return true; return true;
} }
/** /**
* 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか * 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか
* *
* @param targetURL 遷移したいURL * @param targetURL 遷移したいURL
* @param loginUserForm リクエスト元のユーザ * @param loginUserForm リクエスト元のユーザ
* @return true:遷移可 false:遷移不可 * @return true:遷移可 false:遷移不可
*/ */
private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) { private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
// 管理者か // 管理者か
if (loginUserForm.isAdminUser()) { if (loginUserForm.isAdminUser()) {
return false; return false;
} }
// 一般ユーザ向けのページ遷移か // 一般ユーザ向けのページ遷移か
return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL); return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
} }
} }

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

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

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

@@ -1,14 +1,17 @@
package com.example.rhizome.app.domain.service; 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.Department;
import com.example.rhizome.app.domain.model.SearchConditionDepartment; import com.example.rhizome.app.domain.model.SearchConditionDepartment;
import java.util.List;
public interface SearchDepartment { public interface SearchDepartment {
List<Department> selectAll(); List<Department> selectAll();
List<Department> searchBy(SearchConditionDepartment searchConditionDepartment); List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
Department searchDepartmentByIdDepartment(Integer idDepartment);
List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
} }

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

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

11
src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDeparmentImpl.java → src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java
View File

@@ -12,20 +12,19 @@ import com.example.rhizome.app.infra.repository.DepartmentRepository;
*/ */
@Service @Service
@Transactional @Transactional
public class DeleteDeparmentImpl implements DeleteDepartment{ public class DeleteDepartmentImpl implements DeleteDepartment {
DepartmentRepository departmentRepository; DepartmentRepository departmentRepository;
@Autowired @Autowired
public DeleteDeparmentImpl(DepartmentRepository departmentRepository) { public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
this.departmentRepository = departmentRepository; this.departmentRepository = departmentRepository;
} }
/** /**
* idDepartment を元に department データを削除 * idDepartment を元に department データを削除
* *
* @param idDepartmetn 削除対象のidDepartment * @param idDepartment 削除対象のidDepartment
*/ */
public void deleteDepartment(Integer idDepartment) { public void deleteDepartment(Integer idDepartment) {
departmentRepository.deleteById(idDepartment); departmentRepository.deleteById(idDepartment);

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

@@ -1,17 +1,17 @@
package com.example.rhizome.app.domain.service.impl; 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.Department;
import com.example.rhizome.app.domain.model.SearchConditionDepartment; import com.example.rhizome.app.domain.model.SearchConditionDepartment;
import com.example.rhizome.app.domain.service.SearchDepartment; import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.infra.entity.DepartmentEntity; import com.example.rhizome.app.infra.entity.DepartmentEntity;
import com.example.rhizome.app.infra.repository.DepartmentRepository; 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;
/** /**
* 部署情報検索系の機能を集約させるサービスクラスです。 * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -20,63 +20,69 @@ import java.util.List;
@Transactional @Transactional
public class SearchDepartmentImpl implements SearchDepartment { public class SearchDepartmentImpl implements SearchDepartment {
DepartmentRepository departmentRepository; DepartmentRepository departmentRepository;
/** /**
* コンストラクタ * コンストラクタ
* *
* @param departmentRepository DI対象 * @param departmentRepository DI対象
*/ */
@Autowired @Autowired
public SearchDepartmentImpl(DepartmentRepository departmentRepository) { public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
this.departmentRepository = departmentRepository; this.departmentRepository = departmentRepository;
} }
/** /**
* 部署情報を全件取得する * 部署情報を全件取得する
* *
* @return 取得した部署情報レコード全件 * @return 取得した部署情報レコード全件
*/ */
public List<Department> selectAll() { public List<Department> selectAll() {
return DepartmentEntity.createDepartmentList(departmentRepository.findAll()); return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
} }
/** /**
* searchConditionDepartment の情報を元に Department のレコードを取得 * searchConditionDepartment の情報を元に Department のレコードを取得
* *
* @param searchConditionDepartment 検索条件 * @param searchConditionDepartment 検索条件
* @return 検索結果のレコード * @return 検索結果のレコード
*/ */
public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) { public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
// 動的に検索条件を絞り込む // 動的に検索条件を絞り込む
// Specification は Criteria API の Predicate をラップしたもの // Specification は Criteria API の Predicate をラップしたもの
return DepartmentEntity return DepartmentEntity
.createDepartmentList( .createDepartmentList(
departmentRepository.findAll(Specification departmentRepository.findAll(Specification
.where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment())) .where(DepartmentRepository
.and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment())) .idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
) .and(DepartmentRepository
); .nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
} }
/** /**
* searchConditionDepartment の情報を元に Department のレコードを取得 * searchConditionDepartment の情報を元に Department のレコードを取得
* 部分一致検索 * 部分一致検索
* *
* @param searchConditionDepartment 検索条件 * @param searchConditionDepartment 検索条件
* @return 検索結果のレコード * @return 検索結果のレコード
*/ */
public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) { public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
// 動的に検索条件を絞り込む // 動的に検索条件を絞り込む
// Specification は Criteria API の Predicate をラップしたもの // Specification は Criteria API の Predicate をラップしたもの
return DepartmentEntity return DepartmentEntity
.createDepartmentList( .createDepartmentList(
departmentRepository.findAll(Specification departmentRepository.findAll(Specification
.where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment())) .where(DepartmentRepository
.and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment())) .idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
) .and(DepartmentRepository
); .nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
} }
//idDepartmentに合致するレコード取得
public Department searchDepartmentByIdDepartment(Integer idDepartment) {
return DepartmentEntity
.createDepartment(departmentRepository.findByIdDepartment(idDepartment).orElse(new DepartmentEntity()));
}
} }

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

@@ -9,6 +9,9 @@ import com.example.rhizome.app.domain.service.UpdateDepartment;
import com.example.rhizome.app.infra.entity.DepartmentEntity; import com.example.rhizome.app.infra.entity.DepartmentEntity;
import com.example.rhizome.app.infra.repository.DepartmentRepository; import com.example.rhizome.app.infra.repository.DepartmentRepository;
/**
* department の更新系の機能を集約させるサービスクラスです。
*/
@Service @Service
@Transactional @Transactional
public class UpdateDepartmentImpl implements UpdateDepartment { public class UpdateDepartmentImpl implements UpdateDepartment {
@@ -20,10 +23,31 @@ public class UpdateDepartmentImpl implements UpdateDepartment {
this.departmentRepository = departmentRepository; this.departmentRepository = departmentRepository;
} }
public void updateDepartment(Department department) { /**
DepartmentEntity entity = new DepartmentEntity(); * department の情報を元に department table のレコードを更新する
entity.setIdDepartment(department.getIdDepartment()); *
entity.setNmDepartment(department.getNmDepartment()); * @param beforeDepartment 更新前のデータ
departmentRepository.save(entity); * @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());
}
} }

17
src/main/java/com/example/rhizome/app/domain/service/searchDepartmentinfo.java
View File

@@ -1,17 +0,0 @@
package com.example.rhizome.app.domain.service;
import java.util.List;
import com.example.rhizome.app.domain.model.EmployeeInfo;
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
public interface searchDepartmentinfo {
List<EmployeeInfo> selectAll();
static List<EmployeeInfo> searchBy(SearchConditionDepartment searchConditionDepartment) {
// TODO 自動生成されたメソッド・スタブ
return null;
}
}

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

@@ -6,15 +6,22 @@
*/ */
package com.example.rhizome.app.infra.entity; 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 com.example.rhizome.app.domain.model.Department;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.persistence.*;
import java.util.List;
/** /**
* Department テーブルの Entity * Department テーブルの Entity
* *
@@ -27,46 +34,59 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
public class DepartmentEntity { public class DepartmentEntity {
/** /**
* 部署ID * 部署ID
*/ */
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id_department", nullable = false) @Column(name = "id_department", nullable = false)
private Integer idDepartment; private Integer idDepartment;
/** /**
* 部署名 * 部署名
*/ */
@Column(name = "nm_department", nullable = false) @Column(name = "nm_department", nullable = false)
private String nmDepartment; private String nmDepartment;
/** /**
* DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。 * DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。
* *
* @param departmentEntityList department Table のリスト * @param departmentEntityList department Table のリスト
* @return List<Department> リスト * @return List<Department> リスト
*/ */
public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) { public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
// Stream API を利用するとこうなります。 // Stream API を利用するとこうなります。
return departmentEntityList return departmentEntityList
.stream() .stream()
.map(departmentEntity -> new Department( .map(departmentEntity -> new Department(
departmentEntity.getIdDepartment(), departmentEntity.getIdDepartment(),
departmentEntity.getNmDepartment() departmentEntity.getNmDepartment()))
)).toList(); .toList();
} }
/**
* Department（BusinessLogic層依存型） から DepartmentEntity（DataAccess層依存）に変換します。
*
* @param department department モデルの値
* @return DepartmentEntity に変換したインスタンス
*/
public static DepartmentEntity convertFrom(Department department) {
return new DepartmentEntity(
department.getIdDepartment(),
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());
}
/**
* Department（BusinessLogic層依存型） から DepartmentEntity（DataAccess層依存）に変換します。
*
* @param department department モデルの値
* @return DepartmentEntity に変換したインスタンス
*/
public static DepartmentEntity convertFrom(Department department) {
return new DepartmentEntity(
department.getIdDepartment(),
department.getNmDepartment()
);
}
} }

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

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

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

@@ -2,7 +2,6 @@ package com.example.rhizome.app.presentation.controller;
import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*; import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
import java.util.Objects;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -24,24 +23,20 @@ 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.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.LoginUserForm; import com.example.rhizome.app.presentation.form.LoginUserForm;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.MessageForm;
/** /**
* 削除処理のコントロータ * 削除処理のコントローラ
*/ */
@Controller @Controller
public class DeleteDepartmentController { public class DeleteDepartmentController {
// ログ出力用インスタンス // ログ出力用インスタンス
private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName()); private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
// エラーメッセージ用の定数フィールド // エラーメッセージ用の定数フィールド
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
final String UNKNOWN_ID = "削除対象のIDが不明です。";
final String DELETE_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除できません。";
final String DELETE_COMPLETE = "削除しました。";
HttpSession httpSession; HttpSession httpSession;
DeleteDepartment deleteDepartment; DeleteDepartment deleteDepartment;
@@ -68,30 +63,22 @@ public class DeleteDepartmentController {
@SessionCheck @SessionCheck
@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST) @RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) { public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
try { try {
if (idDepartment == null) { // 部署一覧を取得し、画面に返す用のクラスに詰め替える
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, UNKNOWN_ID); // 作成した部署一覧をセット
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, model.addAttribute(
DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML; DepartmentForm.convertFrom(searchDepartment.selectAll()));
} else {
// 部署一覧を取得し、画面に返す用のクラスに詰め替える // 削除処理実施
// 作成した部署一覧をセット deleteExec(
model.addAttribute( model,
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, idDepartment,
DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
// 削除処理実施 // 検索画面に遷移
deleteExec( return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
model,
idDepartment,
LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
// 検索画面に遷移
return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
}
} catch (Exception e) { } catch (Exception e) {
// ログイン情報の破棄 // ログイン情報の破棄
httpSession.invalidate(); httpSession.invalidate();
@@ -111,22 +98,25 @@ public class DeleteDepartmentController {
* @param idDepartment 削除対象のdepartmentId * @param idDepartment 削除対象のdepartmentId
* @param loginUser ログインユーザー情報 * @param loginUser ログインユーザー情報
*/ */
private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) { private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
// 1名以上が所属している場合 final String DELETE_COMPLETE = "削除しました。";
if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) { 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, model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ID_TO_DELETED_IS_UNKNOWN));
new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
// 検索画面に遷移
return; 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); deleteDepartment.deleteDepartment(idDepartment);
;
// 削除完了したメッセージをセット // 削除完了したメッセージをセット
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE)); model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));

4
src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java
View File

@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; 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.SessionKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.LoginUserForm; import com.example.rhizome.app.presentation.form.LoginUserForm;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.MessageForm;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentInfoForm.convertFrom(searchDepartment.selectAll()) DepartmentForm.convertFrom(searchDepartment.selectAll())
); );
// 削除処理実施 // 削除処理実施

4
src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java
View File

@@ -9,7 +9,7 @@ import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl; import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.InsertEmployeeForm; import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.MessageForm;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +75,7 @@ public class InsertEmployeeConfirmController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentInfoForm.convertFrom( DepartmentForm.convertFrom(
searchDepartment.selectAll() searchDepartment.selectAll()
)); ));

4
src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java
View File

@@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl; import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.InsertEmployeeForm; import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.MessageForm;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ public class InsertEmployeeController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentInfoForm.convertFrom( DepartmentForm.convertFrom(
searchDepartment.selectAll() searchDepartment.selectAll()
)); ));

4
src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java
View File

@@ -6,7 +6,7 @@ import com.example.rhizome.app.domain.service.RegisterEmployee;
import com.example.rhizome.app.domain.service.SearchDepartment; import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.InsertEmployeeForm; import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -64,7 +64,7 @@ public class InsertEmployeeInputController {
try { try {
// 部署コードリストを作成し、画面に返す値としてセット // 部署コードリストを作成し、画面に返す値としてセット
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
// パラメータをセット // パラメータをセット
model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm); model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);

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

@@ -18,11 +18,15 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.domain.service.SearchEmployeeInfo; 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.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.SearchConditionDepartment; import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
/**
* 部署画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
*/
@Controller @Controller
public class SelectDepartmentController { public class SelectDepartmentController {
// ログ出力用インスタンス // ログ出力用インスタンス
private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName()); private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
// エラーメッセージ用の定数フィールド // エラーメッセージ用の定数フィールド
@@ -41,41 +45,40 @@ public class SelectDepartmentController {
} }
@ModelAttribute @ModelAttribute
public SearchConditionDepartment searchConditionDepartment() { public SearchConditionDepartmentForm searchConditionDepartmentForm() {
return new SearchConditionDepartment(); return new SearchConditionDepartmentForm();
} }
/** /**
* 社員検索画面表示処理コントローラ * 社員検索画面表示処理コントローラ
* *
* @param searchConditionDepartment 検索画面のフォーム * @param searchConditionDepartmentForm 検索画面のフォーム
* @param model ビューにデータを渡すためのコンテナ * @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面 * @return 遷移先の画面
*/ */
@PermissionCheck @PermissionCheck
@SessionCheck @SessionCheck
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST) @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
public String select(SearchConditionDepartment searchConditionDepartment, Model model) { public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
try { try {
// 部署一覧を取得し、画面に返す用のクラスに詰め替える // 部署一覧を取得し、画面に返す用のクラスに詰め替える
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); DepartmentForm.convertFrom(searchDepartment.selectAll()));
// 検索条件を元に検索を実施 // 検索条件を元に検索を実施
// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom( searchDepartment
searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment)))); .searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
// 検索ページに遷移 // 検索ページに遷移
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML; return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
} catch (Exception e) { } catch (Exception e) {
// ログイン情報の破棄 // ログイン情報の破棄
httpSession.invalidate(); httpSession.invalidate();
e.printStackTrace(); e.printStackTrace();
// エラーログ出力 // エラーログ出力
@@ -83,6 +86,7 @@ public class SelectDepartmentController {
// エラー画面遷移 // エラー画面遷移
return TransitionTargetPageNameKeyword.ERROR_HTML; return TransitionTargetPageNameKeyword.ERROR_HTML;
} }
} }
/** /**
@@ -101,14 +105,10 @@ public class SelectDepartmentController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); DepartmentForm.convertFrom(searchDepartment.selectAll()));
// 検索条件を元に検索を実施
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentInfoForm.convertFrom(
searchDepartment.searchBy(SearchConditionDepartment.convertTo(searchConditionDepartment()))));
// 検索ページに遷移 // 検索ページに遷移
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML; return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
} }
} }

29
src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java
View File

@@ -1,26 +1,24 @@
package com.example.rhizome.app.presentation.controller; 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.PermissionCheck;
import com.example.rhizome.aop.aspect.SessionCheck; import com.example.rhizome.aop.aspect.SessionCheck;
import com.example.rhizome.app.domain.service.SearchDepartment; import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.domain.service.SearchEmployeeInfo; 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.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.EmployeeInfoForm; import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm; import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
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 javax.servlet.http.HttpSession;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能 * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -67,10 +65,11 @@ public class SelectEmployeeController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentInfoForm.convertFrom(searchDepartment.selectAll()) DepartmentForm.convertFrom(searchDepartment.selectAll())
); );
// 検索条件を元に検索を実施 // 検索条件を元に検索を実施
// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm)))); model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
// 検索ページに遷移 // 検索ページに遷移
return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML; return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
@@ -106,7 +105,7 @@ public class SelectEmployeeController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentInfoForm.convertFrom(searchDepartment.selectAll()) DepartmentForm.convertFrom(searchDepartment.selectAll())
); );
// 検索条件を元に検索を実施 // 検索条件を元に検索を実施

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

@@ -1,6 +1,5 @@
package com.example.rhizome.app.presentation.controller; package com.example.rhizome.app.presentation.controller;
import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -16,59 +15,57 @@ import org.springframework.web.bind.annotation.RequestParam;
import com.example.rhizome.aop.aspect.PermissionCheck; import com.example.rhizome.aop.aspect.PermissionCheck;
import com.example.rhizome.aop.aspect.SessionCheck; 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.SearchDepartment;
import com.example.rhizome.app.domain.service.SearchEmployee; import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
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.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.SearchConditionDepartment; import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
/**
* 更新対象の Department が存在するか確認する為のコントローラ
*/
@Controller @Controller
public class UpdateDepartmentController { public class UpdateDepartmentController {
// ログ出力用インスタンス
private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
private static final String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; // ログ出力用インスタンス
private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
// エラーメッセージ用の定数フィールド
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
HttpSession httpSession; HttpSession httpSession;
UpdateDepartment updateDepartment;
SearchDepartment searchDepartment; SearchDepartment searchDepartment;
SearchEmployee searchEmployee; SearchEmployeeInfo searchEmployeeInfo;
@Autowired @Autowired
public UpdateDepartmentController(UpdateDepartment updateDepartment, SearchDepartment searchDepartment, public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
HttpSession httpSession, SearchEmployee searchEmployee) { SearchEmployeeInfo searchEmployeeInfo) {
this.httpSession = httpSession; this.httpSession = httpSession;
this.updateDepartment = updateDepartment;
this.searchDepartment = searchDepartment; this.searchDepartment = searchDepartment;
this.searchEmployee = searchEmployee; this.searchEmployeeInfo = searchEmployeeInfo;
} }
@ModelAttribute @ModelAttribute
public SearchConditionDepartment searchConditionDepartment() { public SearchConditionEmployeeForm searchConditionEmployeeForm() {
return new SearchConditionDepartment(); return new SearchConditionEmployeeForm();
} }
/**
* 更新対象の department が存在するか確認する為のコントローラ
*
* @param idDepartment 更新対象の employee の id
* @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面
*/
@PermissionCheck @PermissionCheck
@SessionCheck @SessionCheck
@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST) @RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DAPERTMENT, method = RequestMethod.POST)
public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) { public String showUpdateDepatment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。"; final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
try { try {
List<Department> departmentList = searchDepartment // 部署一覧を取得し画面に返す値としてセット
.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(idDepartment, null)); model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
if (departmentList.isEmpty()) { DepartmentForm.convertFrom(searchDepartment.searchDepartmentByIdDepartment(idDepartment)));
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO;
}
// 更新画面に遷移
model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM,
UpdateDepartmentForm.convertFrom(departmentList.get(0)));
// Update画面に遷移 // Update画面に遷移
return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML; return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
@@ -82,57 +79,7 @@ public class UpdateDepartmentController {
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// エラー画面遷移 // エラー画面遷移
return TransitionTargetPageNameKeyword.ERROR_HTML; return TransitionTargetPageNameKeyword.ERROR_HTML;
}
}
@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
final String NOTHING = "項目が空欄です。";
final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
final String NO_TARGET = "更新対象のデータが見つかりません。";
final String UPDATE_COMPLETE = "更新が完了しました。";
try {
boolean bo = updateDepartmentForm.hasRequiredValue();
if (bo == false) {
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
new MessageForm(NOTHING));
return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
}
List<Department> departmentList = searchDepartment
.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(null,
updateDepartmentForm.getNmDepartment()));
if (departmentList == null && departmentList.isEmpty()){
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
new MessageForm(DUPLICATION));
return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
}
List<Department> departmentList2 = searchDepartment
.searchBy(new com.example.rhizome.app.domain.model.SearchConditionDepartment(
updateDepartmentForm.getIdDepartment(), null));
if (departmentList2 == null || departmentList2.isEmpty()) {
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
new MessageForm(NO_TARGET));
return PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM;
}
Department department = new Department(updateDepartmentForm.getIdDepartment(),
updateDepartmentForm.getNmDepartment());
updateDepartment.updateDepartment(department);
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO,
new MessageForm(UPDATE_COMPLETE));
return PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM;
} catch (Exception e) {
// ログイン情報の破棄
httpSession.invalidate();
e.printStackTrace();
// エラーログ出力
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// エラー画面遷移
return TransitionTargetPageNameKeyword.ERROR_HTML;
} }
} }
} }

129
src/main/java/com/example/rhizome/app/presentation/controller/UpdateDepartmentResultController.java Normal file
View File

@@ -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;
}
}
}

4
src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java
View File

@@ -8,7 +8,7 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.domain.service.SearchEmployeeInfo; 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.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.MessageForm;
import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm; import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm; import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -67,7 +67,7 @@ public class UpdateEmployeeController {
try { try {
// 部署一覧を取得し画面に返す値としてセット // 部署一覧を取得し画面に返す値としてセット
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
// id を条件に更新対象のレコードを検索、取得する // id を条件に更新対象のレコードを検索、取得する
List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy( List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(

4
src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java
View File

@@ -11,7 +11,7 @@ import com.example.rhizome.app.domain.service.UpdateEmployee;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; 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.SessionKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentInfoForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.LoginUserForm; import com.example.rhizome.app.presentation.form.LoginUserForm;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.MessageForm;
import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm; import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -91,7 +91,7 @@ public class UpdateEmployeeResultController {
try { try {
// 部署一覧取得 // 部署一覧取得
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll())); model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
// パスワードが仕様を満たしているか確認 // パスワードが仕様を満たしているか確認
String error = UpdateEmployeeInfoForm.validatePassword( String error = UpdateEmployeeInfoForm.validatePassword(

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

@@ -5,15 +5,16 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
*/ */
public class PageReturnAttributeKeyword { 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 LOGIN_INFO_FORM = "loginInfoForm"; public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm"; public static final String LOGIN_INFO_FORM = "loginInfoForm";
public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList"; public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentForm"; public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentInfoForm";
} }

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

@@ -21,9 +21,9 @@ public class TransitionTargetPageNameKeyword {
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 SELECT_DEPARTMENT_HTML = "/selectDepartment";
public static final String ERROR_HTML = "error"; public static final String ERROR_HTML = "error";
public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
// 共通(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 = "/";
@@ -44,10 +44,19 @@ public class TransitionTargetPageNameKeyword {
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
// 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 = "/selectDepartmentInfo";
public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll"; public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
public static final String DELETE_DEPARTMENT = "/deleteDepartment"; public static final String DELETE_DEPARTMENT = "/deleteDepartment";
public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment"; 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"; public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
/** /**
@@ -63,6 +72,7 @@ public class TransitionTargetPageNameKeyword {
INDEX_LOGIN, INDEX_LOGIN,
LOGOUT, LOGOUT,
DO_LOGIN, DO_LOGIN,
DELETE_EMPLOYEE,
INSERT_EMPLOYEE_INPUT, INSERT_EMPLOYEE_INPUT,
INSERT_EMPLOYEE_CONFIRM, INSERT_EMPLOYEE_CONFIRM,
INSERT_EMPLOYEE, INSERT_EMPLOYEE,
@@ -74,7 +84,7 @@ public class TransitionTargetPageNameKeyword {
SELECT_DEPARTMENT_INFO, SELECT_DEPARTMENT_INFO,
SELECT_DEPARTMENT_INFO_FORM_EMPTY, SELECT_DEPARTMENT_INFO_FORM_EMPTY,
DELETE_DEPARTMENT, DELETE_DEPARTMENT,
SHOW_UPDATE_DEPARTMENT, SHOW_UPDATE_DAPERTMENT,
UPDATE_DEPARTMENT_RESULT); UPDATE_DEPARTMENT_RESULT);
} }

10
src/main/java/com/example/rhizome/app/presentation/form/DepartmentInfoForm.java → src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class DepartmentInfoForm { public class DepartmentForm {
/** /**
* 部署ID * 部署ID
*/ */
@@ -30,8 +30,8 @@ public class DepartmentInfoForm {
* @param department business 層の Department インスタンス * @param department business 層の Department インスタンス
* @return 画面用（presentation 層）の DepartmentForm インスタンス * @return 画面用（presentation 層）の DepartmentForm インスタンス
*/ */
public static DepartmentInfoForm convertFrom(Department department) { public static DepartmentForm convertFrom(Department department) {
return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment()); return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
} }
/** /**
@@ -41,7 +41,7 @@ public class DepartmentInfoForm {
* @param departmentList business 層の Department インスタンスのリスト * @param departmentList business 層の Department インスタンスのリスト
* @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
*/ */
public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) { public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList(); return departmentList.stream().map(DepartmentForm::convertFrom).toList();
} }
} }

50
src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartment.java
View File

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

51
src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java Normal file
View File

@@ -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 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartmentForm に
* 変換します。
*
* @param searchConditionDepartment business 層の SearchConditionDepartment インスタンス
* @return 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
*/
public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
return new SearchConditionDepartmentForm(
searchConditionDepartment.getIdDepartment(),
searchConditionDepartment.getNmDepartment());
}
/**
* 画面用（presentation 層）の SearchConditionDepartmentForm クラスから business 層の SearchConditionDepartment クラスに
* 変換します。
*
* @param searchConditionDepartmentForm 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
* @return business 層の SearchConditionDepartment インスタンス
*/
public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
return new SearchConditionDepartment(
searchConditionDepartmentForm.getIdDepartment(),
searchConditionDepartmentForm.getNmDepartment());
}
}

48
src/main/java/com/example/rhizome/app/presentation/form/UpdateDepartmentForm.java
View File

@@ -1,48 +0,0 @@
package com.example.rhizome.app.presentation.form;
import com.example.rhizome.app.domain.model.Department;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UpdateDepartmentForm {
//部署ID
private Integer idDepartment;
//部署名
private String nmDepartment;
/**
* business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentForm に
* 変換します。
*
* @param departmentInfo business 層の DepartmentInfo インスタンス
* @return 画面用（presentation 層）の UpdateDepartmentForm インスタンス
*/
public static UpdateDepartmentForm convertFrom(Department department) {
return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
}
/**
* 画面用（presentation 層）の UpdateDepartmentForm クラスから business 層の Department クラスに
* 変換します。
*
* @param updateDepartmentForm 画面用（presentation 層）の UpdateDepartmentForm インスタンス
* @return business 層の Department インスタンス
*/
public static Department convertTo(UpdateDepartmentForm form) {
return new Department(form.getIdDepartment(), form.getNmDepartment());
}
public boolean hasRequiredValue() {
if (idDepartment == null && (nmDepartment == null || nmDepartment.isBlank())) {
return false;
} else {
return true;
}
}
}

91
src/main/java/com/example/rhizome/app/presentation/form/UpdateDepartmentInfoForm.java Normal file
View File

@@ -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();
}
}

176
src/main/resources/templates/menu.html
View File

@@ -3,121 +3,125 @@
<head> <head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<!-- 外部のスクリプトファイルを読み込む --> <!-- 外部のスクリプトファイルを読み込む -->
<script th:src="@{/js/common.js}"></script> <script th:src="@{/js/common.js}"></script>
<!-- CSSの読み込み --> <!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.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> <title>メニュー</title>
</head> </head>
<body> <body>
<h1> <h1>
メインメニュー　　　 メインメニュー　　　
<div class="rightSection"> <div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span> <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button> <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div> </div>
</h1> </h1>
<table class="menuClass"> <table class="menuClass">
<tr> <tr>
<td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a> <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
</td> </td>
<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td> <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i>部署検索</a> </tr>
</td>
<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
</tr>
<tr> <tr>
<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td> <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
<td class="description">新規でユーザ追加を行います。</td> <td class="description">新規でユーザ追加を行います。</td>
<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a> </tr>
</td> <tr>
<td class="description">新規で部署追加を行います。</td> <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> </table>
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
function selectEmployeeSubmit() { function selectEmployeeSubmit() {
const form = document.createElement('form'); const form = document.createElement('form');
form.setAttribute('method', 'post'); form.setAttribute('method', 'post');
form.setAttribute('action', 'selectEmployeeInfo'); form.setAttribute('action', 'selectEmployeeInfo');
// 動的送信用のHidden // 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input"); const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden"); inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "selectEmployeeInfo"); inputField.setAttribute("value", "selectEmployeeInfo");
form.appendChild(inputField); form.appendChild(inputField);
// フォームをDOMに追加 // フォームをDOMに追加
document.body.appendChild(form); document.body.appendChild(form);
form.submit(); form.submit();
} }
function selectDepartmentSubmit() { function selectDepartmentSubmit() {
const form = document.createElement('form'); const form = document.createElement('form');
form.setAttribute('method', 'post'); form.setAttribute('method', 'post');
form.setAttribute('action', 'selectDepartmentInfo'); form.setAttribute('action', 'selectDepartmentInfo');
// 動的送信用のHidden // 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input"); const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden"); inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "selectDepartment"); inputField.setAttribute("value", "selectDepartment");
form.appendChild(inputField); form.appendChild(inputField);
// フォームをDOMに追加 // フォームをDOMに追加
document.body.appendChild(form); document.body.appendChild(form);
form.submit(); form.submit();
} }
function insertEmployeeSubmit() { function insertEmployeeSubmit() {
const form = document.createElement('form'); const form = document.createElement('form');
form.setAttribute('method', 'post'); form.setAttribute('method', 'post');
form.setAttribute('action', 'insertEmployeeInput'); form.setAttribute('action', 'insertEmployeeInput');
// 動的送信用のHidden // 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input"); const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden"); inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "insertEmployeeInput"); inputField.setAttribute("value", "insertEmployeeInput");
form.appendChild(inputField); form.appendChild(inputField);
// フォームをDOMに追加 // フォームをDOMに追加
document.body.appendChild(form); document.body.appendChild(form);
form.submit(); form.submit();
} }
function insertDepartmentSubmit() { function insertDepartmentSubmit() {
const form = document.createElement('form'); const form = document.createElement('form');
form.setAttribute('method', 'post'); form.setAttribute('method', 'post');
form.setAttribute('action', 'insertDepartmentInput'); form.setAttribute('action', 'insertDepartmentInput');
// 動的送信用のHidden // 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input"); const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden"); inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "insertDepartmentInput"); inputField.setAttribute("value", "insertDepartmentInput");
form.appendChild(inputField); form.appendChild(inputField);
// フォームをDOMに追加 // フォームをDOMに追加
document.body.appendChild(form); document.body.appendChild(form);
form.submit(); form.submit();
} }
</script> </script>
</html> </html>

195
src/main/resources/templates/selectDepartment.html
View File

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

71
src/main/resources/templates/updateDepartmentForm.html
View File

@@ -1,71 +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="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
th:object="${updateDepartmentForm}">
<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 class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
</td>
</tr>
<tr>
<th class="header">部署名</th>
<td>
<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
type="text" />
</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', 'departmentAll');
// 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "departmentAll");
form.appendChild(inputField);
// フォームをDOMに追加
document.body.appendChild(form);
form.submit();
}
</script>
</html>

129
src/main/resources/templates/updateDepartmentInput.html
View File

@@ -3,69 +3,86 @@
<head> <head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<!-- 外部のスクリプトファイルを読み込む --> <!-- 外部のスクリプトファイルを読み込む -->
<script th:src="@{/js/common.js}"></script> <script th:src="@{/js/common.js}"></script>
<!-- CSSの読み込み --> <!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.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> <title>部署情報更新</title>
</head> </head>
<body> <body>
<h1> <h1>
部署情報更新　　　 部署情報更新　　　
<div class="rightSection"> <div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span> <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button> <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div> </div>
</h1> </h1>
<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');" <form action="/updateDepartmentResult"
th:object="${updateDepartmentForm}"> method="post"
onsubmit="return confirm('本当によろしいですか？');"
<div class="msgBox error" th:if="${messageError != null}"> th:object="${departmentFormList}"
<span class="error" th:text="${messageError.message}"></span> >
</div> <div class="msgBox error" th:if="${messageError != null}">
<table> <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
<tr> </div>
<th class="header">部署ID</th> <table>
<td> <tr>
<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" /> <th class="header">部署ID</th>
</td> <td>
</tr> <label>
<tr> <input class="readOnly"
<th class="header">部署名</th> readonly="readonly"
<td> th:field="*{idDepartment}"
<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}" type="text"
type="text" /> />
</td> </label>
</tr> </td>
<tr> </tr>
<td class="btnArea" colspan="2"><input type="submit" value="更新" /></td> <tr>
</tr> <th class="header">部署名</th>
</table> <td>
</form> <label>
<a href="javascript:selectSubmit()">一覧に戻る</a> <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> </body>
<script>
function selectSubmit() {
const form = document.createElement('form');
form.setAttribute('method', 'post');
form.setAttribute('action', 'departmentAll');
// 動的送信用のHidden <script>
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない function selectSubmit() {
const inputField = document.createElement("input"); const form = document.createElement('form');
inputField.setAttribute("type", "hidden"); form.setAttribute('method', 'post');
inputField.setAttribute("value", "departmentAll"); form.setAttribute('action', 'departmentAll');
form.appendChild(inputField); // 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "departmentAll");
// フォームをDOMに追加 form.appendChild(inputField);
document.body.appendChild(form);
form.submit(); // フォームをDOMに追加
} document.body.appendChild(form);
</script>
form.submit();
}
</script>
</html> </html>

294
src/main/resources/templates/updateEmployeeInput.html
View File

@@ -3,151 +3,179 @@
<head> <head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<!-- 外部のスクリプトファイルを読み込む --> <!-- 外部のスクリプトファイルを読み込む -->
<script th:src="@{/js/common.js}"></script> <script th:src="@{/js/common.js}"></script>
<!-- CSSの読み込み --> <!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.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> <title>社員情報更新</title>
</head> </head>
<body> <body>
<h1> <h1>
社員情報更新　　　 社員情報更新　　　
<div class="rightSection"> <div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span> <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button> <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div> </div>
</h1> </h1>
<form action="/updateEmployeeResult" method="post" onsubmit="return confirm('本当によろしいですか？');" <form action="/updateEmployeeResult"
th:object="${updateEmployeeInfoForm}"> method="post"
<div class="msgBox error" th:if="${messageError != null}"> onsubmit="return confirm('本当によろしいですか？');"
<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span> th:object="${updateEmployeeInfoForm}"
</div> >
<table> <div class="msgBox error" th:if="${messageError != null}">
<tr> <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
<th class="header">社員ID</th> </div>
<td> <table>
<label> <tr>
<input class="readOnly" readonly="readonly" th:field="*{idEmployee}" type="text" /> <th class="header">社員ID</th>
</label> <td>
</td> <label>
</tr> <input class="readOnly"
<tr> readonly="readonly"
<th class="header">社員名</th> th:field="*{idEmployee}"
<td> type="text"
<label> />
<input maxlength="50" placeholder="社員名" required="required" th:field="*{nmEmployee}" </label>
type="text" /> </td>
</label> </tr>
</td> <tr>
</tr> <th class="header">社員名</th>
<tr> <td>
<th class="header">社員名フリガナ</th> <label>
<td> <input maxlength="50"
<label> placeholder="社員名"
<input maxlength="50" oninput="convertToKatakana(this)" placeholder="フリガナ" required="required" required="required"
th:field="*{knEmployee}" type="text" /> th:field="*{nmEmployee}"
</label> type="text"
</td> />
</tr> </label>
<tr> </td>
<th class="header">メールアドレス</th> </tr>
<td> <tr>
<label> <th class="header">社員名フリガナ</th>
<input maxlength="100" placeholder="メールアドレス" required="required" th:field="*{mailAddress}" <td>
type="email" /> <label>
</label> <input maxlength="50"
</td> oninput="convertToKatakana(this)"
</tr> placeholder="フリガナ"
<tr> required="required"
<th class="header">パスワード</th> th:field="*{knEmployee}"
<td> type="text"
<label> />
<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード" </label>
th:field="*{password}" type="password" /> </td>
</label> </tr>
</td> <tr>
</tr> <th class="header">メールアドレス</th>
<!-- *** Chrome等のブラウザの場合自動でセットされる可能性があるので注意書きを外にも *** --> <td>
<tr> <label>
<th></th> <input maxlength="100"
<td> placeholder="メールアドレス"
<span style="font-size:8pt; required="required"
th:field="*{mailAddress}"
type="email"
/>
</label>
</td>
</tr>
<tr>
<th class="header">パスワード</th>
<td>
<label>
<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
placeholder="パスワード"
th:field="*{password}"
type="password"
/>
</label>
</td>
</tr>
<!-- *** Chrome等のブラウザの場合自動でセットされる可能性があるので注意書きを外にも *** -->
<tr>
<th></th>
<td>
<span style="font-size:8pt;
font-weight:bold; font-weight:bold;
color:red;"> color:red;">
※半角英数字をそれぞれ1種類以上含む3-10文字 ※半角英数字をそれぞれ1種類以上含む3-10文字
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<th class="header">パスワード確認用</th> <th class="header">パスワード確認用</th>
<td> <td>
<label> <label>
<input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$" placeholder="パスワード確認用" <input pattern="^(?=.*?[a-zA-Z])(?=.*?\d)[a-zA-Z\d]{3,10}$"
th:field="*{passwordConfirm}" type="password" /> placeholder="パスワード確認用"
</label> th:field="*{passwordConfirm}"
</td> type="password"
</tr> />
<tr> </label>
<th class="header">管理者権限</th> </td>
<td> </tr>
<label> <tr>
<input id="adminAuth1" name="adminAuth" th:checked="${updateEmployeeInfoForm.adminAuth == 1}" <th class="header">管理者権限</th>
type="radio" value="1"> 管理者権限 <td>
</label> <label>
<label> <input id="adminAuth1" name="adminAuth" th:checked="${updateEmployeeInfoForm.adminAuth == 1}"
<input id="adminAuth0" name="adminAuth" type="radio"
th:checked="${updateEmployeeInfoForm.adminAuth == null or updateEmployeeInfoForm.adminAuth == 0}" value="1"> 管理者権限
type="radio" value="0"> </label>
一般権限 <label>
</label> <input id="adminAuth0" name="adminAuth"
</td> th:checked="${updateEmployeeInfoForm.adminAuth == null or updateEmployeeInfoForm.adminAuth == 0}"
</tr> type="radio"
<tr> value="0">
<th class="header">所属部署</th> 一般権限
<td> </label>
<label> </td>
<select required="required" th:field="*{idDepartment}"> </tr>
<option th:each="department : ${departmentFormList}" <tr>
th:selected="${updateEmployeeInfoForm.idDepartment != null && department.idDepartment == updateEmployeeInfoForm.idDepartment}" <th class="header">所属部署</th>
th:text="${department.nmDepartment}" th:value="${department.idDepartment}"> <td>
</option> <label>
</select> <select required="required" th:field="*{idDepartment}">
</label> <option th:each="department : ${departmentFormList}"
</td> th:selected="${updateEmployeeInfoForm.idDepartment != null && department.idDepartment == updateEmployeeInfoForm.idDepartment}"
</tr> th:text="${department.nmDepartment}"
<tr> th:value="${department.idDepartment}">
<td class="btnArea" colspan="2"> </option>
<input type="submit" value="更新" /> </select>
</td> </label>
</tr> </td>
</table> </tr>
</form> <tr>
<a href="javascript:selectSubmit()">一覧に戻る</a> <td class="btnArea" colspan="2">
<input type="submit" value="更新"/>
</td>
</tr>
</table>
</form>
<a href="javascript:selectSubmit()">一覧に戻る</a>
</body> </body>
<script> <script>
function selectSubmit() { function selectSubmit() {
const form = document.createElement('form'); const form = document.createElement('form');
form.setAttribute('method', 'post'); form.setAttribute('method', 'post');
form.setAttribute('action', 'selectAll'); form.setAttribute('action', 'selectAll');
// 動的送信用のHidden // 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input"); const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden"); inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "selectAll"); inputField.setAttribute("value", "selectAll");
form.appendChild(inputField); form.appendChild(inputField);
// フォームをDOMに追加 // フォームをDOMに追加
document.body.appendChild(form); document.body.appendChild(form);
form.submit(); form.submit();
} }
</script> </script>
</html> </html>