2026_09_5H_Spring_KIZAKI/EM-Spring
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 2026_09_5H_Spring_KIZAKI:y-watanabe
Branches Tags
2026_09_5H_Spring_KIZAKI:master 2026_09_5H_Spring_KIZAKI:y-watanabe 2026_09_5H_Spring_KIZAKI:k-kobayashi 2026_09_5H_Spring_KIZAKI:h-seya 2026_09_5H_Spring_KIZAKI:y-kumaki 2026_09_5H_Spring_KIZAKI:s-choi 2026_09_5H_Spring_KIZAKI:s-tajihi 2026_09_5H_Spring_KIZAKI:n-kawahito 2026_09_5H_Spring_KIZAKI:a-kawaguchi
..
compare: 2026_09_5H_Spring_KIZAKI:a-kawaguchi
Branches Tags
2026_09_5H_Spring_KIZAKI:y-watanabe 2026_09_5H_Spring_KIZAKI:k-kobayashi 2026_09_5H_Spring_KIZAKI:h-seya 2026_09_5H_Spring_KIZAKI:y-kumaki 2026_09_5H_Spring_KIZAKI:s-choi 2026_09_5H_Spring_KIZAKI:s-tajihi 2026_09_5H_Spring_KIZAKI:n-kawahito 2026_09_5H_Spring_KIZAKI:a-kawaguchi 2026_09_5H_Spring_KIZAKI:master

1 Commits
y-watanabe ... a-kawaguch

Author SHA1 Message Date
a-kawaguchi
dee00597e6 no message 2026-09-10 13:50:10 +09:00
35 changed files with 155 additions and 823 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>

2
.gitignore vendored
View File

@@ -1,2 +1,4 @@
/target/ /target/
/bin/ /bin/
.classpath
.project

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>

4
.settings/.jsdtscope
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry excluding="**/node_modules/*|**/*.min.js|**/bower_components/*" kind="src" path="src/main/webapp"/> <classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="src" path="target/m2e-wtp/web-resources"/> <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.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes> <attributes>

2
pom.xml
View File

@@ -15,7 +15,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<name>EM-Spring</name> <name>EM-Spring</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<properties> <properties>
<java.version>17</java.version> <java.version>17</java.version>
<lombok.version>1.18.34</lombok.version> <lombok.version>1.18.34</lombok.version>
</properties> </properties>

1
src/main/java/com/example/rhizome/app/domain/model/SearchConditionDepartment.java
View File

@@ -5,7 +5,6 @@ import lombok.Getter;
/** /**
* 部署情報の検索要件を表現するモデルクラスです。 * 部署情報の検索要件を表現するモデルクラスです。
*画面の検索条件を受け取る
*/ */
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor

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

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

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

@@ -1,21 +1,14 @@
//サービス
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(); //DBから全取得 List<Department> selectAll();
List<Department> searchBy(SearchConditionDepartment searchConditionDepartment); List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment); //条件検索 List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
} }
//controller→SeachDepartment→Repository→DB

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

@@ -1,34 +0,0 @@
package com.example.rhizome.app.domain.service.impl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.example.rhizome.app.domain.service.DeleteDepartment;
import com.example.rhizome.app.infra.repository.DepartmentRepository;
/**
* Employee レコード削除関連の機能を持つサービス
*/
@Service
@Transactional
public class DeleteDepartmentImpl implements DeleteDepartment {
DepartmentRepository departmentRepository;
@Autowired
public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
this.departmentRepository = departmentRepository;
}
/**
* idEmployee を元に employee データを削除
*
* @param idEmployee 削除対象のidEmployee
*/
public void deleteDepartment(Integer idDepartment) {
departmentRepository.deleteById(idDepartment);
}
}

35
src/main/java/com/example/rhizome/app/domain/service/impl/RegisterDepartmentImpl.java
View File

@@ -1,35 +0,0 @@
package com.example.rhizome.app.domain.service.impl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.example.rhizome.app.domain.model.Department;
import com.example.rhizome.app.domain.service.RegisterDepartment;
import com.example.rhizome.app.infra.entity.DepartmentEntity;
import com.example.rhizome.app.infra.repository.DepartmentRepository;
/**
* Employee テーブルの登録系の機能を集約させるサービスクラスです。
*/
@Service
@Transactional
public class RegisterDepartmentImpl implements RegisterDepartment {
DepartmentRepository departmentRepository;
@Autowired
public RegisterDepartmentImpl(DepartmentRepository DepartmentRepository) {
this.departmentRepository = DepartmentRepository;
}
/**
* employee インスタンスの内容を登録する
*
* @param employee 登録対象のデータ
*/
public void registerDepartment(Department department) {
departmentRepository.save(DepartmentEntity.convertFrom(department));
}
}

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

@@ -43,7 +43,6 @@ public class SearchDepartmentImpl implements SearchDepartment {
} }
/** /**
*seachBy完全一致検索用メソッド
* searchConditionDepartment の情報を元に Department のレコードを取得 * searchConditionDepartment の情報を元に Department のレコードを取得
* *
* @param searchConditionDepartment 検索条件 * @param searchConditionDepartment 検索条件
@@ -56,7 +55,7 @@ public class SearchDepartmentImpl implements SearchDepartment {
.createDepartmentList( .createDepartmentList(
departmentRepository.findAll(Specification departmentRepository.findAll(Specification
.where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment())) .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
.and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment())) .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
) )
); );

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

@@ -1,123 +0,0 @@
package com.example.rhizome.app.presentation.controller;
import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
import java.util.Objects;
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.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;
@Autowired
public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment, HttpSession httpSession) {
this.httpSession = httpSession;
this.deleteDepartment = deleteDepartment;
this.searchDepartment = searchDepartment;
}
/**
* 削除処理のコントローラ
*
* @param idEmployee 削除対象のemployeeId
* @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 idEmployee 削除対象のemployeeId
* @param loginUser ログインユーザー情報
*/
private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
final String DELETE_TARGET_ID_CAN_NOT_DELETE = "ログイン者自身は削除出来ません。";
final String DELETE_COMPLETE = "削除しました。";
// ログインしている人が、削除対象かチェック
if (Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
// 削除対象だった場合
// エラーメッセージをセット
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
// 検索画面に遷移
return;
}
// 削除を実施
deleteDepartment.deleteDepartment(idDepartment);
// 削除完了したメッセージをセット
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
}
}

48
src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentInputController.java → src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentController.java
View File

@@ -1,7 +1,5 @@
package com.example.rhizome.app.presentation.controller; 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.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -16,63 +14,57 @@ 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.RegisterDepartment; 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.domain.service.impl.RegisterEmployeeImpl;
import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
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.InsertDepartmentForm; import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
/** /**
* 登録画面表示用コントローラ * 新規登録用のコントローラ
* 部署登録画面を表示するだけ
*/ */
@Controller @Controller
public class InsertDepartmentInputController { public class InsertDepartmentController {
// ログ出力用インスタンス // ログ出力用インスタンス
private final static Logger LOGGER = Logger.getLogger(InsertDepartmentInputController.class.getName()); private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
// エラーメッセージ用の定数フィールド // エラーメッセージ用の定数フィールド
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
HttpSession httpSession; HttpSession httpSession;
RegisterDepartment registerDepartment; RegisterEmployee registerEmployee;
SearchDepartment searchDepartment; SearchDepartment searchDepartment;
@Autowired @Autowired
public InsertDepartmentInputController(HttpSession httpSession, RegisterDepartment registerDepartment, SearchDepartment searchDepartment) { public InsertDepartmentController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee, SearchDepartmentImpl searchDepartment) {
this.httpSession = httpSession; this.httpSession = httpSession;
this.registerDepartment = registerDepartment; this.registerEmployee = registerEmployee;
this.searchDepartment = searchDepartment; this.searchDepartment = searchDepartment;
} }
@ModelAttribute @ModelAttribute
public InsertDepartmentForm insertDepartmentForm() { public InsertEmployeeForm insertEmployeeForm() {
return new InsertDepartmentForm(); return new InsertEmployeeForm();
} }
/** /**
* 登録画面表示処理 * 新規登録画面表示処理
* *
* @param insertDepartmentForm 登録画面のフォーム * @param insertEmployeeForm 登録情報
* @param model ビューにデータを渡すためのコンテナ * @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面 * @return 遷移先の画面
*/ */
@SessionCheck
@PermissionCheck @PermissionCheck
@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST) @SessionCheck
public String insertInput(InsertDepartmentForm insertDepartmentForm, Model model) { @RequestMapping(value = TransitionTargetPageNameKeyword.INSERT_DEPARTMENT, method = RequestMethod.POST)
public String insertEmployee(InsertEmployeeForm insertEmployeeForm, Model model) {
try { try {
// 部署コードリストを作成し、画面に返す値としてセット
//model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
// パラメータをセット // 登録結果画面に遷移
model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm); return TransitionTargetPageNameKeyword.INSERT_DEVELOPMENT_INPUT_HTML;
// 登録画面に遷移
return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
} catch (Exception e) { } catch (Exception e) {
// ログイン情報の破棄 // ログイン情報の破棄
@@ -86,6 +78,8 @@ public class InsertDepartmentInputController {
return TransitionTargetPageNameKeyword.ERROR_HTML; return TransitionTargetPageNameKeyword.ERROR_HTML;
} }
} }
} }

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

@@ -15,13 +15,13 @@ 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.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.DepartmentForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
/** /**
* 部署検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能 * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
*/ */
@Controller @Controller
public class SelectDepartmentController { public class SelectDepartmentController {
@@ -33,57 +33,47 @@ public class SelectDepartmentController {
HttpSession httpSession; HttpSession httpSession;
SearchDepartment searchDepartment; SearchDepartment searchDepartment;
SearchEmployeeInfo searchEmployeeInfo;
@Autowired @Autowired
public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) { public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployeeInfo searchEmployeeInfo) {
this.httpSession = httpSession; this.httpSession = httpSession;
this.searchDepartment = searchDepartment; this.searchDepartment = searchDepartment;
this.searchEmployeeInfo = searchEmployeeInfo;
} }
@ModelAttribute @ModelAttribute
public SearchConditionDepartmentForm searchConditionDepartmentForm() { public DepartmentForm departmentForm() {
return new SearchConditionDepartmentForm(); return new DepartmentForm();
} }
/** /**
* 部署検索画面表示処理コントローラ * 社員検索画面表示処理コントローラ
* *
* @param searchConditionDepartmentForm 検索画面のフォーム * @param searchConditionEmployeeForm 検索画面のフォーム
* @param model ビューにデータを渡すためのコンテナ * @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面 * @return 遷移先の画面
*/ */
@PermissionCheck @PermissionCheck
@SessionCheck @SessionCheck
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST) @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) { public String select(DepartmentForm departmentForm, Model model) {
try { try {
// 部署一覧を取得し、画面に返す用のクラスに詰め替える // 部署一覧を取得し、画面に返す用のクラスに詰め替える
// 作成した部署一覧をセット // 作成した部署一覧をセット
System.out.println(departmentForm);
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentForm.convertFrom(searchDepartment.selectAll()) //部署一覧をDBから取得→List<DepartmentForm> DepartmentForm.convertFrom(searchDepartment.selectAll())
//DepartmentをDepartmentFormという型に変換
//model.Attributet(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,変換した部署一覧)
//DBから部署一覧を取得して
//画面表示用のDepartmentFormに変換して
//departmentFormListという名前で画面に渡す
); );
System.out.println(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST);
System.out.println(DepartmentForm.convertFrom(searchDepartment.selectAll()));
System.out.println(model.getAttribute("departmentFormList"));
// 検索条件を元に検索を実施 // 検索条件を元に検索を実施
// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット // 取得した department の情報を画面に返す用の型に詰め替えてセット
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_INFO_FORM_LIST, model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.searchBy(DepartmentForm.convertTo(departmentForm))));
DepartmentForm.convertFrom(
searchDepartment.searchByWithLike(
SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
//SearchConditionDepartmentForm…画面から送られた検索条件
//model.Attributet(PageReturnAttributeKeyword.DEPARTMENT_INFO_FORM_LIST,変換済み検索結果)
//画面で入力された検索条件を検索用オブジェクトに変換して
//その条件で部署を検索して
//検索結果を画面表示用のDepartmentFormに変換して、
//departmentInfoFormListという名前でHTMLに渡している
// 検索ページに遷移 // 検索ページに遷移
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML; return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
@@ -103,34 +93,6 @@ public class SelectDepartmentController {
} }
/**
* 社員検索画面表示処理コントローラ
* 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
*
* @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面
*/
@PermissionCheck
@SessionCheck
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
public String select(Model model) {
// 部署一覧を取得し、画面に返す用のクラスに詰め替える
// 作成した部署一覧をセット
model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentForm.convertFrom(searchDepartment.selectAll())
);
// 検索条件を元に検索を実施
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_INFO_FORM_LIST,DepartmentForm.convertFrom(
searchDepartment.searchByWithLike(
SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()
))));
// 検索ページに遷移
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
}
} }

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

@@ -1,5 +1,17 @@
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;
@@ -9,16 +21,6 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
import com.example.rhizome.app.presentation.form.DepartmentForm; 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;
/** /**
* 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能 * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能

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

@@ -2,7 +2,6 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
/** /**
* Servlet から Servlet に返却する際に使用する文字列を管理するクラス * Servlet から Servlet に返却する際に使用する文字列を管理するクラス
* モデルに渡すキー名を定数化
*/ */
public class PageReturnAttributeKeyword { public class PageReturnAttributeKeyword {
@@ -10,14 +9,10 @@ public class PageReturnAttributeKeyword {
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 DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm"; public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm"; public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
public static final String LOGIN_INFO_FORM = "loginInfoForm"; public static final String LOGIN_INFO_FORM = "loginInfoForm";
public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm"; public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList"; public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
public static final String INSERT_DEPARTMENT_INPUT = "insertDepartmentInput";
public static final String INSERT_DEPARTMENT_FORM = "insertDepartmentForm";
public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInputHtml";
} }

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

@@ -4,7 +4,6 @@ import java.util.Set;
/** /**
* システムで利用しているJSPのリスト * システムで利用しているJSPのリスト
* 画面用（URL）用の定数、行き先管理
*/ */
public class TransitionTargetPageNameKeyword { public class TransitionTargetPageNameKeyword {
@@ -15,16 +14,15 @@ public class TransitionTargetPageNameKeyword {
public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput"; public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult"; public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
// 管理者向け(View名) // 管理者向け
public static final String MENU_HTML = "menu"; public static final String MENU_HTML = "menu";
public static final String SELECT_EMPLOYEE_HTML = "selectEmployee"; public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
public static final String SELECT_DEPARTMENT_HTML = "selectDepartment"; public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput"; public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm"; public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult"; public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
public static final String INSERT_DEVELOPMENT_INPUT_HTML = "insertDevelopmentInput";
public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput"; public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
public static final String DELET_DEPARTMENT_HTML = "deleteDepartment";
public static final String ERROR_HTML = "error"; public static final String ERROR_HTML = "error";
@@ -38,20 +36,23 @@ public class TransitionTargetPageNameKeyword {
// 一般向け(Controller) // 一般向け(Controller)
public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult"; public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
// 管理者向け(Controller)（ブラウザから呼ばれるURL） // 管理者向け(Controller)
public static final String DELETE_EMPLOYEE = "/deleteEmployee"; public static final String DELETE_EMPLOYEE = "/deleteEmployee";
// public static final String DELETE_DEPARTMENT = "/deleteDepartment";
public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput"; public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm"; public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
public static final String INSERT_EMPLOYEE = "/insertEmployee"; public static final String INSERT_EMPLOYEE = "/insertEmployee";
public static final String INSERT_DEPARTMENT = "/insertDepartmentInput";
// public static final String INSERT_DEPARTMENT_INPUT = "/selectDepartmentInfo";
// public static final String INSERT_DEPARTMENT_CONFIRM = "/selectDepartmentConfirm";
public static final String SHOW_MENU = "/showMenu"; public static final String SHOW_MENU = "/showMenu";
public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo"; public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll"; public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
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";
public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput"; public static final String SELECT_DEPARTMENT = "/selectDepartment";
public static final String DELETE_DEPARTMENT = "/deleteDepartment"; public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
// Department // Department
// HTML // HTML
@@ -71,19 +72,16 @@ public class TransitionTargetPageNameKeyword {
LOGOUT, LOGOUT,
DO_LOGIN, DO_LOGIN,
DELETE_EMPLOYEE, DELETE_EMPLOYEE,
DELETE_DEPARTMENT,
INSERT_EMPLOYEE_INPUT, INSERT_EMPLOYEE_INPUT,
INSERT_EMPLOYEE_CONFIRM, INSERT_EMPLOYEE_CONFIRM,
INSERT_EMPLOYEE, INSERT_EMPLOYEE,
INSERT_DEPARTMENT,
SHOW_MENU, SHOW_MENU,
SELECT_EMPLOYEE_INFO, SELECT_EMPLOYEE_INFO,
SELECT_DEPARTMENT,
SELECT_EMPLOYEE_INFO_FORM_EMPTY, SELECT_EMPLOYEE_INFO_FORM_EMPTY,
SHOW_UPDATE_EMPLOYEE, SHOW_UPDATE_EMPLOYEE,
UPDATE_EMPLOYEE_RESULT, UPDATE_EMPLOYEE_RESULT
SELECT_DEPARTMENT_INFO,
SELECT_DEPARTMENT_INFO_FORM_EMPTY,
INSERT_DEPARTMENT_INPUT
); );
} }

21
src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java
View File

@@ -1,12 +1,14 @@
package com.example.rhizome.app.presentation.form; package com.example.rhizome.app.presentation.form;
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 lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.List;
/** /**
* 画面の表示に使う部署コード管理用のクラス * 画面の表示に使う部署コード管理用のクラス
*/ */
@@ -44,4 +46,19 @@ public class DepartmentForm {
public static List<DepartmentForm> convertFrom(List<Department> departmentList) { public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
return departmentList.stream().map(DepartmentForm::convertFrom).toList(); return departmentList.stream().map(DepartmentForm::convertFrom).toList();
} }
/**
* 画面用（presentation 層）の DepartmentForm クラスから business 層の SearchConditionDepartment クラスに
* 変換します。
*
* @param departmentForm 画面用（presentation 層）の departmentForm インスタンス
* @return business 層の searchConditionDepartment インスタンス
*/
public static SearchConditionDepartment convertTo(DepartmentForm departmentForm) {
return new SearchConditionDepartment(
departmentForm.getIdDepartment(),
departmentForm.getNmDepartment()
);
}
} }

110
src/main/java/com/example/rhizome/app/presentation/form/InsertDepartmentForm.java
View File

@@ -1,110 +0,0 @@
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 {
/**
* 部署ID
*/
private Integer idDepartment;
/**
* 部署名
*/
private String nmDepartment;
/**
* パスワードのValidation
* チェック対象にエラーが有った場合エラーリストに文言を追加する
*
* @param password 登録対象のパスワード
* @param passwordConfirm 登録対象のパスワード再入力
* @param error エラーリスト
*/
private static void checkPassword(String password, String passwordConfirm, List<String> error) {
final String PASSWORD_NULL_BLANK = "パスワード が未入力です。";
final String PASSWORD_CONFIRM_NULL_BLANK = "パスワード確認用 が未入力です。";
final String PASSWORD_MISMATCH = "パスワード と パスワード確認用 が一致しません。";
if (isNullOrBlank(password)) {
error.add(PASSWORD_NULL_BLANK);
return;
}
if (isNullOrBlank(passwordConfirm)) {
error.add(PASSWORD_CONFIRM_NULL_BLANK);
return;
}
if (!password.equals(passwordConfirm)) {
error.add(PASSWORD_MISMATCH);
}
}
/**
* 仮引数を 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(
insertDepartmentForm.getIdDepartment(),
insertDepartmentForm.getNmDepartment()
);
}
/**
* 登録データのValidationを行う
*
* @return エラーが有った場合はエラー文言、無ければ空のリストが返る
*/
public List<String> validateParameter() {
final String DEPARTMENT_NAME_NULL_BLANK = "部署名"; //入力エラーになったときに返す項目
final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
List<String> error = new ArrayList<>();
if (isNullOrBlank(nmDepartment)) {
error.add(DEPARTMENT_NAME_NULL_BLANK);
}
if (idDepartment == null) {
error.add(DEPARTMENT_ID_NULL_BLANK);
}
return error;
}
}

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

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

67
src/main/resources/templates/insertDepartmentInput.html
View File

@@ -1,67 +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="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>

23
src/main/resources/templates/insertDevelopmentInput.html Normal file
View File

@@ -0,0 +1,23 @@
<!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>
社員登録　　　
</h1>
<a href="showMenu">メニューに戻る</a>
</body>
</html>

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

@@ -25,25 +25,26 @@
<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">登録済みのユーザ一覧表示と更新、削除を行います。</td>
</tr> </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-search"></i> 部署登録 </a>
</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>
</tr> </tr>
<tr>
<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
</td>
<td class="description">登録済みの部署一覧表示と更新、削除を行います。</td>
</tr>
<tr>
<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
</td>
<td class="description">新規で部署追加を行います。</td>
</tr>
</table> </table>
</body> </body>
@@ -70,13 +71,13 @@
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', 'selectDepartment');
// 動的送信用の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", "selectDepartmentInfo"); inputField.setAttribute("value", "selectDepartment");
form.appendChild(inputField); form.appendChild(inputField);

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

@@ -14,15 +14,15 @@
</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" <form action="selectDepartment"
method="post" method="post"
th:object="${searchConditionDepartmentForm}"> th:object="${departmentForm}">
<div class="msgBox error" th:if="${messageError} != null"> <div class="msgBox error" th:if="${messageError} != null">
<span class="error" th:text="${messageError.message}"></span> <span class="error" th:text="${messageError.message}"></span>
@@ -41,10 +41,11 @@
<td> <td>
<input placeholder="部署名" <input placeholder="部署名"
th:field="*{nmDepartment}" th:field="*{nmDepartment}"
type="text"/> type="text"/>部署名
</td> </td>
</tr> </tr>
<tr>
<tr>
<td class="btnArea" colspan="2"> <td class="btnArea" colspan="2">
<input type="submit" value="検索"/> <input type="submit" value="検索"/>
</td> </td>
@@ -65,7 +66,7 @@
</script> </script>
</th:block> </th:block>
<div class="header-spacing"></div> <div class="header-spacing"></div>
<th:block th:if="${departmentInfoFormList != null and departmentInfoFormList.size() > 0}"> <th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
<!-- 検索結果が1件以上ある場合 --> <!-- 検索結果が1件以上ある場合 -->
<table class="table-grid table-striped table-hover"> <table class="table-grid table-striped table-hover">
<thead> <thead>
@@ -76,27 +77,21 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="departmentInfoForm : ${departmentInfoFormList}"> <tr th:each="departmentFormList : ${departmentFormList}">
<td th:text="${departmentInfoForm.idDepartment}"></td> <td th:text="${departmentFormList.idDepartment}"></td>
<td th:text="${departmentInfoForm.nmDepartment}"></td> <td th:text="${departmentFormList.nmDepartment}"></td>
<td> <td>
<!-- 更新フォーム --> <!-- 更新フォーム -->
<form action="showUpdateDepartment" method="post" style="display: inline;">
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}" type="hidden">
<input type="submit" value="更新">
</form>
<!-- 削除フォーム --> <!-- 削除フォーム -->
<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
style="display: inline;">
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}" type="hidden">
<input type="submit" value="削除">
</form>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</th:block> </th:block>
<th:block th:if="${departmentInfoFormList == null or departmentInfoFormList.size() == 0}"> <th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
<!-- 検索結果が0件の場合 --> <!-- 検索結果が0件の場合 -->
検索結果はありません。 検索結果はありません。
</th:block> </th:block>
@@ -111,4 +106,6 @@
</script> </script>
</html> </html>

10
src/main/webapp/NewFile.html
View File

@@ -1,10 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>
</body>
</html>

10
src/main/webapp/insertDepartmentInput.html
View File

@@ -1,10 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>
</body>
</html>

114
src/main/webapp/selectDepartment.html
View File

@@ -1,114 +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="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="${departmentInfoFormList != null and departmentInfoFormList.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 : ${departmentInfoFormList}">
<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}" type="hidden">
<input type="submit" value="更新">
</form>
<!-- 削除フォーム -->
<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
style="display: inline;">
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}" type="hidden">
<input type="submit" value="削除">
</form>
</td>
</tr>
</tbody>
</table>
</th:block>
<th:block th:if="${departmentInfoFormList == null or departmentInfoFormList.size() == 0}">
<!-- 検索結果が0件の場合 -->
検索結果はありません。
</th:block>
</body>
<script type="text/javascript">
function clearInput() {
document.getElementById('idDepartment').value = '';
document.getElementById('nmDepartment').value = '';
}
</script>
</html>

10
src/main/webapp/selectDepartment2.html
View File

@@ -1,10 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>
</body>
</html>

BIN
テスト仕様書/~$単体テスト仕様書.xlsx
View File

Binary file not shown.

BIN
設計書/~$【管理者】メニュー機能-詳細設計書.xlsx
View File

Binary file not shown.

BIN
設計書/~$【管理者】社員情報登録機能-詳細設計書.xlsx
View File

Binary file not shown.

BIN
設計書/~$【管理者】部署情報検索更新削除機能-詳細設計書.xlsx
View File

Binary file not shown.

BIN
設計書/~$テーブル定義書.xlsm
View File

Binary file not shown.

BIN
設計書/~$基本設計書.xlsx
View File

Binary file not shown.

BIN
設計書/基本設計書.xlsx
View File

Binary file not shown.