Compare commits
6 Commits
h-hein
...
s-sakiyama
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b8d83e714 | ||
|
|
647630e1a7 | ||
|
|
182f901a4d | ||
|
|
0f1141e689 | ||
|
|
815d957a31 | ||
|
|
4c134b81b8 |
@@ -1,16 +1,17 @@
|
||||
package com.example.rhizome.aop.aspect;
|
||||
|
||||
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;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Before;
|
||||
import org.aspectj.lang.annotation.Pointcut;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
|
||||
import com.example.rhizome.app.presentation.form.LoginUserForm;
|
||||
import com.example.rhizome.exception.InsufficientPermissionException;
|
||||
|
||||
/**
|
||||
* 権限チェック用のAOP
|
||||
@@ -19,96 +20,95 @@ import javax.servlet.http.HttpServletRequest;
|
||||
@Component
|
||||
public class PermissionCheckAspect {
|
||||
|
||||
HttpServletRequest request;
|
||||
HttpServletRequest request;
|
||||
|
||||
@Autowired
|
||||
public PermissionCheckAspect(HttpServletRequest request) {
|
||||
this.request = request;
|
||||
}
|
||||
@Autowired
|
||||
public PermissionCheckAspect(HttpServletRequest request) {
|
||||
this.request = request;
|
||||
}
|
||||
|
||||
// Aspectのフックを定義(今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング)
|
||||
@Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
|
||||
public void permissionCheckMethod() {
|
||||
}
|
||||
// Aspectのフックを定義(今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング)
|
||||
@Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
|
||||
public void permissionCheckMethod() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 権限チェック
|
||||
*/
|
||||
@Before("permissionCheckMethod()")
|
||||
public void checkPermission() {
|
||||
// ログインユーザの取得
|
||||
LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
|
||||
/**
|
||||
* 権限チェック
|
||||
*/
|
||||
@Before("permissionCheckMethod()")
|
||||
public void checkPermission() {
|
||||
// ログインユーザの取得
|
||||
LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
|
||||
|
||||
// ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移
|
||||
if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
|
||||
throw new InsufficientPermissionException("不正な遷移です");
|
||||
}
|
||||
// ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移
|
||||
if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
|
||||
throw new InsufficientPermissionException("不正な遷移です");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 遷移先のURLとログインユーザの権限から、遷移可否を判定する
|
||||
*
|
||||
* @param targetURL 遷移したいURL
|
||||
* @param loginUserForm リクエスト元のユーザ
|
||||
* @return true:遷移可 false:遷移不可
|
||||
*/
|
||||
private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
|
||||
/**
|
||||
* 遷移先のURLとログインユーザの権限から、遷移可否を判定する
|
||||
*
|
||||
* @param targetURL 遷移したいURL
|
||||
* @param loginUserForm リクエスト元のユーザ
|
||||
* @return true:遷移可 false:遷移不可
|
||||
*/
|
||||
private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
|
||||
|
||||
// 管理者権限
|
||||
if (isAdminTransition(targetURL, loginUserForm)) {
|
||||
return true;
|
||||
}
|
||||
// 管理者権限
|
||||
if (isAdminTransition(targetURL, loginUserForm)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// 一般権限
|
||||
if (isUserTransition(targetURL, loginUserForm)) {
|
||||
return true;
|
||||
}
|
||||
// 一般権限
|
||||
if (isUserTransition(targetURL, loginUserForm)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// アクセス不許可の場合の処理(不正アクセス画面に遷移)
|
||||
return false;
|
||||
// アクセス不許可の場合の処理(不正アクセス画面に遷移)
|
||||
return false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 管理者用のアカウントで管理者向けのページアクセスか
|
||||
*
|
||||
* @param targetURL 遷移したいURL
|
||||
* @param loginUserForm リクエスト元のユーザ
|
||||
* @return true:遷移可 false:遷移不可
|
||||
*/
|
||||
private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
|
||||
/**
|
||||
* 管理者用のアカウントで管理者向けのページアクセスか
|
||||
*
|
||||
* @param targetURL 遷移したいURL
|
||||
* @param loginUserForm リクエスト元のユーザ
|
||||
* @return true:遷移可 false:遷移不可
|
||||
*/
|
||||
private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
|
||||
|
||||
// 管理者か
|
||||
if (!loginUserForm.isAdminUser()) {
|
||||
return false;
|
||||
}
|
||||
// 管理者か
|
||||
if (!loginUserForm.isAdminUser()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 管理者向けのページ遷移か
|
||||
if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
|
||||
return false;
|
||||
}
|
||||
// 管理者向けのページ遷移か
|
||||
if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか
|
||||
*
|
||||
* @param targetURL 遷移したいURL
|
||||
* @param loginUserForm リクエスト元のユーザ
|
||||
* @return true:遷移可 false:遷移不可
|
||||
*/
|
||||
private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
|
||||
/**
|
||||
* 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか
|
||||
*
|
||||
* @param targetURL 遷移したいURL
|
||||
* @param loginUserForm リクエスト元のユーザ
|
||||
* @return true:遷移可 false:遷移不可
|
||||
*/
|
||||
private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
|
||||
|
||||
// 管理者か
|
||||
if (loginUserForm.isAdminUser()) {
|
||||
return false;
|
||||
}
|
||||
// 管理者か
|
||||
if (loginUserForm.isAdminUser()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 一般ユーザ向けのページ遷移か
|
||||
return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
|
||||
// 一般ユーザ向けのページ遷移か
|
||||
return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
package com.example.rhizome.app.domain.service;
|
||||
|
||||
public interface DeleteDepartment {
|
||||
void deleteDepartment(Integer idDepartment);
|
||||
|
||||
}
|
||||
@@ -1,14 +1,17 @@
|
||||
package com.example.rhizome.app.domain.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.example.rhizome.app.domain.model.Department;
|
||||
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface SearchDepartment {
|
||||
List<Department> selectAll();
|
||||
List<Department> 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);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.example.rhizome.app.domain.service;
|
||||
|
||||
import com.example.rhizome.app.domain.model.Department;
|
||||
|
||||
public interface UpdateDepartment {
|
||||
void updateDepartment(Department beforeDepartment, Department updateDepartment);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.example.rhizome.app.domain.service.impl;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.rhizome.app.domain.service.DeleteDepartment;
|
||||
import com.example.rhizome.app.infra.repository.DepartmentRepository;
|
||||
|
||||
/**
|
||||
* Department レコード削除関連の機能を持つサービス
|
||||
*/
|
||||
@Service
|
||||
@Transactional
|
||||
public class DeleteDepartmentImpl implements DeleteDepartment {
|
||||
|
||||
DepartmentRepository departmentRepository;
|
||||
|
||||
@Autowired
|
||||
public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
|
||||
this.departmentRepository = departmentRepository;
|
||||
}
|
||||
|
||||
/**
|
||||
* idDepartment を元に department データを削除
|
||||
*
|
||||
* @param idDepartment 削除対象のidDepartment
|
||||
*/
|
||||
public void deleteDepartment(Integer idDepartment) {
|
||||
departmentRepository.deleteById(idDepartment);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.example.rhizome.app.domain.service.impl;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.rhizome.app.domain.model.Department;
|
||||
import com.example.rhizome.app.domain.service.RegisterDepartment;
|
||||
import com.example.rhizome.app.infra.entity.DepartmentEntity;
|
||||
import com.example.rhizome.app.infra.repository.DepartmentRepository;
|
||||
|
||||
/**
|
||||
* department テーブルの登録系の機能を集約させるサービスクラスです。
|
||||
*/
|
||||
@Service
|
||||
@Transactional
|
||||
public class RegisterDepartmentImpl implements RegisterDepartment {
|
||||
|
||||
DepartmentRepository departmentRepository;
|
||||
|
||||
@Autowired
|
||||
public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
|
||||
this.departmentRepository = departmentRepository;
|
||||
}
|
||||
|
||||
/**
|
||||
* department インスタンスの内容を登録する
|
||||
*
|
||||
* @param department 登録対象のデータ
|
||||
*/
|
||||
|
||||
@Override
|
||||
public void registerDepartment(Department department) {
|
||||
// TODO 自動生成されたメソッド・スタブ
|
||||
departmentRepository.save(DepartmentEntity.convertFrom(department));
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.example.rhizome.app.domain.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.rhizome.app.domain.model.Department;
|
||||
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
|
||||
import com.example.rhizome.app.domain.service.SearchDepartment;
|
||||
import com.example.rhizome.app.infra.entity.DepartmentEntity;
|
||||
import com.example.rhizome.app.infra.repository.DepartmentRepository;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 部署情報検索系の機能を集約させるサービスクラスです。
|
||||
@@ -20,63 +20,69 @@ import java.util.List;
|
||||
@Transactional
|
||||
public class SearchDepartmentImpl implements SearchDepartment {
|
||||
|
||||
DepartmentRepository departmentRepository;
|
||||
DepartmentRepository departmentRepository;
|
||||
|
||||
/**
|
||||
* コンストラクタ
|
||||
*
|
||||
* @param departmentRepository DI対象
|
||||
*/
|
||||
@Autowired
|
||||
public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
|
||||
this.departmentRepository = departmentRepository;
|
||||
}
|
||||
/**
|
||||
* コンストラクタ
|
||||
*
|
||||
* @param departmentRepository DI対象
|
||||
*/
|
||||
@Autowired
|
||||
public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
|
||||
this.departmentRepository = departmentRepository;
|
||||
}
|
||||
|
||||
/**
|
||||
* 部署情報を全件取得する
|
||||
*
|
||||
* @return 取得した部署情報レコード全件
|
||||
*/
|
||||
public List<Department> selectAll() {
|
||||
return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
|
||||
}
|
||||
/**
|
||||
* 部署情報を全件取得する
|
||||
*
|
||||
* @return 取得した部署情報レコード全件
|
||||
*/
|
||||
public List<Department> selectAll() {
|
||||
return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
|
||||
}
|
||||
|
||||
/**
|
||||
* searchConditionDepartment の情報を元に Department のレコードを取得
|
||||
*
|
||||
* @param searchConditionDepartment 検索条件
|
||||
* @return 検索結果のレコード
|
||||
*/
|
||||
public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
|
||||
// 動的に検索条件を絞り込む
|
||||
// Specification は Criteria API の Predicate をラップしたもの
|
||||
return DepartmentEntity
|
||||
.createDepartmentList(
|
||||
departmentRepository.findAll(Specification
|
||||
.where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
|
||||
.and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
|
||||
)
|
||||
);
|
||||
/**
|
||||
* searchConditionDepartment の情報を元に Department のレコードを取得
|
||||
*
|
||||
* @param searchConditionDepartment 検索条件
|
||||
* @return 検索結果のレコード
|
||||
*/
|
||||
public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
|
||||
// 動的に検索条件を絞り込む
|
||||
// Specification は Criteria API の Predicate をラップしたもの
|
||||
return DepartmentEntity
|
||||
.createDepartmentList(
|
||||
departmentRepository.findAll(Specification
|
||||
.where(DepartmentRepository
|
||||
.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
|
||||
.and(DepartmentRepository
|
||||
.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* searchConditionDepartment の情報を元に Department のレコードを取得
|
||||
* 部分一致検索
|
||||
*
|
||||
* @param searchConditionDepartment 検索条件
|
||||
* @return 検索結果のレコード
|
||||
*/
|
||||
public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
|
||||
// 動的に検索条件を絞り込む
|
||||
// Specification は Criteria API の Predicate をラップしたもの
|
||||
return DepartmentEntity
|
||||
.createDepartmentList(
|
||||
departmentRepository.findAll(Specification
|
||||
.where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
|
||||
.and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
|
||||
)
|
||||
);
|
||||
/**
|
||||
* searchConditionDepartment の情報を元に Department のレコードを取得
|
||||
* 部分一致検索
|
||||
*
|
||||
* @param searchConditionDepartment 検索条件
|
||||
* @return 検索結果のレコード
|
||||
*/
|
||||
public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
|
||||
// 動的に検索条件を絞り込む
|
||||
// Specification は Criteria API の Predicate をラップしたもの
|
||||
return DepartmentEntity
|
||||
.createDepartmentList(
|
||||
departmentRepository.findAll(Specification
|
||||
.where(DepartmentRepository
|
||||
.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
|
||||
.and(DepartmentRepository
|
||||
.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
//idDepartmentに合致するレコード取得
|
||||
public Department searchDepartmentByIdDepartment(Integer idDepartment) {
|
||||
return DepartmentEntity
|
||||
.createDepartment(departmentRepository.findByIdDepartment(idDepartment).orElse(new DepartmentEntity()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.example.rhizome.app.domain.service.impl;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.rhizome.app.domain.model.Department;
|
||||
import com.example.rhizome.app.domain.service.UpdateDepartment;
|
||||
import com.example.rhizome.app.infra.entity.DepartmentEntity;
|
||||
import com.example.rhizome.app.infra.repository.DepartmentRepository;
|
||||
|
||||
/**
|
||||
* department の更新系の機能を集約させるサービスクラスです。
|
||||
*/
|
||||
@Service
|
||||
@Transactional
|
||||
public class UpdateDepartmentImpl implements UpdateDepartment {
|
||||
|
||||
DepartmentRepository departmentRepository;
|
||||
|
||||
@Autowired
|
||||
public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
|
||||
this.departmentRepository = departmentRepository;
|
||||
}
|
||||
|
||||
/**
|
||||
* department の情報を元に department table のレコードを更新する
|
||||
*
|
||||
* @param beforeDepartment 更新前のデータ
|
||||
* @param updateDepartment 更新後のデータ
|
||||
*/
|
||||
public void updateDepartment(Department beforeDepartment, Department updateDepartment) {
|
||||
// TODO 自動生成されたメソッド・スタブ
|
||||
departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment, updateDepartment)));
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新前のデータと更新対象のデータをマージする
|
||||
*
|
||||
* @param beforeDepartment 更新前のデータ
|
||||
* @param updateDepartment 更新対象のデータ
|
||||
* @return マージしたデータ
|
||||
*/
|
||||
|
||||
private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
|
||||
return new Department(
|
||||
updateDepartment.getIdDepartment(),
|
||||
updateDepartment.getNmDepartment());
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,15 +6,22 @@
|
||||
*/
|
||||
package com.example.rhizome.app.infra.entity;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
|
||||
import com.example.rhizome.app.domain.model.Department;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Department テーブルの Entity
|
||||
*
|
||||
@@ -27,46 +34,59 @@ import java.util.List;
|
||||
@AllArgsConstructor
|
||||
public class DepartmentEntity {
|
||||
|
||||
/**
|
||||
* 部署ID
|
||||
*/
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id_department", nullable = false)
|
||||
private Integer idDepartment;
|
||||
/**
|
||||
* 部署名
|
||||
*/
|
||||
@Column(name = "nm_department", nullable = false)
|
||||
private String nmDepartment;
|
||||
/**
|
||||
* 部署ID
|
||||
*/
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id_department", nullable = false)
|
||||
private Integer idDepartment;
|
||||
/**
|
||||
* 部署名
|
||||
*/
|
||||
@Column(name = "nm_department", nullable = false)
|
||||
private String nmDepartment;
|
||||
|
||||
/**
|
||||
* DepartmentEntity(DataAccess層依存)から Department(BusinessLogic層依存型)に変換します。
|
||||
*
|
||||
* @param departmentEntityList department Table のリスト
|
||||
* @return List<Department> リスト
|
||||
*/
|
||||
public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
|
||||
/**
|
||||
* DepartmentEntity(DataAccess層依存)から Department(BusinessLogic層依存型)に変換します。
|
||||
*
|
||||
* @param departmentEntityList department Table のリスト
|
||||
* @return List<Department> リスト
|
||||
*/
|
||||
public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
|
||||
|
||||
// Stream API を利用するとこうなります。
|
||||
return departmentEntityList
|
||||
.stream()
|
||||
.map(departmentEntity -> new Department(
|
||||
departmentEntity.getIdDepartment(),
|
||||
departmentEntity.getNmDepartment()
|
||||
)).toList();
|
||||
}
|
||||
// Stream API を利用するとこうなります。
|
||||
return departmentEntityList
|
||||
.stream()
|
||||
.map(departmentEntity -> new Department(
|
||||
departmentEntity.getIdDepartment(),
|
||||
departmentEntity.getNmDepartment()))
|
||||
.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()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.example.rhizome.app.infra.repository;
|
||||
|
||||
import com.example.rhizome.app.infra.entity.DepartmentEntity;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.example.rhizome.app.infra.entity.DepartmentEntity;
|
||||
|
||||
/**
|
||||
* Specification:
|
||||
@@ -20,31 +22,35 @@ import org.springframework.stereotype.Repository;
|
||||
* 戻り値はクエリを格納しているPredicateオブジェクトとなります。
|
||||
*/
|
||||
@Repository
|
||||
public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
|
||||
public interface DepartmentRepository
|
||||
extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
|
||||
|
||||
static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
|
||||
return idDepartment == null ? null :
|
||||
// 戻り値の型 Specification<DepartmentEntity> にキャスト
|
||||
(Specification<DepartmentEntity>)
|
||||
// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
|
||||
// を作成している
|
||||
(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
|
||||
}
|
||||
|
||||
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> nmDepartmentEqual(String nmDepartment) {
|
||||
return (nmDepartment == null || nmDepartment.isEmpty()) ? null
|
||||
: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
|
||||
.like(root.get("nmDepartment"), nmDepartment);
|
||||
}
|
||||
|
||||
static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
|
||||
return (nmDepartment == null || nmDepartment.isEmpty()) ?
|
||||
null :
|
||||
(Specification<DepartmentEntity>)
|
||||
(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), nmDepartment);
|
||||
}
|
||||
static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
|
||||
return (nmDepartment == null || nmDepartment.isEmpty()) ? null
|
||||
: (Specification<DepartmentEntity>) (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 + "%");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
package com.example.rhizome.app.presentation.controller;
|
||||
|
||||
import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.example.rhizome.aop.aspect.PermissionCheck;
|
||||
import com.example.rhizome.aop.aspect.SessionCheck;
|
||||
import com.example.rhizome.app.domain.model.LoginUser;
|
||||
import com.example.rhizome.app.domain.service.DeleteDepartment;
|
||||
import com.example.rhizome.app.domain.service.SearchDepartment;
|
||||
import com.example.rhizome.app.domain.service.SearchEmployee;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
|
||||
import com.example.rhizome.app.presentation.form.DepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.LoginUserForm;
|
||||
import com.example.rhizome.app.presentation.form.MessageForm;
|
||||
|
||||
/**
|
||||
* 削除処理のコントローラ
|
||||
*/
|
||||
@Controller
|
||||
public class DeleteDepartmentController {
|
||||
// ログ出力用インスタンス
|
||||
private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
|
||||
|
||||
// エラーメッセージ用の定数フィールド
|
||||
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!";
|
||||
|
||||
HttpSession httpSession;
|
||||
DeleteDepartment deleteDepartment;
|
||||
SearchDepartment searchDepartment;
|
||||
SearchEmployee searchEmployee;
|
||||
|
||||
@Autowired
|
||||
public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
|
||||
HttpSession httpSession, SearchEmployee searchEmployee) {
|
||||
this.httpSession = httpSession;
|
||||
this.deleteDepartment = deleteDepartment;
|
||||
this.searchDepartment = searchDepartment;
|
||||
this.searchEmployee = searchEmployee;
|
||||
}
|
||||
|
||||
/**
|
||||
* 削除処理のコントローラ
|
||||
*
|
||||
* @param idDepartment 削除対象のdepartmentId
|
||||
* @param model ビューにデータを渡すためのコンテナ
|
||||
* @return 遷移先の画面
|
||||
*/
|
||||
@PermissionCheck
|
||||
@SessionCheck
|
||||
@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
|
||||
public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
|
||||
try {
|
||||
// 部署一覧を取得し、画面に返す用のクラスに詰め替える
|
||||
// 作成した部署一覧をセット
|
||||
model.addAttribute(
|
||||
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
|
||||
DepartmentForm.convertFrom(searchDepartment.selectAll()));
|
||||
|
||||
// 削除処理実施
|
||||
deleteExec(
|
||||
model,
|
||||
idDepartment,
|
||||
LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
|
||||
|
||||
// 検索画面に遷移
|
||||
return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
|
||||
|
||||
} catch (Exception e) {
|
||||
// ログイン情報の破棄
|
||||
httpSession.invalidate();
|
||||
|
||||
e.printStackTrace();
|
||||
// エラーログ出力
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
|
||||
// エラー画面遷移
|
||||
return TransitionTargetPageNameKeyword.ERROR_HTML;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 削除処理実施
|
||||
*
|
||||
* @param model ビューにデータを渡すためのコンテナ
|
||||
* @param idDepartment 削除対象のdepartmentId
|
||||
* @param loginUser ログインユーザー情報
|
||||
*/
|
||||
private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
|
||||
|
||||
final String DELETE_COMPLETE = "削除しました。";
|
||||
final String ID_TO_DELETED_IS_UNKNOWN = "削除対象のIDが不明です。";
|
||||
final String YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT = "1名以上が所属している部署は削除出来ません。";
|
||||
|
||||
if (searchDepartment.searchDepartmentByIdDepartment(idDepartment) == null) {
|
||||
// エラーメッセージをセット
|
||||
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ID_TO_DELETED_IS_UNKNOWN));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
|
||||
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
|
||||
new MessageForm(YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT));
|
||||
return;
|
||||
}
|
||||
// 削除を実施
|
||||
deleteDepartment.deleteDepartment(idDepartment);
|
||||
|
||||
// 削除完了したメッセージをセット
|
||||
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
package com.example.rhizome.app.presentation.controller;
|
||||
|
||||
import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.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.impl.SearchDepartmentImpl;
|
||||
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.TransitionTargetPageNameKeyword;
|
||||
import com.example.rhizome.app.presentation.form.DepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.MessageForm;
|
||||
|
||||
/**
|
||||
* 新規登録者情報チェック用のコントローラ
|
||||
*/
|
||||
@Controller
|
||||
public class InsertDepartmentConfirmController {
|
||||
|
||||
// ログ出力用インスタンス
|
||||
private final static Logger LOGGER = Logger.getLogger(InsertDepartmentConfirmController.class.getName());
|
||||
|
||||
// エラーメッセージ用の定数フィールド
|
||||
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!";
|
||||
|
||||
HttpSession httpSession;
|
||||
SearchDepartment searchDepartment;
|
||||
SearchEmployee searchEmployee;
|
||||
|
||||
@Autowired
|
||||
public InsertDepartmentConfirmController(
|
||||
HttpSession httpSession,
|
||||
SearchDepartmentImpl searchDepartment,
|
||||
SearchEmployeeImpl searchEmployee) {
|
||||
this.httpSession = httpSession;
|
||||
this.searchDepartment = searchDepartment;
|
||||
this.searchEmployee = searchEmployee;
|
||||
}
|
||||
|
||||
@ModelAttribute
|
||||
public InsertDepartmentForm insertDepartmentForm() {
|
||||
return new InsertDepartmentForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* 登録情報のチェックを行う
|
||||
*
|
||||
* @param insertDepartmentForm 登録情報
|
||||
* @param model ビューにデータを渡すためのコンテナ
|
||||
* @return 遷移先の画面
|
||||
*/
|
||||
@PermissionCheck
|
||||
@SessionCheck
|
||||
@RequestMapping(value = INSERT_DEPARTMENT_CONFIRM, method = RequestMethod.POST)
|
||||
public String insertEmployeeConfirm(InsertDepartmentForm insertDepartmentForm, Model model) {
|
||||
|
||||
try {
|
||||
// 部署一覧を取得し、画面に返す用のクラスに詰め替える
|
||||
// 作成した部署一覧をセット
|
||||
model.addAttribute(
|
||||
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
|
||||
DepartmentForm.convertFrom(
|
||||
searchDepartment.selectAll()));
|
||||
|
||||
// 登録用パラメータチェック
|
||||
List<String> error = insertDepartmentForm.validateParameter();
|
||||
|
||||
// 入力内容に誤りがあるか
|
||||
if (!error.isEmpty()) {
|
||||
// 誤りがあった場合
|
||||
// 誤りがあった箇所のエラーメッセージを表示
|
||||
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
|
||||
new MessageForm(String.join(", ", error) + "が不正です。"));
|
||||
// 画面に返す為の登録情報をセット
|
||||
model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
|
||||
// 登録画面に遷移
|
||||
return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
|
||||
}
|
||||
|
||||
final String DUPLICATION = "既に登録済みのメールアドレスです。";
|
||||
|
||||
// 登録対象のメールアドレスを元に検索
|
||||
List<Department> departmetList = searchDepartment
|
||||
.searchBy(new SearchConditionDepartment(null, insertDepartmentForm.getNmDepartment()));
|
||||
|
||||
// 検索結果があるか
|
||||
if (!departmetList.isEmpty()) {
|
||||
// 検索した結果0件ではない場合
|
||||
// 重複を許さないため、エラー処理
|
||||
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
|
||||
// 画面に返す為の登録情報をセット
|
||||
model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
|
||||
// 登録画面に遷移
|
||||
return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
|
||||
}
|
||||
|
||||
// 登録確認ページに遷移
|
||||
model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
|
||||
// 登録確認画面に遷移
|
||||
return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_CONFIRM_HTML;
|
||||
|
||||
} catch (Exception e) {
|
||||
// ログイン情報の破棄
|
||||
httpSession.invalidate();
|
||||
|
||||
e.printStackTrace();
|
||||
|
||||
// エラーログ出力
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
|
||||
// エラー画面遷移
|
||||
return TransitionTargetPageNameKeyword.ERROR_HTML;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,146 @@
|
||||
package com.example.rhizome.app.presentation.controller;
|
||||
|
||||
import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
|
||||
import com.example.rhizome.aop.aspect.PermissionCheck;
|
||||
import com.example.rhizome.aop.aspect.SessionCheck;
|
||||
import com.example.rhizome.app.domain.service.RegisterDepartment;
|
||||
import com.example.rhizome.app.domain.service.SearchDepartment;
|
||||
import com.example.rhizome.app.domain.service.impl.RegisterDepartmentImpl;
|
||||
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.TransitionTargetPageNameKeyword;
|
||||
import com.example.rhizome.app.presentation.form.DepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.MessageForm;
|
||||
|
||||
/**
|
||||
* 新規登録用のコントローラ
|
||||
*/
|
||||
@Controller
|
||||
public class InsertDepartmentController {
|
||||
|
||||
// ログ出力用インスタンス
|
||||
private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
|
||||
|
||||
// エラーメッセージ用の定数フィールド
|
||||
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!";
|
||||
|
||||
HttpSession httpSession;
|
||||
RegisterDepartment registerDepartment;
|
||||
SearchDepartment searchDepartment;
|
||||
|
||||
@Autowired
|
||||
public InsertDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
|
||||
SearchDepartmentImpl searchDepartment) {
|
||||
this.httpSession = httpSession;
|
||||
this.registerDepartment = registerDepartment;
|
||||
this.searchDepartment = searchDepartment;
|
||||
}
|
||||
|
||||
@ModelAttribute
|
||||
public InsertDepartmentForm insertDepartmentForm() {
|
||||
return new InsertDepartmentForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* 新規登録画面表示処理
|
||||
*
|
||||
* @param insertEmployeeForm 登録情報
|
||||
* @param model ビューにデータを渡すためのコンテナ
|
||||
* @return 遷移先の画面
|
||||
*/
|
||||
@PermissionCheck
|
||||
@SessionCheck
|
||||
@RequestMapping(value = INSERT_DEPARTMENT, method = RequestMethod.POST)
|
||||
public String insertEmployee(InsertDepartmentForm insertDepartmentForm, Model model) {
|
||||
|
||||
try {
|
||||
// 部署一覧を取得し、画面に返す用のクラスに詰め替える
|
||||
// 作成した部署一覧をセット
|
||||
model.addAttribute(
|
||||
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
|
||||
DepartmentForm.convertFrom(
|
||||
searchDepartment.selectAll()));
|
||||
|
||||
// Confirm画面から渡ってきた値をチェック
|
||||
List<String> error = validateParameter(
|
||||
insertDepartmentForm.getNmDepartment());
|
||||
|
||||
// エラーが1件以上有る場合
|
||||
if (!error.isEmpty()) {
|
||||
// エラー内容を画面に表示
|
||||
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
|
||||
new MessageForm(String.join(", ", error) + "が不正です。"));
|
||||
// 登録画面に遷移
|
||||
return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
|
||||
}
|
||||
|
||||
// 登録処理
|
||||
registerDepartment.registerDepartment(InsertDepartmentForm.convertTo(insertDepartmentForm));
|
||||
// 登録結果画面に遷移
|
||||
return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_RESULT_HTML;
|
||||
|
||||
} catch (Exception e) {
|
||||
// ログイン情報の破棄
|
||||
httpSession.invalidate();
|
||||
|
||||
e.printStackTrace();
|
||||
|
||||
// エラーログ出力
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
|
||||
// エラー画面遷移
|
||||
return TransitionTargetPageNameKeyword.ERROR_HTML;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param departmentName 登録対象の名前
|
||||
* @return エラーが有った場合はエラー文言、無ければ空のリストが返る
|
||||
*/
|
||||
private List<String> validateParameter(
|
||||
String departmentName) {
|
||||
|
||||
final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
|
||||
|
||||
List<String> error = new ArrayList<>();
|
||||
|
||||
// null or 空文字判定
|
||||
if (isNullOrBlank(departmentName)) {
|
||||
// エラー内容を追加
|
||||
error.add(DEPARTMENT_NAME_NULL_BLANK);
|
||||
}
|
||||
|
||||
return error;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 仮引数を 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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
package com.example.rhizome.app.presentation.controller;
|
||||
|
||||
import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
|
||||
import com.example.rhizome.aop.aspect.PermissionCheck;
|
||||
import com.example.rhizome.aop.aspect.SessionCheck;
|
||||
import com.example.rhizome.app.domain.service.RegisterEmployee;
|
||||
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.TransitionTargetPageNameKeyword;
|
||||
import com.example.rhizome.app.presentation.form.DepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.InsertDepartmentForm;;
|
||||
|
||||
/**
|
||||
* 登録画面表示用コントローラ
|
||||
*/
|
||||
@Controller
|
||||
public class InsertDepartmentInputController {
|
||||
|
||||
// ログ出力用インスタンス
|
||||
private final static Logger LOGGER = Logger.getLogger(InsertDepartmentInputController.class.getName());
|
||||
|
||||
// エラーメッセージ用の定数フィールド
|
||||
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!";
|
||||
|
||||
HttpSession httpSession;
|
||||
RegisterEmployee registerEmployee;
|
||||
SearchDepartment searchDepartment;
|
||||
|
||||
@Autowired
|
||||
public InsertDepartmentInputController(HttpSession httpSession, RegisterEmployee registerEmployee,
|
||||
SearchDepartment searchDepartment) {
|
||||
this.httpSession = httpSession;
|
||||
this.registerEmployee = registerEmployee;
|
||||
this.searchDepartment = searchDepartment;
|
||||
}
|
||||
|
||||
@ModelAttribute
|
||||
public InsertDepartmentForm insertEmployeeForm() {
|
||||
return new InsertDepartmentForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* 登録画面表示処理
|
||||
*
|
||||
* @param insertEmployeeForm 登録画面のフォーム
|
||||
* @param model ビューにデータを渡すためのコンテナ
|
||||
* @return 遷移先の画面
|
||||
*/
|
||||
@SessionCheck
|
||||
@PermissionCheck
|
||||
@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
|
||||
public String insertDepartmentInput(InsertDepartmentForm insertDepartmentForm, Model model) {
|
||||
|
||||
try {
|
||||
// 部署コードリストを作成し、画面に返す値としてセット
|
||||
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
|
||||
DepartmentForm.convertFrom(searchDepartment.selectAll()));
|
||||
|
||||
// パラメータをセット
|
||||
model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
|
||||
|
||||
// 登録画面に遷移
|
||||
return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
|
||||
|
||||
} catch (Exception e) {
|
||||
// ログイン情報の破棄
|
||||
httpSession.invalidate();
|
||||
|
||||
e.printStackTrace();
|
||||
|
||||
// エラーログ出力
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
|
||||
// エラー画面遷移
|
||||
return TransitionTargetPageNameKeyword.ERROR_HTML;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
package com.example.rhizome.app.presentation.controller;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
|
||||
import com.example.rhizome.aop.aspect.PermissionCheck;
|
||||
import com.example.rhizome.aop.aspect.SessionCheck;
|
||||
import com.example.rhizome.app.domain.service.SearchDepartment;
|
||||
import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
|
||||
import com.example.rhizome.app.presentation.form.DepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
|
||||
|
||||
/**
|
||||
* 部署画面用コントローラ リスト全件表示、検索表示、更新、削除が可能
|
||||
*/
|
||||
@Controller
|
||||
public class SelectDepartmentController {
|
||||
|
||||
// ログ出力用インスタンス
|
||||
private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
|
||||
// エラーメッセージ用の定数フィールド
|
||||
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!";
|
||||
|
||||
HttpSession httpSession;
|
||||
SearchDepartment searchDepartment;
|
||||
SearchEmployeeInfo searchEmployeeInfo;
|
||||
|
||||
@Autowired
|
||||
public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
|
||||
SearchEmployeeInfo searchEmployeeInfo) {
|
||||
this.httpSession = httpSession;
|
||||
this.searchDepartment = searchDepartment;
|
||||
this.searchEmployeeInfo = searchEmployeeInfo;
|
||||
}
|
||||
|
||||
@ModelAttribute
|
||||
public SearchConditionDepartmentForm searchConditionDepartmentForm() {
|
||||
return new SearchConditionDepartmentForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* 社員検索画面表示処理コントローラ
|
||||
*
|
||||
* @param searchConditionDepartmentForm 検索画面のフォーム
|
||||
* @param model ビューにデータを渡すためのコンテナ
|
||||
* @return 遷移先の画面
|
||||
*/
|
||||
@PermissionCheck
|
||||
@SessionCheck
|
||||
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
|
||||
public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
|
||||
try {
|
||||
|
||||
// 部署一覧を取得し、画面に返す用のクラスに詰め替える
|
||||
// 作成した部署一覧をセット
|
||||
model.addAttribute(
|
||||
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
|
||||
DepartmentForm.convertFrom(searchDepartment.selectAll()));
|
||||
|
||||
// 検索条件を元に検索を実施
|
||||
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
|
||||
searchDepartment
|
||||
.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
|
||||
|
||||
// 検索ページに遷移
|
||||
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
|
||||
|
||||
} catch (Exception e) {
|
||||
// ログイン情報の破棄
|
||||
httpSession.invalidate();
|
||||
e.printStackTrace();
|
||||
|
||||
// エラーログ出力
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
|
||||
// エラー画面遷移
|
||||
return TransitionTargetPageNameKeyword.ERROR_HTML;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 部署検索画面表示処理コントローラ
|
||||
* 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
|
||||
*
|
||||
* @param model ビューにデータを渡すためのコンテナ
|
||||
* @return 遷移先の画面
|
||||
*/
|
||||
@PermissionCheck
|
||||
@SessionCheck
|
||||
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
|
||||
public String select(Model model) {
|
||||
|
||||
// 部署一覧を取得し、画面に返す用のクラスに詰め替える
|
||||
// 作成した部署一覧をセット
|
||||
model.addAttribute(
|
||||
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
|
||||
DepartmentForm.convertFrom(searchDepartment.selectAll()));
|
||||
|
||||
// 検索ページに遷移
|
||||
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
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 org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.example.rhizome.aop.aspect.PermissionCheck;
|
||||
import com.example.rhizome.aop.aspect.SessionCheck;
|
||||
import com.example.rhizome.app.domain.service.SearchDepartment;
|
||||
import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
|
||||
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
|
||||
import com.example.rhizome.app.presentation.form.DepartmentForm;
|
||||
import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
|
||||
|
||||
/**
|
||||
* 更新対象の Department が存在するか確認する為のコントローラ
|
||||
*/
|
||||
@Controller
|
||||
public class UpdateDepartmentController {
|
||||
|
||||
// ログ出力用インスタンス
|
||||
private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
|
||||
// エラーメッセージ用の定数フィールド
|
||||
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました!";
|
||||
|
||||
HttpSession httpSession;
|
||||
SearchDepartment searchDepartment;
|
||||
SearchEmployeeInfo searchEmployeeInfo;
|
||||
|
||||
@Autowired
|
||||
public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
|
||||
SearchEmployeeInfo searchEmployeeInfo) {
|
||||
this.httpSession = httpSession;
|
||||
this.searchDepartment = searchDepartment;
|
||||
this.searchEmployeeInfo = searchEmployeeInfo;
|
||||
}
|
||||
|
||||
@ModelAttribute
|
||||
public SearchConditionEmployeeForm searchConditionEmployeeForm() {
|
||||
return new SearchConditionEmployeeForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新対象の department が存在するか確認する為のコントローラ
|
||||
*
|
||||
* @param idDepartment 更新対象の employee の id
|
||||
* @param model ビューにデータを渡すためのコンテナ
|
||||
* @return 遷移先の画面
|
||||
*/
|
||||
@PermissionCheck
|
||||
@SessionCheck
|
||||
@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DAPERTMENT, method = RequestMethod.POST)
|
||||
public String showUpdateDepatment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
|
||||
final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
|
||||
try {
|
||||
// 部署一覧を取得し画面に返す値としてセット
|
||||
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
|
||||
DepartmentForm.convertFrom(searchDepartment.searchDepartmentByIdDepartment(idDepartment)));
|
||||
|
||||
// Update画面に遷移
|
||||
return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
|
||||
} catch (Exception e) {
|
||||
// ログイン情報の破棄
|
||||
httpSession.invalidate();
|
||||
|
||||
e.printStackTrace();
|
||||
|
||||
// エラーログ出力
|
||||
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
|
||||
// エラー画面遷移
|
||||
return TransitionTargetPageNameKeyword.ERROR_HTML;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,14 +5,17 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
|
||||
*/
|
||||
public class PageReturnAttributeKeyword {
|
||||
|
||||
public static final String MESSAGE_ERROR = "messageError";
|
||||
public static final String MESSAGE_INFO = "messageInfo";
|
||||
public static final String MESSAGE_ERROR = "messageError";
|
||||
public static final String MESSAGE_INFO = "messageInfo";
|
||||
|
||||
public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
|
||||
public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
|
||||
public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
|
||||
public static final String LOGIN_INFO_FORM = "loginInfoForm";
|
||||
public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
|
||||
public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
|
||||
public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
|
||||
public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
|
||||
|
||||
public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
|
||||
public static final String LOGIN_INFO_FORM = "loginInfoForm";
|
||||
public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
|
||||
public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
|
||||
public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentInfoForm";
|
||||
public static final String INSERT_DEPARTMENT_FORM = "insertDepartmentForm";
|
||||
|
||||
}
|
||||
|
||||
@@ -7,87 +7,107 @@ import java.util.Set;
|
||||
*/
|
||||
public class TransitionTargetPageNameKeyword {
|
||||
|
||||
// 共通
|
||||
public static final String LOGIN_HTML = "login";
|
||||
// 共通
|
||||
public static final String LOGIN_HTML = "login";
|
||||
|
||||
// 一般向け
|
||||
public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
|
||||
public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
|
||||
// 一般向け
|
||||
public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
|
||||
public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
|
||||
|
||||
// 管理者向け
|
||||
public static final String MENU_HTML = "menu";
|
||||
public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
|
||||
public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
|
||||
public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
|
||||
public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
|
||||
public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
|
||||
// 管理者向け
|
||||
public static final String MENU_HTML = "menu";
|
||||
public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
|
||||
public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
|
||||
public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
|
||||
public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
|
||||
public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
|
||||
|
||||
public static final String ERROR_HTML = "error";
|
||||
public static final String ERROR_HTML = "error";
|
||||
|
||||
// 共通(Controller)
|
||||
public static final String INDEX_BLANK = "";
|
||||
public static final String INDEX_SLASH = "/";
|
||||
public static final String INDEX_LOGIN = "/login";
|
||||
public static final String LOGOUT = "/logout";
|
||||
public static final String DO_LOGIN = "/doLogin";
|
||||
// 共通(Controller)
|
||||
public static final String INDEX_BLANK = "";
|
||||
public static final String INDEX_SLASH = "/";
|
||||
public static final String INDEX_LOGIN = "/login";
|
||||
public static final String LOGOUT = "/logout";
|
||||
public static final String DO_LOGIN = "/doLogin";
|
||||
|
||||
// 一般向け(Controller)
|
||||
public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
|
||||
// 一般向け(Controller)
|
||||
public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
|
||||
|
||||
// 管理者向け(Controller)
|
||||
public static final String DELETE_EMPLOYEE = "/deleteEmployee";
|
||||
public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
|
||||
public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
|
||||
public static final String INSERT_EMPLOYEE = "/insertEmployee";
|
||||
public static final String SHOW_MENU = "/showMenu";
|
||||
public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
|
||||
public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
|
||||
public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
|
||||
public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
|
||||
// 管理者向け(Controller)
|
||||
public static final String DELETE_EMPLOYEE = "/deleteEmployee";
|
||||
public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
|
||||
public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
|
||||
public static final String INSERT_EMPLOYEE = "/insertEmployee";
|
||||
public static final String SHOW_MENU = "/showMenu";
|
||||
public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
|
||||
public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
|
||||
public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
|
||||
public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
|
||||
|
||||
// Department
|
||||
// HTML
|
||||
// Controller
|
||||
// Department
|
||||
// HTML
|
||||
public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
|
||||
public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
|
||||
public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
|
||||
public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
|
||||
public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
|
||||
|
||||
/**
|
||||
* 管理者向けのページリストを返す
|
||||
*
|
||||
* @return 管理者向けのページリスト
|
||||
*/
|
||||
public static Set<String> getAdminPageList() {
|
||||
// Controller
|
||||
public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
|
||||
public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
|
||||
public static final String DELETE_DEPARTMENT = "/deleteDepartment";
|
||||
public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
|
||||
public static final String INSERT_DEPARTMENT_CONFIRM = "/insertDepartmentConfirm";
|
||||
public static final String INSERT_DEPARTMENT = "/insertDepartment";
|
||||
public static final String SHOW_UPDATE_DAPERTMENT = "/showUpdateDepartment";
|
||||
public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
|
||||
|
||||
return Set.of(
|
||||
INDEX_BLANK,
|
||||
INDEX_SLASH,
|
||||
INDEX_LOGIN,
|
||||
LOGOUT,
|
||||
DO_LOGIN,
|
||||
DELETE_EMPLOYEE,
|
||||
INSERT_EMPLOYEE_INPUT,
|
||||
INSERT_EMPLOYEE_CONFIRM,
|
||||
INSERT_EMPLOYEE,
|
||||
SHOW_MENU,
|
||||
SELECT_EMPLOYEE_INFO,
|
||||
SELECT_EMPLOYEE_INFO_FORM_EMPTY,
|
||||
SHOW_UPDATE_EMPLOYEE,
|
||||
UPDATE_EMPLOYEE_RESULT
|
||||
);
|
||||
}
|
||||
/**
|
||||
* 管理者向けのページリストを返す
|
||||
*
|
||||
* @return 管理者向けのページリスト
|
||||
*/
|
||||
public static Set<String> getAdminPageList() {
|
||||
|
||||
/**
|
||||
* 一般向けのページリストを返す
|
||||
*
|
||||
* @return 一般向けのページリスト
|
||||
*/
|
||||
public static Set<String> getUserPageList() {
|
||||
return Set.of(
|
||||
INDEX_BLANK,
|
||||
INDEX_SLASH,
|
||||
INDEX_LOGIN,
|
||||
LOGOUT,
|
||||
DO_LOGIN,
|
||||
PERSONAL_UPDATE_RESULT
|
||||
);
|
||||
}
|
||||
return Set.of(
|
||||
INDEX_BLANK,
|
||||
INDEX_SLASH,
|
||||
INDEX_LOGIN,
|
||||
LOGOUT,
|
||||
DO_LOGIN,
|
||||
DELETE_EMPLOYEE,
|
||||
INSERT_EMPLOYEE_INPUT,
|
||||
INSERT_EMPLOYEE_CONFIRM,
|
||||
INSERT_EMPLOYEE,
|
||||
SHOW_MENU,
|
||||
SELECT_EMPLOYEE_INFO,
|
||||
SELECT_EMPLOYEE_INFO_FORM_EMPTY,
|
||||
SHOW_UPDATE_EMPLOYEE,
|
||||
UPDATE_EMPLOYEE_RESULT,
|
||||
SELECT_DEPARTMENT_INFO,
|
||||
SELECT_DEPARTMENT_INFO_FORM_EMPTY,
|
||||
DELETE_DEPARTMENT,
|
||||
SHOW_UPDATE_DAPERTMENT,
|
||||
UPDATE_DEPARTMENT_RESULT,
|
||||
INSERT_DEPARTMENT_INPUT,
|
||||
INSERT_DEPARTMENT_CONFIRM,
|
||||
INSERT_DEPARTMENT);
|
||||
}
|
||||
|
||||
/**
|
||||
* 一般向けのページリストを返す
|
||||
*
|
||||
* @return 一般向けのページリスト
|
||||
*/
|
||||
public static Set<String> getUserPageList() {
|
||||
return Set.of(
|
||||
INDEX_BLANK,
|
||||
INDEX_SLASH,
|
||||
INDEX_LOGIN,
|
||||
LOGOUT,
|
||||
DO_LOGIN,
|
||||
PERSONAL_UPDATE_RESULT);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
package com.example.rhizome.app.presentation.form;
|
||||
|
||||
import java.util.ArrayList;
|
||||
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 InsertDepartmentForm {
|
||||
|
||||
/**
|
||||
* 部署名
|
||||
*/
|
||||
private String nmDepartment;
|
||||
|
||||
/**
|
||||
* 仮引数を 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();
|
||||
}
|
||||
|
||||
/**
|
||||
* 画面から渡ってきた登録内容をまとめ、ビジネスモデルに変換
|
||||
*
|
||||
* @param insertEmployeeForm 画面から渡ってきた登録内容
|
||||
* @return ビジネスモデルのインスタンス
|
||||
*/
|
||||
public static Department convertTo(InsertDepartmentForm InsertDepartmentForm) {
|
||||
return new Department(
|
||||
null,
|
||||
InsertDepartmentForm.getNmDepartment());
|
||||
}
|
||||
|
||||
/**
|
||||
* 登録データのValidationを行う
|
||||
*
|
||||
* @return エラーが有った場合はエラー文言、無ければ空のリストが返る
|
||||
*/
|
||||
public List<String> validateParameter() {
|
||||
final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
|
||||
|
||||
List<String> error = new ArrayList<>();
|
||||
|
||||
if (isNullOrBlank(nmDepartment)) {
|
||||
error.add(DEPARTMENT_NAME_NULL_BLANK);
|
||||
}
|
||||
|
||||
return error;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
88
src/main/resources/templates/insertDepartmentConfirm.html
Normal file
88
src/main/resources/templates/insertDepartmentConfirm.html
Normal file
@@ -0,0 +1,88 @@
|
||||
<!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="insertDepartment"
|
||||
id="insertForm"
|
||||
method="post"
|
||||
th:object="${insertDepartmentForm}">
|
||||
|
||||
<div class="msgBox error" th:if="${messageError != null}">
|
||||
<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
|
||||
</div>
|
||||
<table>
|
||||
<tr>
|
||||
<th class="header">部署ID</th>
|
||||
<td>
|
||||
<label>
|
||||
<input class="readOnly"
|
||||
name="idDepartment"
|
||||
readonly="readonly"
|
||||
type="text"
|
||||
value="自動で設定されます"/>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="header">部署名</th>
|
||||
<td>
|
||||
<label>
|
||||
<input class="readOnly"
|
||||
name="nmDepartment"
|
||||
readonly="readonly"
|
||||
th:value="*{nmDepartment}"
|
||||
type="text"/>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="btnArea" colspan="2">
|
||||
<input type="submit" value="登録"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<a href="javascript:onClickEdit()">登録内容の編集</a> | <a href="showMenu">メニューに戻る</a>
|
||||
</form>
|
||||
|
||||
<script type="text/javascript">
|
||||
function onClickEdit() {
|
||||
const form = document.getElementById('insertForm');
|
||||
form.setAttribute('method', 'post');
|
||||
form.setAttribute('action', 'insertDepartmentInput');
|
||||
|
||||
// 確認画面から編集画面に戻ってきたときのフラグ(未使用)
|
||||
const inputField = document.createElement("input");
|
||||
inputField.setAttribute("type", "hidden");
|
||||
inputField.setAttribute("name", "backFlg");
|
||||
inputField.setAttribute("value", "edit");
|
||||
|
||||
form.appendChild(inputField);
|
||||
|
||||
// フォームをDOMに追加
|
||||
document.body.appendChild(form);
|
||||
|
||||
form.submit();
|
||||
}
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
67
src/main/resources/templates/insertDepartmentInput.html
Normal file
67
src/main/resources/templates/insertDepartmentInput.html
Normal file
@@ -0,0 +1,67 @@
|
||||
<!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="insertDepartmentConfirm"
|
||||
method="post"
|
||||
th:object="${insertDepartmentForm}">
|
||||
|
||||
<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>
|
||||
<label>
|
||||
<input class="readOnly"
|
||||
readonly="readonly"
|
||||
type="text"
|
||||
value="自動で設定されます"
|
||||
/>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="header">部署名</th>
|
||||
<td>
|
||||
<label>
|
||||
<input maxlength="50"
|
||||
placeholder="部署名"
|
||||
required="required"
|
||||
th:field="*{nmDepartment}"
|
||||
type="text"
|
||||
/>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="btnArea" colspan="2">
|
||||
<input type="submit" value="登録確認"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<a href="showMenu">メニューに戻る</a>
|
||||
</body>
|
||||
</html>
|
||||
40
src/main/resources/templates/insertDepartmentResult.html
Normal file
40
src/main/resources/templates/insertDepartmentResult.html
Normal file
@@ -0,0 +1,40 @@
|
||||
<!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>
|
||||
<h2>社員登録が完了しました</h2>
|
||||
<br/>
|
||||
<a href="javascript:insertSubmit()">続けて登録する</a> | <a href="showMenu">メニューに戻る</a>
|
||||
</body>
|
||||
<script type="text/javascript">
|
||||
function insertSubmit() {
|
||||
const form = document.createElement('form');
|
||||
form.setAttribute('method', 'post');
|
||||
form.setAttribute('action', 'insertDepartmentInput');
|
||||
|
||||
// 動的送信用のHidden
|
||||
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
|
||||
const inputField = document.createElement("input");
|
||||
inputField.setAttribute("type", "hidden");
|
||||
inputField.setAttribute("value", "select");
|
||||
|
||||
form.appendChild(inputField);
|
||||
|
||||
// フォームをDOMに追加
|
||||
document.body.appendChild(form);
|
||||
|
||||
form.submit();
|
||||
}
|
||||
</script>
|
||||
</html>
|
||||
@@ -59,7 +59,7 @@
|
||||
<td>
|
||||
<label>
|
||||
<input maxlength="50"
|
||||
oninput="convertToKatakana(this)"
|
||||
onchange="convertToKatakana(this)"
|
||||
placeholder="フリガナ"
|
||||
required="required"
|
||||
th:field="*{knEmployee}"
|
||||
|
||||
@@ -32,6 +32,16 @@
|
||||
<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
|
||||
<td class="description">新規でユーザ追加を行います。</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
|
||||
</td>
|
||||
<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
|
||||
<td class="description">新規で部署追加を行います。</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
</body>
|
||||
@@ -59,7 +69,7 @@
|
||||
function selectDepartmentSubmit() {
|
||||
const form = document.createElement('form');
|
||||
form.setAttribute('method', 'post');
|
||||
form.setAttribute('action', 'selectDepartment');
|
||||
form.setAttribute('action', 'selectDepartmentInfo');
|
||||
|
||||
// 動的送信用のHidden
|
||||
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
|
||||
|
||||
117
src/main/resources/templates/selectDepartment.html
Normal file
117
src/main/resources/templates/selectDepartment.html
Normal file
@@ -0,0 +1,117 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
<!-- 外部のスクリプトファイルを読み込む -->
|
||||
<script th:src="@{/js/common.js}"></script>
|
||||
<!-- CSSの読み込み -->
|
||||
<link rel="stylesheet" th:href="@{/css/all.css}">
|
||||
<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
|
||||
<title>検索</title>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<h1>
|
||||
検索条件入力
|
||||
<div class="rightSection">
|
||||
<span class="loginInfo">ログイン者名:<span th:text="${session.loginUser.nmEmployee}"></span></span>
|
||||
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
|
||||
</div>
|
||||
</h1>
|
||||
<form action="selectDepartmentInfo"
|
||||
method="post"
|
||||
th:object="${searchConditionDepartmentForm}">
|
||||
|
||||
<div class="msgBox error" th:if="${messageError} != null">
|
||||
<span class="error" th:text="${messageError.message}"></span>
|
||||
</div>
|
||||
<table>
|
||||
<tr>
|
||||
<th class="header">部署ID</th>
|
||||
<td>
|
||||
<input placeholder="部署ID"
|
||||
th:field="*{idDepartment}"
|
||||
type="number"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="header">部署名</th>
|
||||
<td>
|
||||
<input placeholder="部署名"
|
||||
th:field="*{nmDepartment}"
|
||||
type="text"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="btnArea" colspan="2">
|
||||
<input type="submit" value="検索"/>
|
||||
</td>
|
||||
<td class="btnArea" colspan="2">
|
||||
<button onclick="clearInput()">クリア</button>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<div class="header-spacing"></div>
|
||||
<a href="showMenu">メニューに戻る</a>
|
||||
<div class="header-spacing"></div>
|
||||
<h1><span>検索結果</span></h1>
|
||||
<div class="header-spacing"></div>
|
||||
<th:block th:if="${messageInfo != null}">
|
||||
<script th:inline="javascript">
|
||||
alert([[${messageInfo.message}]]);
|
||||
</script>
|
||||
</th:block>
|
||||
<div class="header-spacing"></div>
|
||||
<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
|
||||
<!-- 検索結果が1件以上ある場合 -->
|
||||
<table class="table-grid table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 60px;">部署ID</th>
|
||||
<th style="width: 100px;">部署名</th>
|
||||
<th style="width: 150px;">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="departmentInfoForm : ${departmentFormList}">
|
||||
|
||||
<td th:text="${departmentInfoForm.idDepartment}"></td>
|
||||
<td th:text="${departmentInfoForm.nmDepartment}"></td>
|
||||
<td>
|
||||
<!-- 更新フォーム -->
|
||||
<form action="showUpdateDepartment" method="post" style="display: inline;">
|
||||
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
|
||||
<input type="submit" value="更新">
|
||||
</form>
|
||||
<!-- 削除フォーム -->
|
||||
<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか?');"
|
||||
style="display: inline;">
|
||||
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
|
||||
<input type="submit" value="削除">
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</th:block>
|
||||
<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
|
||||
<!-- 検索結果が0件の場合 -->
|
||||
検索結果はありません。
|
||||
</th:block>
|
||||
|
||||
</body>
|
||||
<script type="text/javascript">
|
||||
|
||||
function clearInput() {
|
||||
document.getElementById('idDepartment').value = '';
|
||||
document.getElementById('nmDepartment').value = '';
|
||||
document.getElementById('idDepartment').selectedIndex = 0;
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
</html>
|
||||
88
src/main/resources/templates/updateDepartmentInput.html
Normal file
88
src/main/resources/templates/updateDepartmentInput.html
Normal file
@@ -0,0 +1,88 @@
|
||||
<!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="${departmentFormList}"
|
||||
>
|
||||
<div class="msgBox error" th:if="${messageError != null}">
|
||||
<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
|
||||
</div>
|
||||
<table>
|
||||
<tr>
|
||||
<th class="header">部署ID</th>
|
||||
<td>
|
||||
<label>
|
||||
<input class="readOnly"
|
||||
readonly="readonly"
|
||||
th:field="*{idDepartment}"
|
||||
type="text"
|
||||
/>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="header">部署名</th>
|
||||
<td>
|
||||
<label>
|
||||
<input maxlength="50"
|
||||
placeholder="部署名"
|
||||
required="required"
|
||||
th:field="*{nmDepartment}"
|
||||
type="text"
|
||||
/>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="btnArea" colspan="2">
|
||||
<input type="submit" value="更新"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<a href="javascript:selectSubmit()">一覧に戻る</a>
|
||||
</body>
|
||||
|
||||
<script>
|
||||
function selectSubmit() {
|
||||
const form = document.createElement('form');
|
||||
form.setAttribute('method', 'post');
|
||||
form.setAttribute('action', '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>
|
||||
Reference in New Issue
Block a user