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

Compare commits

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

4 Commits
s-ikeda ... m-endo

Author SHA1 Message Date
m-endo
5384d33379 第二段階途中 2026-10-14 16:51:21 +09:00
m-endo
5702305e68 第一段階 2026-10-14 15:03:46 +09:00
m-mun
9a5b0e1adc pre 2026-10-14 08:31:13 +09:00
m-mun
b1a45f0f97 実装手順書を追加しました 2026-10-14 07:57:34 +09:00
41 changed files with 2573 additions and 622 deletions
Expand all files Collapse all files

41
.classpath Normal file
View File

@@ -0,0 +1,41 @@
<?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 Normal file
View File

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

37
.project Normal file
View File

@@ -0,0 +1,37 @@
<?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 Normal file
View File

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

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

@@ -0,0 +1,6 @@
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 Normal file
View File

@@ -0,0 +1,11 @@
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 Normal file
View File

@@ -0,0 +1,10 @@
<?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 Normal file
View File

@@ -0,0 +1,7 @@
<?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 Normal file
View File

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

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

@@ -0,0 +1 @@
Window

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

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

25
src/main/java/com/example/rhizome/app/domain/model/DepartmentInfo.java Normal file
View File

@@ -0,0 +1,25 @@
package com.example.rhizome.app.domain.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
//コピペのみ、部署用に修正必要
/**
* 部署情報の概念を表現するモデルクラスです。
*/
@Getter
@AllArgsConstructor
public class DepartmentInfo {
/**
* 社員情報
*/
private final Employee employee;
/**
* 部署名
*/
private final Department department;
}

5
src/main/java/com/example/rhizome/app/domain/service/DeleteDepartment.java Normal file
View File

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

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

@@ -1,25 +1,14 @@
package com.example.rhizome.app.domain.service; package com.example.rhizome.app.domain.service;
import com.example.rhizome.app.domain.model.Department;
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
import java.util.List; import java.util.List;
import com.example.rhizome.app.domain.model.Department;
import com.example.rhizome.app.domain.model.Employee;
import com.example.rhizome.app.domain.model.LoginUser;
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
public interface SearchDepartment { public interface SearchDepartment {
List<Department> selectAll();
List<Department> searchDepartmentBynmDepartment(String nmDepartment); List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
List<Department> searchDepartmentByIdDepartment(Integer idDepartment);
// これはなにをしている？　SearchEmployeeより
LoginUser searchLoginUser(String mailAddress);
Employee searchEmployeeByIdEmployee(Integer idEmployee);
List<Department> selectAll();
List<Department> searchByWithLike(SearchConditionDepartment condition);
List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
} }

27
src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java Normal file
View File

@@ -0,0 +1,27 @@
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;
//@Srviceをつけ忘れるとControllerで使うときに起動時エラーになってしまう
@Service
@Transactional
public class DeleteDepartmentImpl implements DeleteDepartment {
DepartmentRepository departmentRepository;
@Autowired
public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
this.departmentRepository = departmentRepository;
}
public void deleteDepartment(Integer idDepartment) {
// ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
// （お手本の DeleteEmployeeImpl を見る）
departmentRepository.deleteById(idDepartment);
}
}

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

@@ -1,20 +1,17 @@
package com.example.rhizome.app.domain.service.impl; package com.example.rhizome.app.domain.service.impl;
import java.util.List; 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.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.example.rhizome.app.domain.model.Department; import java.util.List;
import com.example.rhizome.app.domain.model.Employee;
import com.example.rhizome.app.domain.model.LoginUser;
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;
/** /**
* 部署情報検索系の機能を集約させるサービスクラスです。 * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -82,28 +79,4 @@ public class SearchDepartmentImpl implements SearchDepartment {
); );
} }
@Override
public List<Department> searchDepartmentBynmDepartment(String nmDepartment) {
// TODO 自動生成されたメソッド・スタブ
return null;
}
@Override
public List<Department> searchDepartmentByIdDepartment(Integer idDepartment) {
// TODO 自動生成されたメソッド・スタブ
return null;
}
@Override
public LoginUser searchLoginUser(String mailAddress) {
// TODO 自動生成されたメソッド・スタブ
return null;
}
@Override
public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
// TODO 自動生成されたメソッド・スタブ
return null;
}
} }

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

@@ -0,0 +1,12 @@
package com.example.rhizome.app.domain.service.impl;
import java.util.List;
import com.example.rhizome.app.domain.model.Department;
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
public interface SearchDepartmentInfo {
List<Department> selectAll();
List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
}

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

@@ -0,0 +1,59 @@
package com.example.rhizome.app.domain.service.impl;
import java.util.List;
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.model.SearchConditionDepartment;
import com.example.rhizome.app.infra.repository.DepartmentInfoRepository;
/**
* SearchDepartmentInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです
*/
@Service
@Transactional
public class SearchDepartmentInfoImpl implements SearchDepartmentInfo {
DepartmentInfoRepository departmentInfoRepository;
@Autowired
public SearchDepartmentInfoImpl(DepartmentInfoRepository departmentInfoRepository) {
this.departmentInfoRepository = departmentInfoRepository;
}
/**
* DepartmentInfo (employee join department) のレコードを全件取得
*
* @return 取得したレコード全件
*/
public List<Department> selectAll() {
return null;//EmployeeDepartmentEntity.createDepartmentInfoList(departmentInfoRepository.findAll());
}
/**
* SearchConditionDepartment の情報を元に DepartmentInfo (employee join department) のレコードを取得
*
* @param searchConditionDepartment 検索条件
* @return 検索結果のレコードリスト
*/
public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
// 動的に検索条件を絞り込む
// Specification は Criteria API の Predicate をラップしたもの
return null;
// EmployeeDepartmentEntity
// .createDepartmentInfoList(
// departmentInfoRepository.findAll(Specification
// .where(EmployeeInfoRepository
// .idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
// .and(EmployeeInfoRepository
// .idDepartmentEqual(searchConditionDepartment.getNmDepartment()))
//
// ));
}
}

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

@@ -1,16 +1,17 @@
package com.example.rhizome.app.domain.service.impl; package com.example.rhizome.app.domain.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.example.rhizome.app.domain.model.EmployeeInfo; import com.example.rhizome.app.domain.model.EmployeeInfo;
import com.example.rhizome.app.domain.model.SearchConditionEmployee; import com.example.rhizome.app.domain.model.SearchConditionEmployee;
import com.example.rhizome.app.domain.service.SearchEmployeeInfo; import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity; import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
import com.example.rhizome.app.infra.repository.EmployeeInfoRepository; import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
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;
/** /**
* SearchEmployeeInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです * SearchEmployeeInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです

33
src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java
View File

@@ -1,16 +1,28 @@
package com.example.rhizome.app.infra.entity; package com.example.rhizome.app.infra.entity;
import com.example.rhizome.app.domain.model.Department; import java.util.List;
import com.example.rhizome.app.domain.model.Employee;
import com.example.rhizome.app.domain.model.EmployeeInfo; import javax.persistence.Column;
import lombok.AllArgsConstructor; import javax.persistence.Entity;
import lombok.Data; import javax.persistence.GeneratedValue;
import lombok.NoArgsConstructor; import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedEntityGraph;
import javax.persistence.Table;
import org.hibernate.annotations.Fetch; import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import javax.persistence.*; import com.example.rhizome.app.domain.model.Department;
import java.util.List; import com.example.rhizome.app.domain.model.DepartmentInfo;
import com.example.rhizome.app.domain.model.Employee;
import com.example.rhizome.app.domain.model.EmployeeInfo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/** /**
* Employee + Department の Join 情報を保持するEntity * Employee + Department の Join 情報を保持するEntity
@@ -114,5 +126,10 @@ public class EmployeeDepartmentEntity {
} }
public static List<DepartmentInfo> createDepartmentInfoList(List<EmployeeDepartmentEntity> all) {
// TODO 自動生成されたメソッド・スタブ
return null;
}
} }

28
src/main/java/com/example/rhizome/app/infra/repository/DepartmentInfoRepository.java Normal file
View File

@@ -0,0 +1,28 @@
package com.example.rhizome.app.infra.repository;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository;
import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
@Repository
public interface DepartmentInfoRepository
extends JpaRepository<EmployeeDepartmentEntity, Integer>, JpaSpecificationExecutor<EmployeeDepartmentEntity> {
static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
return idDepartment == null ? null :
// 戻り値の型 Specification<EmployeeDepartmentEntity> にキャスト
(Specification<EmployeeDepartmentEntity>)
// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
// を作成している
(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
}
static Specification<EmployeeDepartmentEntity> nmDepartmentEqual(String nmDepartment) {
return (nmDepartment == null || nmDepartment.isEmpty()) ? null
: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
}
}

9
src/main/java/com/example/rhizome/app/infra/repository/EmployeeInfoRepository.java
View File

@@ -1,11 +1,12 @@
package com.example.rhizome.app.infra.repository; package com.example.rhizome.app.infra.repository;
import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specification;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
/** /**
* ワンポイント情報（ここで登場する関数型インターフェース Specification について解説します） * ワンポイント情報（ここで登場する関数型インターフェース Specification について解説します）
* Specification: * Specification:
@@ -53,9 +54,9 @@ public interface EmployeeInfoRepository extends JpaRepository<EmployeeDepartment
(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("mailAddress"), "%" + mailAddress + "%"); (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("mailAddress"), "%" + mailAddress + "%");
} }
static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) { static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer integer) {
return (root, query, criteriaBuilder) -> return (root, query, criteriaBuilder) ->
idDepartment == null ? null : integer == null ? null :
criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment); criteriaBuilder.equal(root.join("department").get("idDepartment"), integer);
} }
} }

79
src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java Normal file
View File

@@ -0,0 +1,79 @@
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import com.example.rhizome.app.domain.model.SearchConditionDepartment;
import com.example.rhizome.app.domain.service.DeleteDepartment;
import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.domain.service.SearchEmployee;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.MessageForm;
@Controller
public class DeleteDepartmentController {
private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
HttpSession httpSession;
DeleteDepartment deleteDepartment;
SearchDepartment searchDepartment;
SearchEmployee searchEmployee; // 所属社員の確認に使う（既存）
@Autowired
public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment,
SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
this.httpSession = httpSession;
this.deleteDepartment = deleteDepartment;
this.searchDepartment = searchDepartment;
this.searchEmployee = searchEmployee;
}
@RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
Model model) {
final String UNKNOWN_ID = "削除対象のIDが不明です。";
final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
final String DELETE_COMPLETE = "削除しました。";
try {
// ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
// → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
if (idDepartment == null
|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)).isEmpty()) {
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
}
// ★② searchEmployee.searchEmployeeByIdDepartment(idDepartment) が空でない
// → MESSAGE_ERROR に HAS_EMPLOYEE を載せて一覧へ
if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
}
// ★③ deleteDepartment.deleteDepartment(idDepartment) → MESSAGE_INFO に DELETE_COMPLETE を載せて一覧へ
deleteDepartment.deleteDepartment(idDepartment);
model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
//以下がメッセージの載せ方
//model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
return "一覧へ戻る（ステップ 2-5 で決める）";
} catch (Exception e) {
httpSession.invalidate();
e.printStackTrace();
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
return TransitionTargetPageNameKeyword.ERROR_HTML;
}
}
}

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

@@ -1,21 +1,6 @@
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.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.PermissionCheck;
import com.example.rhizome.aop.aspect.SessionCheck; import com.example.rhizome.aop.aspect.SessionCheck;
import com.example.rhizome.app.domain.model.LoginUser; import com.example.rhizome.app.domain.model.LoginUser;
@@ -24,12 +9,25 @@ import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentForm; import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
import com.example.rhizome.app.presentation.form.LoginUserForm; import com.example.rhizome.app.presentation.form.LoginUserForm;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.MessageForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.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 javax.servlet.http.HttpSession;
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.Logger;
import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;
/** /**
* 削除処理のコントローラ * 削除処理のコントロータ
*/ */
@Controller @Controller
public class DeleteEmployeeController { public class DeleteEmployeeController {
@@ -68,7 +66,7 @@ public class DeleteEmployeeController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentForm.convertFrom(searchDepartment.selectAll()) DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
); );
// 削除処理実施 // 削除処理実施

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

@@ -1,132 +1,133 @@
//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 com.example.rhizome.aop.aspect.PermissionCheck;
// import com.example.rhizome.aop.aspect.SessionCheck;
//import java.util.List; import com.example.rhizome.app.domain.model.Employee;
//import java.util.logging.Level; import com.example.rhizome.app.domain.service.SearchDepartment;
//import java.util.logging.Logger; import com.example.rhizome.app.domain.service.SearchEmployee;
// import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
//import javax.servlet.http.HttpSession; import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
// import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
//import org.springframework.beans.factory.annotation.Autowired; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
//import org.springframework.stereotype.Controller; import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
//import org.springframework.ui.Model; import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
//import org.springframework.web.bind.annotation.ModelAttribute; import com.example.rhizome.app.presentation.form.MessageForm;
//import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.stereotype.Controller;
// import org.springframework.ui.Model;
//import com.example.rhizome.aop.aspect.PermissionCheck; import org.springframework.web.bind.annotation.ModelAttribute;
//import com.example.rhizome.aop.aspect.SessionCheck; import org.springframework.web.bind.annotation.RequestMapping;
//import com.example.rhizome.app.domain.model.Employee; import org.springframework.web.bind.annotation.RequestMethod;
//import com.example.rhizome.app.domain.service.SearchDepartment;
//import com.example.rhizome.app.domain.service.SearchEmployee; import javax.servlet.http.HttpSession;
//import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl; import java.util.List;
//import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl; import java.util.logging.Level;
//import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import java.util.logging.Logger;
//import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
//import com.example.rhizome.app.presentation.form.DepartmentForm; import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM;
//import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
//import com.example.rhizome.app.presentation.form.MessageForm; /**
// * 新規登録者情報チェック用のコントローラ
///** */
// * 新規登録者情報チェック用のコントローラ @Controller
// */ public class InsertEmployeeConfirmController {
//@Controller
//public class InsertEmployeeConfirmController { // ログ出力用インスタンス
// private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
// // ログ出力用インスタンス
// private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName()); // エラーメッセージ用の定数フィールド
// private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
// // エラーメッセージ用の定数フィールド
// private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; HttpSession httpSession;
// SearchDepartment searchDepartment;
// HttpSession httpSession; SearchEmployee searchEmployee;
// SearchDepartment searchDepartment;
// SearchEmployee searchEmployee; @Autowired
// public InsertEmployeeConfirmController(
// @Autowired HttpSession httpSession,
// public InsertEmployeeConfirmController( SearchDepartmentImpl searchDepartment,
// HttpSession httpSession, SearchEmployeeImpl searchEmployee
// SearchDepartmentImpl searchDepartment, ) {
// SearchEmployeeImpl searchEmployee this.httpSession = httpSession;
// ) { this.searchDepartment = searchDepartment;
// this.httpSession = httpSession; this.searchEmployee = searchEmployee;
// this.searchDepartment = searchDepartment; }
// this.searchEmployee = searchEmployee;
// } @ModelAttribute
// public InsertEmployeeForm insertEmployeeForm() {
// @ModelAttribute return new InsertEmployeeForm();
// public InsertEmployeeForm insertEmployeeForm() { }
// return new InsertEmployeeForm();
// } /**
// * 登録情報のチェックを行う
// /** *
// * 登録情報のチェックを行う * @param insertEmployeeForm 登録情報
// * * @param model ビューにデータを渡すためのコンテナ
// * @param insertEmployeeForm 登録情報 * @return 遷移先の画面
// * @param model ビューにデータを渡すためのコンテナ */
// * @return 遷移先の画面 @PermissionCheck
// */ @SessionCheck
// @PermissionCheck @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
// @SessionCheck public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
// @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
// public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) { try {
// // 部署一覧を取得し、画面に返す用のクラスに詰め替える
// try { // 作成した部署一覧をセット
// // 部署一覧を取得し、画面に返す用のクラスに詰め替える model.addAttribute(
// // 作成した部署一覧をセット PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
// model.addAttribute( DepartmentInfoForm.convertFrom(
// PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, searchDepartment.selectAll()
// DepartmentForm.convertFrom( ));
// searchDepartment.selectAll()
// )); // 登録用パラメータチェック
// List<String> error = insertEmployeeForm.validateParameter();
// // 登録用パラメータチェック
// List<String> error = insertEmployeeForm.validateParameter(); // 入力内容に誤りがあるか
// if (!error.isEmpty()) {
// // 入力内容に誤りがあるか // 誤りがあった場合
// if (!error.isEmpty()) { // 誤りがあった箇所のエラーメッセージを表示
// // 誤りがあった場合 model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
// // 誤りがあった箇所のエラーメッセージを表示 // 画面に返す為の登録情報をセット
// model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。")); model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
// // 画面に返す為の登録情報をセット // 登録画面に遷移
// model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm); return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
// // 登録画面に遷移 }
// return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
// } final String DUPLICATION = "既に登録済みのメールアドレスです。";
//
// final String DUPLICATION = "既に登録済みのメールアドレスです。"; // 登録対象のメールアドレスを元に検索
// List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
// // 登録対象のメールアドレスを元に検索
// List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress()); // 検索結果があるか
// if (!employeeList.isEmpty()) {
// // 検索結果があるか // 検索した結果0件ではない場合
// if (!employeeList.isEmpty()) { // 重複を許さないため、エラー処理
// // 検索した結果0件ではない場合 model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
// // 重複を許さないため、エラー処理 // 画面に返す為の登録情報をセット
// model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION)); model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
// // 画面に返す為の登録情報をセット // 登録画面に遷移
// model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm); return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
// // 登録画面に遷移 }
// return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
// } // 登録確認ページに遷移
// model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
// // 登録確認ページに遷移 // 登録確認画面に遷移
// model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm); return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
// // 登録確認画面に遷移
// return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
// } catch (Exception e) {
// // ログイン情報の破棄
// } catch (Exception e) { httpSession.invalidate();
// // ログイン情報の破棄
// httpSession.invalidate(); e.printStackTrace();
//
// e.printStackTrace(); // エラーログ出力
// LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
// // エラーログ出力 // エラー画面遷移
// LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); return TransitionTargetPageNameKeyword.ERROR_HTML;
// // エラー画面遷移 }
// return TransitionTargetPageNameKeyword.ERROR_HTML; }
// } }
// }
//}

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

@@ -1,21 +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.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import com.example.rhizome.aop.aspect.PermissionCheck; import com.example.rhizome.aop.aspect.PermissionCheck;
import com.example.rhizome.aop.aspect.SessionCheck; import com.example.rhizome.aop.aspect.SessionCheck;
import com.example.rhizome.app.domain.service.RegisterEmployee; import com.example.rhizome.app.domain.service.RegisterEmployee;
@@ -24,9 +8,23 @@ import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl; import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentForm; import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
import com.example.rhizome.app.presentation.form.InsertEmployeeForm; import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
import com.example.rhizome.app.presentation.form.MessageForm; import com.example.rhizome.app.presentation.form.MessageForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.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.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE;
/** /**
* 新規登録用のコントローラ * 新規登録用のコントローラ
@@ -73,7 +71,7 @@ public class InsertEmployeeController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentForm.convertFrom( DepartmentInfoForm.convertFrom(
searchDepartment.selectAll() searchDepartment.selectAll()
)); ));
@@ -195,3 +193,6 @@ public class InsertEmployeeController {
} }
} }

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

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

79
src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java Normal file
View File

@@ -0,0 +1,79 @@
package com.example.rhizome.app.presentation.controller;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
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.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
@Controller
public class SelectDepartmentController {
private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
HttpSession httpSession;
SearchDepartment searchDepartment;
@Autowired
public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
this.httpSession = httpSession;
this.searchDepartment = searchDepartment;
}
/** 空の検索条件Formを、この Controller の画面用に用意する */
@ModelAttribute
public SearchConditionDepartmentForm searchConditionDepartmentForm() {
return new SearchConditionDepartmentForm();
}
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
try {
// ★考える：①検索サービスを呼ぶ（Form→Model変換 → 部分一致のメソッド）
// ②結果(List<Department>)を DepartmentForm.convertFrom(...) で画面用に変換
// ③ model に PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST という名前で載せる
SearchConditionDepartment searchCondition = new SearchConditionDepartment(
searchConditionDepartmentForm.getIdDepartment(),
searchConditionDepartmentForm.getNmDepartment());
List<Department> departmentList = searchDepartment.searchByWithLike(searchCondition);
model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, departmentList);
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
} catch (Exception e) {
httpSession.invalidate();
e.printStackTrace();
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
return TransitionTargetPageNameKeyword.ERROR_HTML;
}
}
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
public String select(Model model) {
try {
// ★全件取得 → DepartmentForm に変換 → DEPARTMENT_FORM_LIST で model へ
return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
} catch (Exception e) {
httpSession.invalidate();
e.printStackTrace();
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
return TransitionTargetPageNameKeyword.ERROR_HTML;
}
}
}

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

@@ -1,24 +1,27 @@
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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import com.example.rhizome.aop.aspect.PermissionCheck; import com.example.rhizome.aop.aspect.PermissionCheck;
import com.example.rhizome.aop.aspect.SessionCheck; import com.example.rhizome.aop.aspect.SessionCheck;
import com.example.rhizome.app.domain.service.SearchDepartment; import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.domain.service.SearchEmployeeInfo; import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.DepartmentForm; import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
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;
/** /**
* 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能 * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -56,7 +59,7 @@ public class SelectEmployeeController {
*/ */
@PermissionCheck @PermissionCheck
@SessionCheck @SessionCheck
@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO, method = RequestMethod.POST) @PostMapping(TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO)
public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) { public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
try { try {
@@ -65,7 +68,7 @@ public class SelectEmployeeController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentForm.convertFrom(searchDepartment.selectAll()) DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
); );
// 検索条件を元に検索を実施 // 検索条件を元に検索を実施
@@ -105,7 +108,7 @@ public class SelectEmployeeController {
// 作成した部署一覧をセット // 作成した部署一覧をセット
model.addAttribute( model.addAttribute(
PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
DepartmentForm.convertFrom(searchDepartment.selectAll()) DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
); );
// 検索条件を元に検索を実施 // 検索条件を元に検索を実施

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

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

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

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

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

@@ -5,16 +5,15 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
*/ */
public class PageReturnAttributeKeyword { public class PageReturnAttributeKeyword {
public static final String MESSAGE_ERROR = "messageError"; public static final String MESSAGE_ERROR = "messageError";
public static final String MESSAGE_INFO = "messageInfo"; public static final String MESSAGE_INFO = "messageInfo";
public static final String DEPARTMENT_FORM_LIST = "departmentFormList"; public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm"; public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm"; public static final String 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 DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList"; public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
} }

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

@@ -7,97 +7,89 @@ import java.util.Set;
*/ */
public class TransitionTargetPageNameKeyword { public class TransitionTargetPageNameKeyword {
// 共通 // 共通
public static final String LOGIN_HTML = "login"; public static final String LOGIN_HTML = "login";
// 一般向け // 一般向け
public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput"; public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult"; public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
// 管理者向け // 管理者向け
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 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 UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput"; public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
public static final String ERROR_HTML = "error"; public static final String ERROR_HTML = "error";
// 共通(Controller) // 共通(Controller)
public static final String INDEX_BLANK = ""; public static final String INDEX_BLANK = "";
public static final String INDEX_SLASH = "/"; public static final String INDEX_SLASH = "/";
public static final String INDEX_LOGIN = "/login"; public static final String INDEX_LOGIN = "/login";
public static final String LOGOUT = "/logout"; public static final String LOGOUT = "/logout";
public static final String DO_LOGIN = "/doLogin"; public static final String DO_LOGIN = "/doLogin";
// 一般向け(Controller) // 一般向け(Controller)
public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult"; public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
// 管理者向け(Controller) // 管理者向け(Controller)
public static final String DELETE_EMPLOYEE = "/deleteEmployee"; public static final String DELETE_EMPLOYEE = "/deleteEmployee";
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 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_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll"; public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee"; public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult"; public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
public static final String SELECT_DEPARTMENT_INFO = "/selectEmployeeInfo"; // Department
public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll"; // HTML
public static final String DELETE_DEPARTMENT = "/deleteDepartment";
// Department
// HTML
public static final String SELECT_DEPARTMENT_HTML = "selectDepartment"; public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
// Controller
// Controller
public static final String SELECT_DEPARTMENT = "/selectDepartment"; public static final String SELECT_DEPARTMENT = "/selectDepartment";
public static final String DELETE_DEPARTMENT = "/deleteDepartment";
public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll"; public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
/**
* 管理者向けのページリストを返す
*
* @return 管理者向けのページリスト
*/
public static Set<String> getAdminPageList() {
return Set.of( /**
INDEX_BLANK, * 管理者向けのページリストを返す
INDEX_SLASH, *
INDEX_LOGIN, * @return 管理者向けのページリスト
LOGOUT, */
DO_LOGIN, public static Set<String> getAdminPageList() {
DELETE_EMPLOYEE,
INSERT_EMPLOYEE_INPUT,
INSERT_EMPLOYEE_CONFIRM,
INSERT_EMPLOYEE,
SHOW_MENU,
SELECT_EMPLOYEE_INFO,
SELECT_EMPLOYEE_INFO_FORM_EMPTY,
SHOW_UPDATE_EMPLOYEE,
UPDATE_EMPLOYEE_RESULT
);
}
/** return Set.of(
* 一般向けのページリストを返す INDEX_BLANK,
* INDEX_SLASH,
* @return 一般向けのページリスト INDEX_LOGIN,
*/ LOGOUT,
public static Set<String> getUserPageList() { DO_LOGIN,
return Set.of( DELETE_EMPLOYEE,
INDEX_BLANK, INSERT_EMPLOYEE_INPUT,
INDEX_SLASH, INSERT_EMPLOYEE_CONFIRM,
INDEX_LOGIN, INSERT_EMPLOYEE,
LOGOUT, SHOW_MENU,
DO_LOGIN, SELECT_EMPLOYEE_INFO,
PERSONAL_UPDATE_RESULT SELECT_EMPLOYEE_INFO_FORM_EMPTY,
); SHOW_UPDATE_EMPLOYEE,
} UPDATE_EMPLOYEE_RESULT);
}
/**
* 一般向けのページリストを返す
*
* @return 一般向けのページリスト
*/
public static Set<String> getUserPageList() {
return Set.of(
INDEX_BLANK,
INDEX_SLASH,
INDEX_LOGIN,
LOGOUT,
DO_LOGIN,
PERSONAL_UPDATE_RESULT);
}
} }

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

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

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

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

82
src/main/resources/templates/insertDpartmentInput.html Normal file
View File

@@ -0,0 +1,82 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>
<!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>
<th class="header">所属部署</th>
<td>
<label>
<select required="required" th:field="*{idDepartment}">
<option th:each="department : ${departmentFormList}"
th:selected="${insertDepartmentForm.idDepartment != null && department.idDepartment == insertDepartmentForm.idDepartment}"
th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
</option>
</select>
</label>
</td>
</tr>
<tr>
<td class="btnArea" colspan="2">
<input type="submit" value="登録確認" />
</td>
</tr>
</table>
</form>
<a href="showMenu">メニューに戻る</a>
</body>
</html>
</body>
</html>

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

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

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

@@ -25,16 +25,11 @@
<table> <table>
<tr> <tr>
<th class="header">部署ID</th> <th class="header">部署ID</th>
<td> <td><input placeholder="部署ID" th:field="*{idDepartment}" type="number" /></td>
<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
</td>
</tr> </tr>
<tr> <tr>
<th class="header">部署名</th> <th class="header">部署名</th>
<!-- ★部署名の入力欄（type="text"）を作る --> <td><input placeholder="部署名" th:field="*{nmDepartment}" type="text" /></td>
<td>
<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
</td>
</tr> </tr>
<tr> <tr>
<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td> <td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
@@ -46,33 +41,50 @@
<a href="showMenu">メニューに戻る</a> <a href="showMenu">メニューに戻る</a>
<h1><span>検索結果</span></h1> <h1><span>検索結果</span></h1>
<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList --> <!-- 【修正】th:ifのリスト名を controller と一致させる -->
<!-- departmentFormListから要素を順番に取り出す --> <table class="table-grid table-striped table-hover"
<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}"> th:if="${departmentFormList != null and departmentFormList.size() > 0}">
<thead>
<table>
<tr> <tr>
<!-- <th>部署ID</th>--> <th style="width: 60px;">部署ID</th>
<th>部署名</th> <th style="width: 100px;">部署名</th>
<th style="width: 150px;">操作</th>
</tr> </tr>
</thead>
<!-- 検索結果を1件ずつ取り出して表示 --> <tbody>
<!-- 【修正】ループ内で使う変数名を departmentForm に統一 -->
<tr th:each="departmentForm : ${departmentFormList}"> <tr th:each="departmentForm : ${departmentFormList}">
<!-- <td th:text="${departmentForm.idDepartment}"></td>--> <td th:text="${departmentForm.idDepartment}"></td>
<td th:text="${departmentForm.nmDepartment}"></td> <td th:text="${departmentForm.nmDepartment}"></td>
<td>
<!-- 更新フォーム -->
<form action="showUpdate" method="post" style="display: inline;">
<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
<input type="submit" value="更新">
</form>
<!-- 削除フォーム -->
<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
style="display: inline;">
<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
<input type="submit" value="削除">
</form>
</td>
</tr> </tr>
</table> </tbody>
</table>
</div> <!-- 0件の時にメッセージを表示 -->
<th:block th:if="${departmentFormList != null and departmentFormList.size() == 0}">
<p>検索結果はありません</p>
</th:block>
</body> </body>
<script type="text/javascript">
<!-- ★部署名の入力欄も空にする（id は th:field が自動で作る） --> <script type="text/javascript">
function clearInput() { function clearInput() {
document.getElementById('idDepartment').value = ''; document.getElementById('idDepartment').value = '';
document.getElementById('nmDepartment').value = ''; document.getElementById('nmDepartment').value = '';
} }
</script> </script>
</html> </html>

271
src/main/resources/templates/selectEmployee.html
View File

@@ -3,155 +3,144 @@
<head> <head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<!-- 外部のスクリプトファイルを読み込む --> <!-- 外部のスクリプトファイルを読み込む -->
<script th:src="@{/js/common.js}"></script> <script th:src="@{/js/common.js}"></script>
<!-- CSSの読み込み --> <!-- CSSの読み込み -->
<link rel="stylesheet" th:href="@{/css/all.css}"> <link rel="stylesheet" th:href="@{/css/all.css}">
<link rel=stylesheet th:href="@{/css/style.css}" type="text/css"> <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
<title>検索</title> <title>検索</title>
</head> </head>
<body>
<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="selectEmployeeInfo"
method="post"
th:object="${searchConditionEmployeeForm}">
<div class="msgBox error" th:if="${messageError} != null"> <body>
<span class="error" th:text="${messageError.message}"></span> <h1>
</div> 検索条件入力　　　
<table> <div class="rightSection">
<tr> <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<th class="header">社員ID</th> <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
<td> </div>
<input placeholder="社員ID" </h1>
th:field="*{idEmployee}" <form action="selectEmployeeInfo" method="post" th:object="${searchConditionEmployeeForm}">
type="number"/>
</td> <div class="msgBox error" th:if="${messageError} != null">
</tr> <span class="error" th:text="${messageError.message}"></span>
<tr> </div>
<th class="header">社員名</th> <table>
<td> <tr>
<input placeholder="社員名" <th class="header">社員ID</th>
th:field="*{nmEmployee}" <td>
type="text"/> <input placeholder="社員ID" th:field="*{idEmployee}" type="number" />
</td> </td>
</tr> </tr>
<tr> <tr>
<th class="header">社員名フリガナ</th> <th class="header">社員名</th>
<td> <td>
<input oninput="convertToKatakana(this)" <input placeholder="社員名" th:field="*{nmEmployee}" type="text" />
placeholder="フリガナ" </td>
th:field="*{knEmployee}" </tr>
type="text"/> <tr>
</td> <th class="header">社員名フリガナ</th>
</tr> <td>
<tr> <input oninput="convertToKatakana(this)" placeholder="フリガナ" th:field="*{knEmployee}" type="text" />
<th class="header">メールアドレス</th> </td>
<td> </tr>
<input placeholder="メールアドレス" <tr>
th:field="*{mailAddress}" <th class="header">メールアドレス</th>
type="email"/> <td>
</td> <input placeholder="メールアドレス" th:field="*{mailAddress}" type="email" />
</tr> </td>
<tr> </tr>
<th class="header">所属部署</th> <tr>
<td> <th class="header">所属部署</th>
<select th:field="*{idDepartment}"> <td>
<option value=""></option> <select th:field="*{idDepartment}">
<option th:each="department : ${departmentFormList}" <option value=""></option>
th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}" <option th:each="department : ${departmentFormList}"
th:text="${department.nmDepartment}" th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}"
th:value="${department.idDepartment}"> th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
</option> </option>
</select> </select>
</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>
<td class="btnArea" colspan="2"> <td class="btnArea" colspan="2">
<button onclick="clearInput()">クリア</button> <button onclick="clearInput()">クリア</button>
</td> </td>
</tr> </tr>
</table> </table>
</form> </form>
<div class="header-spacing"></div>
<a href="showMenu">メニューに戻る</a> <div class="header-spacing"></div>
<div class="header-spacing"></div> <a href="showMenu">メニューに戻る</a>
<h1><span>検索結果</span></h1> <div class="header-spacing"></div>
<div class="header-spacing"></div> <h1><span>検索結果</span></h1>
<th:block th:if="${messageInfo != null}"> <div class="header-spacing"></div>
<script th:inline="javascript"> <th:block th:if="${messageInfo != null}">
alert([[${messageInfo.message}]]); <script th:inline="javascript">
</script> alert([[${messageInfo.message}]]);
</th:block> </script>
<div class="header-spacing"></div> </th:block>
<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}"> <div class="header-spacing"></div>
<!-- 検索結果が1件以上ある場合 --> <th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
<table class="table-grid table-striped table-hover"> <!-- 検索結果が1件以上ある場合 -->
<thead> <table class="table-grid table-striped table-hover">
<tr> <thead>
<th style="width: 60px;">社員ID</th> <tr>
<th style="width: 100px;">社員名</th> <th style="width: 60px;">社員ID</th>
<th style="width: 150px;">フリガナ</th> <th style="width: 100px;">社員名</th>
<th style="width: 150px;">メールアドレス</th> <th style="width: 150px;">フリガナ</th>
<th style="width: 100px;">パスワード</th> <th style="width: 150px;">メールアドレス</th>
<th style="width: 70px;">管理者フラグ</th> <th style="width: 100px;">パスワード</th>
<th style="width: 150px;">所属部署</th> <th style="width: 70px;">管理者フラグ</th>
<th style="width: 150px;">操作</th> <th style="width: 150px;">所属部署</th>
</tr> <th style="width: 150px;">操作</th>
</thead> </tr>
<tbody> </thead>
<tr th:each="employeeInfoForm : ${employeeInfoFormList}"> <tbody>
<td th:text="${employeeInfoForm.idEmployee}"></td> <tr th:each="employeeInfoForm : ${employeeInfoFormList}">
<td th:text="${employeeInfoForm.nmEmployee}"></td> <td th:text="${employeeInfoForm.idEmployee}"></td>
<td th:text="${employeeInfoForm.knEmployee}"></td> <td th:text="${employeeInfoForm.nmEmployee}"></td>
<td th:text="${employeeInfoForm.mailAddress}"></td> <td th:text="${employeeInfoForm.knEmployee}"></td>
<td th:text="${employeeInfoForm.password}"></td> <td th:text="${employeeInfoForm.mailAddress}"></td>
<td th:text="${employeeInfoForm.adminAuth}"></td> <td th:text="${employeeInfoForm.password}"></td>
<td th:text="${employeeInfoForm.nmDepartment}"></td> <td th:text="${employeeInfoForm.adminAuth}"></td>
<td> <td th:text="${employeeInfoForm.nmDepartment}"></td>
<!-- 更新フォーム --> <td>
<form action="showUpdateEmployee" method="post" style="display: inline;"> <!-- 更新フォーム -->
<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden"> <form action="showUpdateEmployee" method="post" style="display: inline;">
<input type="submit" value="更新"> <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
</form> <input type="submit" value="更新">
<!-- 削除フォーム --> </form>
<form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');" <!-- 削除フォーム -->
style="display: inline;"> <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden"> style="display: inline;">
<input type="submit" value="削除"> <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
</form> <input type="submit" value="削除">
</td> </form>
</tr> </td>
</tbody> </tr>
</table> </tbody>
</th:block> </table>
<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}"> </th:block>
<!-- 検索結果が0件の場合 --> <th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
検索結果はありません。 <!-- 検索結果が0件の場合 -->
</th:block> 検索結果はありません。
</th:block>
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
function clearInput() { function clearInput() {
document.getElementById('idEmployee').value = ''; document.getElementById('idDepartment').value = '';
document.getElementById('nmEmployee').value = ''; document.getElementById('nmDepartment').value = '';
document.getElementById('knEmployee').value = ''; }
document.getElementById('mailAddress').value = '';
document.getElementById('idDepartment').selectedIndex = 0;
}
</script> </script>
</html> </html>

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

@@ -1,12 +0,0 @@
// 実装手順書より
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>
</body>
</html>

1423
研修生用実装手順書.md Normal file
View File

File diff suppressed because it is too large Load Diff