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

第1段階終了しました。池田

Browse Source
This commit is contained in:
池田　沙莱
2026-10-14 15:49:13 +09:00
parent aae31940db
commit d2828cbf7c
7 changed files with 221 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,25 @@
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> searchBy(SearchConditionDepartment searchConditionDepartment); List<Department> searchDepartmentBynmDepartment(String nmDepartment);
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);
} }

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

@@ -1,17 +1,20 @@
package com.example.rhizome.app.domain.service.impl; package com.example.rhizome.app.domain.service.impl;
import com.example.rhizome.app.domain.model.Department; import java.util.List;
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 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;
import com.example.rhizome.app.domain.service.SearchDepartment;
import com.example.rhizome.app.infra.entity.DepartmentEntity;
import com.example.rhizome.app.infra.repository.DepartmentRepository;
/** /**
* 部署情報検索系の機能を集約させるサービスクラスです。 * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -79,4 +82,28 @@ 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;
}
} }

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

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

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

@@ -1,5 +1,21 @@
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;
@@ -11,20 +27,6 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
import com.example.rhizome.app.presentation.form.DepartmentForm; import com.example.rhizome.app.presentation.form.DepartmentForm;
import com.example.rhizome.app.presentation.form.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;
/** /**
* 新規登録用のコントローラ * 新規登録用のコントローラ
@@ -193,6 +195,3 @@ public class InsertEmployeeController {
} }
} }

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

@@ -15,4 +15,6 @@ public class PageReturnAttributeKeyword {
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";
} }

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

@@ -45,9 +45,18 @@ public class TransitionTargetPageNameKeyword {
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";
public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
public static final String DELETE_DEPARTMENT = "/deleteDepartment";
// Department // Department
// HTML // HTML
public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
// Controller // Controller
public static final String SELECT_DEPARTMENT = "/selectDepartment";
/** /**
* 管理者向けのページリストを返す * 管理者向けのページリストを返す

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

@@ -33,6 +33,18 @@
<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> </table>
</body> </body>