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:y-kumaki
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 ... y-kumaki

Author SHA1 Message Date
y-kumaki
c9e78efe87 [ADD] 第一段階まで完了しました。 2026-09-10 16:41:03 +09:00
44 changed files with 363 additions and 838 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 +0,0 @@
/target/
/bin/

37
.project
View File

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

13
.settings/.jsdtscope
View File

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +0,0 @@
Window

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

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

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

@@ -5,7 +5,6 @@ import lombok.Getter;
/**
* 部署情報の検索要件を表現するモデルクラスです。
*画面の検索条件を受け取る
*/
@Getter
@AllArgsConstructor
@@ -16,7 +15,15 @@ public class SearchConditionDepartment {
private final Integer idDepartment;
/**
* 部署名
*
*/
private final String nmDepartment;
public static SearchConditionDepartment convertTo(SearchConditionDepartment searchConditionDepartment) {
// TODO 自動生成されたメソッド・スタブ
return null;
}
}

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

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

@@ -1,5 +1,3 @@
//サービス
package com.example.rhizome.app.domain.service;
import java.util.List;
@@ -8,14 +6,9 @@ import com.example.rhizome.app.domain.model.Department;
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
public interface SearchDepartment {
List<Department> selectAll(); //DBから全取得
List<Department> selectAll();
List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment); //条件検索
List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
}
//controller→SeachDepartment→Repository→DB

7
src/main/java/com/example/rhizome/app/domain/service/SearchDepartmentInfo.java Normal file
View File

@@ -0,0 +1,7 @@
package com.example.rhizome.app.domain.service;
public interface SearchDepartmentInfo {
// List<DepartmentInfo> selectAll();
//
// List<DepartmentInfo> searchBy(SearchConditionEmployee searchConditionEmployee);
}

57
src/main/java/com/example/rhizome/app/domain/service/SearchDepartmentInfoImpl.java Normal file
View File

@@ -0,0 +1,57 @@
//package com.example.rhizome.app.domain.service;
//
//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.EmployeeInfo;
//import com.example.rhizome.app.domain.model.SearchConditionEmployee;
//import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
//import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
//
//@Service
//@Transactional
//public class SearchDepartmentInfoImpl implements SearchDepartmentInfo{
//
// DepartmentInfoRepository departmentInfoRepository;
//
// @Autowired
// public SearchDepartmentInfoImpl(EmployeeInfoRepository employeeInfoRepository) {
// this.departmentInfoRepository = departmentInfoRepository;
// }
//
//
// /**
// * EmployeeInfo (employee join department) のレコードを全件取得
// *
// * @return 取得したレコード全件
// */
// public List<DepartmentInfo> selectAll() {
//
// return EmployeeDepartmentEntity.createEmployeeInfoList(departmentInfoRepository.findAll());
//
// }
//
// /**
// * SearchConditionEmployee の情報を元に EmployeeInfo (employee join department) のレコードを取得
// *
// * @param searchConditionEmployee 検索条件
// * @return 検索結果のレコードリスト
// */
// public List<DepartmentInfo> searchBy(SearchConditionEmployee searchConditionEmployee) {
// // 動的に検索条件を絞り込む
// // Specification は Criteria API の Predicate をラップしたもの
// return EmployeeDepartmentEntity
// .createEmployeeInfoList(
// employeeInfoRepository.findAll(Specification
// .where(EmployeeInfoRepository.idEmployeeEqual(searchConditionEmployee.getIdEmployee()))
// .and(EmployeeInfoRepository.nmEmployeeEqual(searchConditionEmployee.getNmEmployee()))
//
// )
// );
//
// }
// }

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

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

@@ -1,18 +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;
/**
* 部署情報検索系の機能を集約させるサービスクラスです。
@@ -43,7 +42,6 @@ public class SearchDepartmentImpl implements SearchDepartment {
}
/**
*seachBy完全一致検索用メソッド
* searchConditionDepartment の情報を元に Department のレコードを取得
*
* @param searchConditionDepartment 検索条件

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

33
src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentInputController.java
View File

@@ -9,67 +9,63 @@ 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.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.InsertDepartmentForm;
import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
/**
* 登録画面表示用コントローラ
* 部署登録画面を表示するだけ
*/
@Controller
public class InsertDepartmentInputController {
// ログ出力用インスタンス
private final static Logger LOGGER = Logger.getLogger(InsertDepartmentInputController.class.getName());
private final static Logger LOGGER = Logger.getLogger(InsertEmployeeInputController.class.getName());
// エラーメッセージ用の定数フィールド
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
HttpSession httpSession;
RegisterDepartment registerDepartment;
RegisterEmployee registerEmployee;
SearchDepartment searchDepartment;
@Autowired
public InsertDepartmentInputController(HttpSession httpSession, RegisterDepartment registerDepartment, SearchDepartment searchDepartment) {
public InsertDepartmentInputController(HttpSession httpSession, RegisterEmployee registerEmployee, SearchDepartment searchDepartment) {
this.httpSession = httpSession;
this.registerDepartment = registerDepartment;
this.registerEmployee = registerEmployee;
this.searchDepartment = searchDepartment;
}
@ModelAttribute
public InsertDepartmentForm insertDepartmentForm() {
return new InsertDepartmentForm();
public InsertEmployeeForm insertEmployeeForm() {
return new InsertEmployeeForm();
}
/**
* 登録画面表示処理
*
* @param insertDepartmentForm 登録画面のフォーム
* @param insertEmployeeForm 登録画面のフォーム
* @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面
*/
@SessionCheck
@PermissionCheck
@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
public String insertInput(InsertDepartmentForm insertDepartmentForm, Model model) {
public String insertInput() {
try {
// 部署コードリストを作成し、画面に返す値としてセット
//model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
// パラメータをセット
model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
// 登録画面に遷移
return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
@@ -87,6 +83,3 @@ public class InsertDepartmentInputController {
}
}
}

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

@@ -14,31 +14,32 @@ 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.SearchConditionDepartment;
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 Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
// エラーメッセージ用の定数フィールド
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
HttpSession httpSession;
SearchDepartment searchDepartment;
SearchEmployeeInfo searchEmployeeInfo;
@Autowired
public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployeeInfo searchEmployeeInfo) {
this.httpSession = httpSession;
this.searchDepartment = searchDepartment;
this.searchEmployeeInfo = searchEmployeeInfo;
}
@ModelAttribute
@@ -46,45 +47,34 @@ public class SelectDepartmentController {
return new SearchConditionDepartmentForm();
}
/**
* 部署検索画面表示処理コントローラ
*
* @param searchConditionDepartmentForm 検索画面のフォーム
* @param searchConditionEmployeeForm 検索画面のフォーム
* @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面
*/
@PermissionCheck
@SessionCheck
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
public String select(SearchConditionDepartment searchConditionDepartment, Model model) {
try {
// 部署一覧を取得し、画面に返す用のクラスに詰め替える
// 作成した部署一覧をセット
model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentForm.convertFrom(searchDepartment.selectAll()) //部署一覧をDBから取得→List<DepartmentForm>
//DepartmentをDepartmentFormという型に変換
//model.Attributet(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,変換した部署一覧)
//DBから部署一覧を取得して
//画面表示用のDepartmentFormに変換して
//departmentFormListという名前で画面に渡す
);
// model.addAttribute(
// PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
// DepartmentForm.convertFrom(searchDepartment.selectAll())
// );
// 検索条件を元に検索を実施
// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_INFO_FORM_LIST,
DepartmentForm.convertFrom(
searchDepartment.searchByWithLike(
SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
//SearchConditionDepartmentForm…画面から送られた検索条件
//model.Attributet(PageReturnAttributeKeyword.DEPARTMENT_INFO_FORM_LIST,変換済み検索結果)
//画面で入力された検索条件を検索用オブジェクトに変換して
//その条件で部署を検索して
//検索結果を画面表示用のDepartmentFormに変換して、
//departmentInfoFormListという名前でHTMLに渡している
model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentForm.convertFrom(searchDepartment.searchByWithLike(searchConditionDepartment)));
// 検索ページに遷移
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
@@ -103,34 +93,40 @@ public class SelectDepartmentController {
}
/**
* 社員検索画面表示処理コントローラ
* 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
*
* @param model ビューにデータを渡すためのコンテナ
* @return 遷移先の画面
*/
@PermissionCheck
@SessionCheck
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
public String select(Model model) {
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
public String select1(SearchConditionDepartment searchConditionDepartment, Model model) {
try {
// 部署一覧を取得し、画面に返す用のクラスに詰め替える
// 作成した部署一覧をセット
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;
} catch (Exception e) {
// ログイン情報の破棄
httpSession.invalidate();
e.printStackTrace();
// エラーログ出力
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// エラー画面遷移
return TransitionTargetPageNameKeyword.ERROR_HTML;
}
}
}

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

@@ -1,5 +1,17 @@
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;
@@ -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.EmployeeInfoForm;
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;
/**
* 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -70,7 +72,9 @@ public class SelectEmployeeController {
// 検索条件を元に検索を実施
// 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
model.addAttribute(
PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,
EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
// 検索ページに遷移
return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;

6
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 に返却する際に使用する文字列を管理するクラス
* モデルに渡すキー名を定数化
*/
public class PageReturnAttributeKeyword {
@@ -10,14 +9,11 @@ public class PageReturnAttributeKeyword {
public static final String MESSAGE_INFO = "messageInfo";
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 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 INSERT_DEPARTMENT_INPUT = "insertDepartmentInput";
public static final String INSERT_DEPARTMENT_FORM = "insertDepartmentForm";
public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInputHtml";
public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
}

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

@@ -4,7 +4,6 @@ import java.util.Set;
/**
* システムで利用しているJSPのリスト
* 画面用（URL）用の定数、行き先管理
*/
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_RESULT_HTML = "updatePersonalEmployeeResult";
// 管理者向け(View名)
// 管理者向け
public static final String MENU_HTML = "menu";
public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
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 INSERT_DEPARTMENT_INPUT_HTML = "/insertDepartmentInput";
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";
@@ -38,20 +36,19 @@ public class TransitionTargetPageNameKeyword {
// 一般向け(Controller)
public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
// 管理者向け(Controller)（ブラウザから呼ばれるURL）
// 管理者向け(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 INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
public static final String SHOW_MENU = "/showMenu";
public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
public static final String SELECT_DEPARTMENT = "/selectDepartment";
public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
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 UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
public static final String DELETE_DEPARTMENT = "/deleteDepartment";
// Department
// HTML
@@ -71,19 +68,17 @@ public class TransitionTargetPageNameKeyword {
LOGOUT,
DO_LOGIN,
DELETE_EMPLOYEE,
DELETE_DEPARTMENT,
INSERT_EMPLOYEE_INPUT,
INSERT_EMPLOYEE_CONFIRM,
INSERT_EMPLOYEE,
INSERT_DEPARTMENT_INPUT,
SHOW_MENU,
SELECT_EMPLOYEE_INFO,
SELECT_DEPARTMENT,
SELECT_DEPARTMENT_INFO,
SELECT_EMPLOYEE_INFO_FORM_EMPTY,
SHOW_UPDATE_EMPLOYEE,
UPDATE_EMPLOYEE_RESULT,
SELECT_DEPARTMENT_INFO,
SELECT_DEPARTMENT_INFO_FORM_EMPTY,
INSERT_DEPARTMENT_INPUT
UPDATE_EMPLOYEE_RESULT
);
}

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

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

@@ -6,48 +6,30 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
*/
@Data
@AllArgsConstructor //全フィールドを初期化するコンストラクタ生成
@NoArgsConstructor //デフォルトコントラスタを自動生成
@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()
);
}
}

1
src/main/java/com/example/rhizome/app/presentation/form/SearchConditionEmployeeForm.java
View File

@@ -1,6 +1,7 @@
package com.example.rhizome.app.presentation.form;
import com.example.rhizome.app.domain.model.SearchConditionEmployee;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
src/main/resources/application.properties
View File

@@ -1,3 +1,3 @@
spring.datasource.url=jdbc:mysql://localhost:3306/springdb
spring.datasource.url=jdbc:mysql://localhost:3306/rezospring
spring.datasource.username=rezouser
spring.datasource.password=Rezo_0000

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

@@ -9,59 +9,16 @@
<!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.css}">
<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
<title>部署登録</title>
</head>
<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>

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

@@ -27,17 +27,6 @@
</td>
<td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</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-search"></i> 部署登録 </a>
</td>
<td class="description">部署の新規登録を行います。</br></td>
</tr>
<tr>
<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
@@ -45,6 +34,22 @@
</tr>
</table>
<table class="menuClass">
<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>
<script type="text/javascript">
@@ -53,6 +58,7 @@
form.setAttribute('method', 'post');
form.setAttribute('action', 'selectEmployeeInfo');
// 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input");
@@ -70,13 +76,13 @@
function selectDepartmentSubmit() {
const form = document.createElement('form');
form.setAttribute('method', 'post');
form.setAttribute('action', 'selectDepartmentInfo');
form.setAttribute('action', 'selectDepartment');
// 動的送信用のHidden
// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
const inputField = document.createElement("input");
inputField.setAttribute("type", "hidden");
inputField.setAttribute("value", "selectDepartmentInfo");
inputField.setAttribute("value", "selectDepartment");
form.appendChild(inputField);

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

@@ -22,7 +22,7 @@
</h1>
<form action="selectDepartmentInfo"
method="post"
th:object="${searchConditionDepartmentForm}">
th:object="${searchConditionDepartment}">
<div class="msgBox error" th:if="${messageError} != null">
<span class="error" th:text="${messageError.message}"></span>
@@ -44,6 +44,7 @@
type="text"/>
</td>
</tr>
<tr>
<td class="btnArea" colspan="2">
<input type="submit" value="検索"/>
@@ -65,48 +66,48 @@
</script>
</th:block>
<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件以上ある場合 -->
<table class="table-grid table-striped table-hover">
<thead>
<tr>
<th style="width: 60px;">部署ID</th>
<th style="width: 100px;">部署名</th>
<th style="width: 60px;">社員ID</th>
<th style="width: 150px;">所属部署</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>
<tr th:each="departmentForm : ${departmentFormList}">
<td th:text="${departmentForm.idDepartment}"></td>
<td th:text="${departmentForm.nmDepartment}"></td>
<td>
<!-- 更新フォーム -->
<form action="showUpdateDepartment" method="post" style="display: inline;">
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}" type="hidden">
<form action="showUpdateEmployee" method="post" style="display: inline;">
<input name="idEmployee" th:value="${departmentForm.idDepartment}" type="hidden">
<input type="submit" value="更新">
</form>
<!-- 削除フォーム -->
<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
<form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
style="display: inline;">
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}" type="hidden">
<input name="idEmployee" th:value="${departmentForm.idDepartment}" type="hidden">
<input type="submit" value="削除">
</form>
</td>
</tr>
</tbody>
</table>
</th:block>
<th:block th:if="${departmentInfoFormList == null or departmentInfoFormList.size() == 0}">
<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').value = '';
}

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>

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

@@ -20,9 +20,9 @@
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
</h1>
<form action="selectDepartmentInfo"
<form action="selectDepartment"
method="post"
th:object="${searchConditionDepartmentForm}">
th:object="${searchConditionDepartment}">
<div class="msgBox error" th:if="${messageError} != null">
<span class="error" th:text="${messageError.message}"></span>
@@ -44,6 +44,7 @@
type="text"/>
</td>
</tr>
<tr>
<td class="btnArea" colspan="2">
<input type="submit" value="検索"/>
@@ -65,30 +66,30 @@
</script>
</th:block>
<div class="header-spacing"></div>
<th:block th:if="${departmentInfoFormList != null and departmentInfoFormList.size() > 0}">
<th:block th:if="${departmentFormList != null and employeeInfoFormList.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: 60px;">社員ID</th>
<th style="width: 150px;">所属部署</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>
<tr th:each="departmentForm : ${departmentFormList}">
<td th:text="${departmentForm.idEmployee}"></td>
<td th:text="${departmentForm.nmDepartment}"></td>
<td>
<!-- 更新フォーム -->
<form action="showUpdateDepartment" method="post" style="display: inline;">
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}" type="hidden">
<form action="showUpdateEmployee" method="post" style="display: inline;">
<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
<input type="submit" value="更新">
</form>
<!-- 削除フォーム -->
<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
<form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
style="display: inline;">
<input name="idDepartment" th:value="${departmentInfoForm.idDepartment}" type="hidden">
<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
<input type="submit" value="削除">
</form>
</td>
@@ -96,7 +97,7 @@
</tbody>
</table>
</th:block>
<th:block th:if="${departmentInfoFormList == null or departmentInfoFormList.size() == 0}">
<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
<!-- 検索結果が0件の場合 -->
検索結果はありません。
</th:block>
@@ -105,8 +106,8 @@
<script type="text/javascript">
function clearInput() {
document.getElementById('idDepartment').value = '';
document.getElementById('nmDepartment').value = '';
document.getElementById('idEmployee').value = '';
document.getElementById('idDepartment').selectedIndex = 0;
}

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.