관리자 작업 중

This commit is contained in:
kangsunlee
2025-06-10 19:22:38 +09:00
parent a8e29ec69c
commit 43ed02600c
25 changed files with 527 additions and 421 deletions

View File

@@ -6,6 +6,7 @@ import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.MessageUtil; import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
import app.module.core.usecase.role.list.ports.RoleListPortIn; import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -22,6 +23,7 @@ public class AdminCreatePostController {
private final RoleListPortIn roleListPortIn; private final RoleListPortIn roleListPortIn;
private final MessageUtil messageUtil; private final MessageUtil messageUtil;
private final SaveAdminPortIn savePortIn; private final SaveAdminPortIn savePortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final AdminCreateValidator adminCreateValidator; private final AdminCreateValidator adminCreateValidator;
@PostMapping(path = "/settings/admins/create") @PostMapping(path = "/settings/admins/create")
@@ -34,6 +36,7 @@ public class AdminCreatePostController {
adminCreateValidator.validate(bindingVO, bindingResult); adminCreateValidator.validate(bindingVO, bindingResult);
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
return "admin/adminCreateForm"; return "admin/adminCreateForm";
} }
@@ -42,6 +45,7 @@ public class AdminCreatePostController {
bindingVO.getId(), bindingVO.getId(),
bindingVO.getPassword(), bindingVO.getPassword(),
bindingVO.getEmail(), bindingVO.getEmail(),
bindingVO.getRegionMainCode(),
bindingVO.getAccountDisabled(), bindingVO.getAccountDisabled(),
bindingVO.getAccountLocked(), bindingVO.getAccountLocked(),
bindingVO.getRoleIds()); bindingVO.getRoleIds());

View File

@@ -9,6 +9,7 @@ import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView; import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import app.module.core.usecase.role.list.ports.RoleListPortIn; import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -24,6 +25,7 @@ class AdminUpdateGetController {
private final AdminViewPortIn adminViewPortIn; private final AdminViewPortIn adminViewPortIn;
private final RoleListPortIn roleListPortIn; private final RoleListPortIn roleListPortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final MessageUtil messageUtil; private final MessageUtil messageUtil;
@GetMapping(path = "/settings/admins/update/{adminId}") @GetMapping(path = "/settings/admins/update/{adminId}")
@@ -52,6 +54,7 @@ class AdminUpdateGetController {
output.getId(), output.getId(),
null, null,
output.getEmail(), output.getEmail(),
output.getRegionMainCode(),
output.getPasswordUpdatedAt(), output.getPasswordUpdatedAt(),
output.getAccountDisabled(), output.getAccountDisabled(),
output.getLoginFailCnt(), output.getLoginFailCnt(),
@@ -60,6 +63,7 @@ class AdminUpdateGetController {
model.addAttribute("bindingVO", bindingVO); model.addAttribute("bindingVO", bindingVO);
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
return "admin/adminUpdateForm"; return "admin/adminUpdateForm";
} }

View File

@@ -1,11 +1,13 @@
package app.module.admin.usecase.admin.saveAdmin.adapters.web; package app.module.admin.usecase.admin.saveAdmin.adapters.web;
import app.module.admin.usecase.admin.getAdmins.adapters.web.model.AdminListFilterVO;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminUpdateValidator; import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminUpdateValidator;
import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.MessageUtil; import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
import app.module.core.usecase.role.list.ports.RoleListPortIn; import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -21,6 +23,7 @@ class AdminUpdatePostController {
private final AdminUpdateValidator adminUpdateValidator; private final AdminUpdateValidator adminUpdateValidator;
private final RoleListPortIn roleListPortIn; private final RoleListPortIn roleListPortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final SaveAdminPortIn saveAdminPortIn; private final SaveAdminPortIn saveAdminPortIn;
private final MessageUtil messageUtil; private final MessageUtil messageUtil;
@@ -34,6 +37,7 @@ class AdminUpdatePostController {
adminUpdateValidator.validate(bindingVO, bindingResult); adminUpdateValidator.validate(bindingVO, bindingResult);
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
return "admin/adminUpdateForm"; return "admin/adminUpdateForm";
} }
@@ -42,6 +46,7 @@ class AdminUpdatePostController {
bindingVO.getId(), bindingVO.getId(),
bindingVO.getUpdatePassword(), bindingVO.getUpdatePassword(),
bindingVO.getEmail(), bindingVO.getEmail(),
bindingVO.getRegionMainCode(),
bindingVO.getAccountDisabled(), bindingVO.getAccountDisabled(),
bindingVO.getAccountLocked(), bindingVO.getAccountLocked(),
bindingVO.getRoleIds()); bindingVO.getRoleIds());

View File

@@ -21,9 +21,9 @@ public class AdminCreateBindingVO {
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
message = "{valid.common.email.wrong}") message = "{valid.common.email.wrong}")
private String email; private String email;
private String regionMainCode;
private Boolean accountDisabled; private Boolean accountDisabled;
private Boolean accountLocked; private Boolean accountLocked;
private List<String> roleIds; private List<String> roleIds;
private String regionMainCode;
} }

View File

@@ -32,6 +32,7 @@ public class AdminUpdateBindingVO implements AuditOutput {
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
message = "{valid.common.email.wrong}") message = "{valid.common.email.wrong}")
private String email; private String email;
private String regionMainCode;
private LocalDateTime passwordUpdatedAt; private LocalDateTime passwordUpdatedAt;
private Boolean accountDisabled; private Boolean accountDisabled;

View File

@@ -24,14 +24,23 @@ public class AdminCreateValidator implements Validator {
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "valid.common.required"); ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "valid.common.required");
Optional.ofNullable(vo.getPassword()) Optional.ofNullable(vo.getPassword())
.filter(password -> !password.matches(PASSWORD_REGEX)) .filter(password -> !password.matches(PASSWORD_REGEX))
.ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong")); .ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong"));
Optional.ofNullable(vo.getRoleIds()) Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.size() < 1) .filter(ids -> ids.size() < 1)
.ifPresent( .ifPresent(
ids -> ids ->
errors.rejectValue( errors.rejectValue(
"roleIds", "valid.common.required.size.min", new Object[]{1}, "")); "roleIds", "valid.common.required.size.min", new Object[]{1}, ""));
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN")))
.ifPresent(nonAdmins -> {
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
errors.rejectValue("regionMainCode", "valid.common.required");
}
});
} }
} }

View File

@@ -30,5 +30,14 @@ public class AdminUpdateValidator implements Validator {
Optional.ofNullable(vo.getUpdatePassword()) Optional.ofNullable(vo.getUpdatePassword())
.filter(s -> !s.trim().isEmpty() && !s.matches(PASSWORD_REGEX)) .filter(s -> !s.trim().isEmpty() && !s.matches(PASSWORD_REGEX))
.ifPresent(s -> errors.rejectValue("updatePassword", "valid.common.password.wrong")); .ifPresent(s -> errors.rejectValue("updatePassword", "valid.common.password.wrong"));
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
Optional.ofNullable(vo.getRoleIds())
.filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN")))
.ifPresent(nonAdmins -> {
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
errors.rejectValue("regionMainCode", "valid.common.required");
}
});
} }
} }

View File

@@ -4,136 +4,144 @@
<section class="fw-bold" layout:fragment="content"> <section class="fw-bold" layout:fragment="content">
<form <form
method="post" method="post"
th:action="@{/settings/admins/create}" th:action="@{/settings/admins/create}"
th:object="${bindingVO}"> th:object="${bindingVO}">
<div class="row mb-3">
<div class="row mb-3"> <label class="col-sm-2 col-form-label" for="id">ID *</label>
<label class="col-sm-2 col-form-label" for="id">ID *</label> <div class="col-sm-4">
<div class="col-sm-4"> <input class="form-control" id="id"
<input class="form-control" id="id" th:classappend="${#fields.hasErrors('id')} ? 'is-invalid'" th:classappend="${#fields.hasErrors('id')} ? 'is-invalid'"
th:field="*{id}"/> th:field="*{id}"/>
<div class="invalid-feedback fw-bold" th:errors="*{id}" th:if="${#fields.hasErrors('id')}"> <div class="invalid-feedback fw-bold" th:errors="*{id}"
에러 메세지 th:if="${#fields.hasErrors('id')}">
</div> 에러 메세지
</div> </div>
</div> </div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label" for="password">Password *</label>
<div class="col-sm-4">
<input class="form-control" id="password" th:classappend="${#fields.hasErrors('password')} ? 'is-invalid'" th:field="*{password}"
type="password"/>
<div class="invalid-feedback fw-bold" th:errors="*{password}"
th:if="${#fields.hasErrors('password')}">
에러 메세지
</div> </div>
</div> <div class="row mb-3">
</div> <label class="col-sm-2 col-form-label" for="password">Password *</label>
<div class="col-sm-4">
<div class="row mb-3"> <input class="form-control" id="password"
<label class="col-sm-2 col-form-label" for="email">Email *</label> th:classappend="${#fields.hasErrors('password')} ? 'is-invalid'"
<div class="col-sm-4"> th:field="*{password}"
<input class="form-control" id="email" th:classappend="${#fields.hasErrors('email')} ? 'is-invalid'" th:field="*{email}" type="password"/>
type="email"/> <div class="invalid-feedback fw-bold" th:errors="*{password}"
<div class="invalid-feedback fw-bold" th:errors="*{email}" th:if="${#fields.hasErrors('password')}">
th:if="${#fields.hasErrors('email')}"> 에러 메세지
에러 메세지 </div>
</div>
</div>
</div>
<div class="row mb-3"> </div>
<label class="col-sm-2 col-form-label" for="roleIds">권한 *</label>
<div class="col-sm-4">
<select class="form-control" id="roleIds" multiple th:classappend="${#fields.hasErrors('roleIds')} ? 'is-invalid'"
th:field="*{roleIds}"
onchange="onRoleChange(this);">
<option th:each="role : ${roles}" th:text="${role.id}"
th:value="${role.id}"></option>
</select>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div> </div>
</div>
</div>
<div class="row mb-3 regionMainCodeArea" style="display: none;"> <div class="row mb-3">
<label class="col-sm-2 col-form-label" for="regionMainCode">실사</label> <label class="col-sm-2 col-form-label" for="email">Email *</label>
<div class="col-sm-4"> <div class="col-sm-4">
<select class="form-select" id="regionMainCode" name="regionMainCode" th:field="*{regionMainCode}"> <input class="form-control" id="email"
<option value="">선택</option> th:classappend="${#fields.hasErrors('email')} ? 'is-invalid'"
<option th:each="code : ${regionMainCode}" th:field="*{email}"
th:value="${code.id}" type="email"/>
th:text="${code.codeText}"> <div class="invalid-feedback fw-bold" th:errors="*{email}"
</option> th:if="${#fields.hasErrors('email')}">
</select> 에러 메세지
</div> </div>
</div> </div>
</div>
<!-- 활성화 --> <div class="row mb-3">
<div class="row mb-3"> <label class="col-sm-2 col-form-label" for="roleIds">권한 *</label>
<label class="col-sm-2 col-form-label" for="inlineRadio1">비활성화 여부 *</label> <div class="col-sm-4">
<div class="col-sm-4 pt-1"> <select class="form-control" id="roleIds" multiple
<div class="form-check form-check-inline"> th:classappend="${#fields.hasErrors('roleIds')} ? 'is-invalid'"
<input class="form-check-input" id="inlineRadio1" name="accountDisabled" th:field="*{roleIds}"
type="radio" value="true"> onchange="onRoleChange(this);">
<label class="form-check-label" for="inlineRadio1">비활성화</label> <option th:each="role : ${roles}" th:text="${role.id}"
th:value="${role.id}"></option>
</select>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div>
</div>
</div> </div>
<div class="form-check form-check-inline">
<input checked class="form-check-input" id="inlineRadio2"
name="accountDisabled" type="radio" value="false">
<label class="form-check-label" for="inlineRadio2">활성화</label>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div>
</div>
</div>
<!-- 계정잠김 --> <div class="row mb-3 regionMainCodeArea" style="display: none;">
<div class="row mb-3"> <label class="col-sm-2 col-form-label" for="regionMainCode">실사 *</label>
<label class="col-sm-2 col-form-label" for="accountLocked1">계정잠김 여부*</label> <div class="col-sm-4">
<div class="col-sm-4 pt-1"> <select class="form-select" id="regionMainCode" name="regionMainCode"
<div class="form-check form-check-inline"> th:field="*{regionMainCode}">
<input class="form-check-input" id="accountLocked1" name="accountLocked" <option value="">선택</option>
type="radio" value="true"> <option th:each="code : ${regionMainCode}"
<label class="form-check-label" for="accountLocked1">Locked</label> th:value="${code.id}"
th:text="${code.codeText}">
</option>
</select>
</div>
</div> </div>
<div class="form-check form-check-inline">
<input checked class="form-check-input" id="accountLocked2" <!-- 활성화 -->
name="accountLocked" type="radio" value="false"> <div class="row mb-3">
<label class="form-check-label" for="accountLocked2">Unlocked</label> <label class="col-sm-2 col-form-label" for="inlineRadio1">비활성화 여부 *</label>
<div class="col-sm-4 pt-1">
<div class="form-check form-check-inline">
<input class="form-check-input" id="inlineRadio1" name="accountDisabled"
type="radio" value="true">
<label class="form-check-label" for="inlineRadio1">비활성화</label>
</div>
<div class="form-check form-check-inline">
<input checked class="form-check-input" id="inlineRadio2"
name="accountDisabled" type="radio" value="false">
<label class="form-check-label" for="inlineRadio2">활성화</label>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div>
</div>
</div> </div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}"> <!-- 계정잠김 -->
에러 메세지 <div class="row mb-3">
<label class="col-sm-2 col-form-label" for="accountLocked1">계정잠김 여부*</label>
<div class="col-sm-4 pt-1">
<div class="form-check form-check-inline">
<input class="form-check-input" id="accountLocked1" name="accountLocked"
type="radio" value="true">
<label class="form-check-label" for="accountLocked1">Locked</label>
</div>
<div class="form-check form-check-inline">
<input checked class="form-check-input" id="accountLocked2"
name="accountLocked" type="radio" value="false">
<label class="form-check-label" for="accountLocked2">Unlocked</label>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div>
</div>
</div> </div>
</div>
</div>
<button class="btn btn-primary float-end" type="submit">저장</button> <button class="btn btn-primary float-end" type="submit">저장</button>
<button class="btn btn-light" onclick="gotoList();return false;" type="button">목록으로 이동</button> <button class="btn btn-light" onclick="gotoList();return false;" type="button">목록으로 이동
</form> </button>
</form>
<script> <script>
function gotoList() { function gotoList() {
document.prevAdminParamForm ? document.prevAdminParamForm.submit() document.prevAdminParamForm ? document.prevAdminParamForm.submit()
: location.href = '/settings/admins'; : location.href = '/settings/admins';
} }
</script> </script>
<script> <script>
const onRoleChange = (el) => { const onRoleChange = (el) => {
$('.regionMainCodeArea').toggle(el.value !== "ROLE_ADMIN"); $('.regionMainCodeArea').toggle(el.value !== "ROLE_ADMIN");
} }
</script> </script>
</section> </section>

View File

@@ -4,200 +4,210 @@
<section layout:fragment="content"> <section layout:fragment="content">
<form method="post" name="adminParamForm" onsubmit="goSearch();" <form method="post" name="adminParamForm" onsubmit="goSearch();"
th:action="@{/settings/admins}" th:action="@{/settings/admins}"
th:object="${listStatus}"> th:object="${listStatus}">
<!-- hidden parameters --> <!-- hidden parameters -->
<input name="page" th:value="${listOutput.pageable.pageNumber}" type="hidden"/> <input name="page" th:value="${listOutput.pageable.pageNumber}" type="hidden"/>
<input name="sort" th:value="${listOutput.pageable.sort}" type="hidden"/> <input name="sort" th:value="${listOutput.pageable.sort}" type="hidden"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/> <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="row p-2 mb-2 border-secondary border-top border-bottom border-1"> <div class="row p-2 mb-2 border-secondary border-top border-bottom border-1">
<div class="col-5"> <div class="col-5">
<label class="col-sm-2 col-form-label" for="searchField">검색필드</label> <label class="col-sm-2 col-form-label" for="searchField">검색필드</label>
<select class="form-select d-inline w-25" id="searchField" th:field="*{searchField}"> <select class="form-select d-inline w-25" id="searchField"
<option selected value="">선택</option> th:field="*{searchField}">
<option value="id">ID</option> <option selected value="">선택</option>
<option value="email">Email</option> <option value="id">ID</option>
</select> <option value="email">Email</option>
<label> </select>
<input class="form-control d-inline" placeholder="검색어를 입력하세요." style="width: 250px;" <label>
th:field="*{searchValue}" type="text"> <input class="form-control d-inline" placeholder="검색어를 입력하세요."
</label> style="width: 250px;"
</div> th:field="*{searchValue}" type="text">
<div class="col"> </label>
<label class="col-sm-2 col-form-label" for="searchRole">권한</label> </div>
<select class="form-select d-inline w-50" id="searchRole" th:field="*{searchRole}"> <div class="col">
<option selected value="">전체</option> <label class="col-sm-2 col-form-label" for="searchRole">권한</label>
<option th:each="role : ${roles}" th:text="${role.id}" <select class="form-select d-inline w-50" id="searchRole" th:field="*{searchRole}">
th:value="${role.id}"></option> <option selected value="">전체</option>
</select> <option th:each="role : ${roles}" th:text="${role.id}"
</div> th:value="${role.id}"></option>
<div class="col text-end"> </select>
<button class="btn btn-outline-secondary" onclick="goSearch();" </div>
type="button"> <div class="col text-end">
<i class="bi bi-search"></i> <button class="btn btn-outline-secondary" onclick="goSearch();"
</button> type="button">
<button class="btn btn-outline-secondary" onclick="goInit();" <i class="bi bi-search"></i>
type="button">초기화 </button>
</button> <button class="btn btn-outline-secondary" onclick="goInit();"
</div> type="button">초기화
</div> </button>
</div>
</div>
<div class="row"> <div class="row">
<div class="col text-start"> <div class="col text-start">
<div class="fw-bolder text-muted">Total: <span <div class="fw-bolder text-muted">Total: <span
th:text="${listOutput.totalElements}"></span></div> th:text="${listOutput.totalElements}"></span></div>
</div> </div>
<div class="col text-end"> <div class="col text-end">
<i class="bi bi-list-ol"></i> <i class="bi bi-list-ol"></i>
<label> <label>
<select class="form-select form-select-sm" id="pageSize" name="pageSize" <select class="form-select form-select-sm" id="pageSize" name="pageSize"
onchange="goSearch()"> onchange="goSearch()">
<option <option
th:each="item : ${pageRows}" th:each="item : ${pageRows}"
th:selected="${#strings.toString(listOutput.pageable.pageSize) eq item.codeValue}" th:text="${item.codeText}" th:selected="${#strings.toString(listOutput.pageable.pageSize) eq item.codeValue}"
th:value="${item.codeValue}"></option> th:text="${item.codeText}"
</select> th:value="${item.codeValue}"></option>
</label> </select>
</div> </label>
</div> </div>
</div>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th scope="col">#</th> <th scope="col">#</th>
<th scope="col"> <th scope="col">
<label><input class="form-check-input" onchange="toggleCheckbox(this);" type="checkbox"/></label> <label><input class="form-check-input" onchange="toggleCheckbox(this);"
</th> type="checkbox"/></label>
<th scope="col"><a class="order-able" data-sort-field="id" href="#">ID</a></th> </th>
<th class="text-secondary" scope="col">권한</th> <th scope="col"><a class="order-able" data-sort-field="id" href="#">ID</a></th>
<th scope="col"><a class="order-able" data-sort-field="email" href="#">Email</a></th> <th class="text-secondary" scope="col">권한</th>
<th scope="col"><a class="order-able" data-sort-field="accountDisabled" href="#">활성화</a> <th scope="col"><a class="order-able" data-sort-field="email" href="#">Email</a>
</th> </th>
<th scope="col"><a class="order-able" data-sort-field="accountLocked" href="#">계정잠김</a></th> <th scope="col"><a class="order-able" data-sort-field="accountDisabled"
<th scope="col"><a class="order-able" data-sort-field="createdAt" href="#">등록일</a></th> href="#">활성화</a>
<th scope="col"><a class="order-able" data-sort-field="updatedAt" href="#">수정일</a></th> </th>
</tr> <th scope="col"><a class="order-able" data-sort-field="accountLocked"
</thead> href="#">계정잠김</a></th>
<tbody> <th scope="col"><a class="order-able" data-sort-field="createdAt" href="#">등록일</a>
<tr th:each="item, status : ${listOutput.content}"> </th>
<th scope="row" <th scope="col"><a class="order-able" data-sort-field="updatedAt" href="#">수정일</a>
th:text="${status.count + (listOutput.pageable.pageNumber * listOutput.pageable.pageSize)}"> </th>
게시물번호 </tr>
</th> </thead>
<td><label><input class="form-check-input" name="checkedIds" th:value="${item.id}" <tbody>
type="checkbox"/></label> <tr th:each="item, status : ${listOutput.content}">
</td> <th scope="row"
<td><a th:href="|javascript:goUpdate('${item.id}')|" th:text="${item.id}">아이디</a></td> th:text="${status.count + (listOutput.pageable.pageNumber * listOutput.pageable.pageSize)}">
<td> 게시물번호
</th>
<td><label><input class="form-check-input" name="checkedIds" th:value="${item.id}"
type="checkbox"/></label>
</td>
<td><a th:href="|javascript:goUpdate('${item.id}')|" th:text="${item.id}">아이디</a>
</td>
<td>
<span th:each="role, status : ${item.roles}" <span th:each="role, status : ${item.roles}"
th:text="${role.getId()} + ${!status.last ? ', ': ''}"></span> th:text="${role.getId()} + ${!status.last ? ', ': ''}"></span>
</td> </td>
<td th:text="${item.email}">이메일</td> <td th:text="${item.email}">이메일</td>
<td th:text="${item.accountDisabled == null || !item.accountDisabled ? 'Y' : 'N' }"></td> <td th:text="${item.accountDisabled == null || !item.accountDisabled ? 'Y' : 'N' }"></td>
<td th:text="${item.accountLocked == null || !item.accountLocked ? 'N' : 'Y' }"></td> <td th:text="${item.accountLocked == null || !item.accountLocked ? 'N' : 'Y' }"></td>
<td th:text="${#temporals.format(item.createdAt, 'yyyy-MM-dd hh:mm')}">등록일</td> <td th:text="${#temporals.format(item.createdAt, 'yyyy-MM-dd hh:mm')}">등록일</td>
<td th:text="${#temporals.format(item.updatedAt, 'yyyy-MM-dd hh:mm')}">수정일</td> <td th:text="${#temporals.format(item.updatedAt, 'yyyy-MM-dd hh:mm')}">수정일</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</form> </form>
<div th:replace="common/list-components :: pagination(${listOutput})"></div> <div th:replace="common/list-components :: pagination(${listOutput})"></div>
<div class="row"> <div class="row">
<div class="col text-start"> <div class="col text-start">
<button class="btn btn-success" onclick="goExcel();" type="button">엑셀 다운로드</button> <button class="btn btn-success" onclick="goExcel();" type="button">엑셀 다운로드</button>
</div>
<div class="col text-end mb-2">
<button class="btn btn-primary" onclick="location.href='/settings/admins/create';"
type="button">등록
</button>
<button class="btn btn-danger" onclick="goRemove();" type="button">삭제</button>
</div>
</div> </div>
<div class="col text-end mb-2">
<button class="btn btn-primary" onclick="location.href='/settings/admins/create';"
type="button">등록
</button>
<button class="btn btn-danger" onclick="goRemove();" type="button">삭제</button>
</div>
</div>
</section> </section>
<section layout:fragment="script"> <section layout:fragment="script">
<script th:inline="javascript"> <script th:inline="javascript">
// 목록 정렬 표기 및 갱신 기능 적용 // 목록 정렬 표기 및 갱신 기능 적용
uiUtil.applyListSortNotation([[${listOutput.pageable.pageSize}]], uiUtil.applyListSortNotation([[${listOutput.pageable.pageSize}]],
[[${listOutput.pageable.sort.toString()}]]); [[${listOutput.pageable.sort.toString()}]]);
</script> </script>
<script th:inline="javascript"> <script th:inline="javascript">
// 검색 // 검색
function goSearch() { function goSearch() {
const f = document.adminParamForm; const f = document.adminParamForm;
f.action = '/settings/admins'; f.action = '/settings/admins';
f.page.value = 0; f.page.value = 0;
f.sort.value = convertToPageableSortValue(f.sort.value); f.sort.value = convertToPageableSortValue(f.sort.value);
f.method = 'get';
f.submit();
}
// 초기화
function goInit() {
const f = document.adminParamForm;
f.searchField.value = '';
f.searchValue.value = '';
f.searchRole.value = '';
}
// 수정페이지 이동
function goUpdate(adminId) {
const f = document.adminParamForm;
f.action = '/settings/admins/update/' + adminId;
f.method = 'get';
f.submit();
}
// 체크박스 선택/해제
function toggleCheckbox(oj) {
$('input[name=checkedIds]').prop("checked", oj.checked);
}
function goRemove() {
if (!$('input[name=checkedIds]').is(':checked')) {
alert(/*[[#{operation.common.remove.choose}]]*/);
return;
}
if (confirm(/*[[#{operation.common.remove.ask}]]*/)) {
const f = document.adminParamForm;
const data = $(f).serializeObject();
$.ajax({
'method': 'DELETE',
'url': '/api/settings/admin/remove',
'data': {
'checkedIds': data.checkedIds
},
beforeSend: function (xhr) {
xhr.setRequestHeader(
$("meta[name='_csrf_header']").attr("content"),
$("meta[name='_csrf']").attr("content"));
},
success(res) {
alert('선택한 관리자가 삭제되었습니다.');
f.method = 'get'; f.method = 'get';
f.submit(); f.submit();
} }
});
}
}
function goExcel() { // 초기화
const f = document.adminParamForm; function goInit() {
f.action = '/settings/admins/excel'; const f = document.adminParamForm;
f.sort.value = convertToPageableSortValue(f.sort.value); f.searchField.value = '';
f.method = 'post'; f.searchValue.value = '';
f.submit(); f.searchRole.value = '';
} }
</script>
// 수정페이지 이동
function goUpdate(adminId) {
const f = document.adminParamForm;
f.action = '/settings/admins/update/' + adminId;
f.method = 'get';
f.submit();
}
// 체크박스 선택/해제
function toggleCheckbox(oj) {
$('input[name=checkedIds]').prop("checked", oj.checked);
}
function goRemove() {
if (!$('input[name=checkedIds]').is(':checked')) {
alert(/*[[#{operation.common.remove.choose}]]*/);
return;
}
if (confirm(/*[[#{operation.common.remove.ask}]]*/)) {
const f = document.adminParamForm;
const data = $(f).serializeObject();
$.ajax({
'method': 'DELETE',
'url': '/api/settings/admin/remove',
'data': {
'checkedIds': data.checkedIds
},
beforeSend: function (xhr) {
xhr.setRequestHeader(
$("meta[name='_csrf_header']").attr("content"),
$("meta[name='_csrf']").attr("content"));
},
success(res) {
alert('선택한 관리자가 삭제되었습니다.');
f.method = 'get';
f.submit();
}
});
}
}
function goExcel() {
const f = document.adminParamForm;
f.action = '/settings/admins/excel';
f.sort.value = convertToPageableSortValue(f.sort.value);
f.method = 'post';
f.submit();
}
</script>
</section> </section>
</html> </html>

View File

@@ -4,144 +4,177 @@
<section class="fw-bold" layout:fragment="content"> <section class="fw-bold" layout:fragment="content">
<form <form
method="post" method="post"
th:action="${'/settings/admins/update/' + bindingVO.id}" th:action="${'/settings/admins/update/' + bindingVO.id}"
th:object="${bindingVO}"> th:object="${bindingVO}">
<input type="hidden" name="seq" th:field="*{seq}"/> <input type="hidden" name="seq" th:field="*{seq}"/>
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-2 col-form-label" for="id">ID *</label> <label class="col-sm-2 col-form-label" for="id">ID *</label>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="id" readonly="readonly" <input class="form-control" id="id" readonly="readonly"
th:field="*{id}"/> th:field="*{id}"/>
</div> </div>
</div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label" for="password">Password *</label>
<div class="col-sm-4">
<input class="form-control" id="password" placeholder="암호를 변경하고 싶다면 입력하세요"
th:classappend="${#fields.hasErrors('updatePassword')} ? 'is-invalid'"
th:field="*{updatePassword}"
type="password"/>
<div class="invalid-feedback fw-bold" th:errors="*{updatePassword}"
th:if="${#fields.hasErrors('updatePassword')}">
에러 메세지
</div> </div>
</div>
</div>
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-2 col-form-label" for="email">Email *</label> <label class="col-sm-2 col-form-label" for="password">Password *</label>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="email" th:classappend="${#fields.hasErrors('email')} ? 'is-invalid'" th:field="*{email}" <input class="form-control" id="password" placeholder="암호를 변경하고 싶다면 입력하세요"
type="email"/> th:classappend="${#fields.hasErrors('updatePassword')} ? 'is-invalid'"
<div class="invalid-feedback fw-bold" th:errors="*{email}" th:field="*{updatePassword}"
th:if="${#fields.hasErrors('email')}"> type="password"/>
에러 메세지 <div class="invalid-feedback fw-bold" th:errors="*{updatePassword}"
th:if="${#fields.hasErrors('updatePassword')}">
에러 메세지
</div>
</div>
</div> </div>
</div>
</div>
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-2 col-form-label" for="roleIds">권한 *</label> <label class="col-sm-2 col-form-label" for="email">Email *</label>
<div class="col-sm-4"> <div class="col-sm-4">
<select class="form-control" id="roleIds" multiple th:classappend="${#fields.hasErrors('roleIds')} ? 'is-invalid'" <input class="form-control" id="email"
th:field="*{roleIds}"> th:classappend="${#fields.hasErrors('email')} ? 'is-invalid'"
<option th:each="role : ${roles}" th:text="${role.id}" th:field="*{email}"
th:value="${role.id}"></option> type="email"/>
</select> <div class="invalid-feedback fw-bold" th:errors="*{email}"
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}" th:if="${#fields.hasErrors('email')}">
th:if="${#fields.hasErrors('roleIds')}"> 에러 메세지
에러 메세지 </div>
</div>
</div> </div>
</div>
</div>
<!-- 활성화 --> <div class="row mb-3">
<div class="row mb-3"> <label class="col-sm-2 col-form-label" for="roleIds">권한 *</label>
<label class="col-sm-2 col-form-label" for="inlineRadio1">비활성화 여부 *</label> <div class="col-sm-4">
<div class="col-sm-4 pt-1"> <select class="form-control" id="roleIds" multiple
<div class="form-check form-check-inline"> th:classappend="${#fields.hasErrors('roleIds')} ? 'is-invalid'"
<input class="form-check-input" id="inlineRadio1" th:field="*{accountDisabled}" th:field="*{roleIds}"
type="radio" value="true"> onchange="onRoleChange(this);">
<label class="form-check-label" for="inlineRadio1">비활성화</label> <option th:each="role : ${roles}" th:text="${role.id}"
th:value="${role.id}"></option>
</select>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div>
</div>
</div> </div>
<div class="form-check form-check-inline">
<input class="form-check-input" id="inlineRadio2" th:field="*{accountDisabled}"
type="radio" value="false">
<label class="form-check-label" for="inlineRadio2">활성화</label>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div>
</div>
</div>
<!-- 계정잠김 --> <div class="row mb-3 regionMainCodeArea"
<div class="row mb-3"> th:style="${#lists.contains(bindingVO.roleIds, 'ROLE_ADMIN')} ? 'display: none;' : 'display: flex;'">
<label class="col-sm-2 col-form-label" for="accountLocked1">계정잠김 여부*</label> <label class="col-sm-2 col-form-label" for="regionMainCode">실사 *</label>
<div class="col-sm-4 pt-1"> <div class="col-sm-4">
<div class="form-check form-check-inline"> <select class="form-select" id="regionMainCode" name="regionMainCode"
<input class="form-check-input" id="accountLocked1" th:field="*{accountLocked}" th:classappend="${#fields.hasErrors('regionMainCode')} ? 'is-invalid'"
type="radio" value="true"> th:field="*{regionMainCode}">
<label class="form-check-label" for="accountLocked1">Locked</label> <option value="">선택</option>
<option th:each="code : ${regionMainCode}"
th:value="${code.id}"
th:text="${code.codeText}">
</option>
</select>
<div class="invalid-feedback fw-bold" th:errors="*{regionMainCode}"
th:if="${#fields.hasErrors('regionMainCode')}">
에러 메세지
</div>
</div>
</div> </div>
<div class="form-check form-check-inline">
<input class="form-check-input" id="accountLocked2" th:field="*{accountLocked}" <!-- 활성화 -->
type="radio" value="false"> <div class="row mb-3">
<label class="form-check-label" for="accountLocked2">Unlocked</label> <label class="col-sm-2 col-form-label" for="inlineRadio1">비활성화 여부 *</label>
<div class="col-sm-4 pt-1">
<div class="form-check form-check-inline">
<input class="form-check-input" id="inlineRadio1" th:field="*{accountDisabled}"
type="radio" value="true">
<label class="form-check-label" for="inlineRadio1">비활성화</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" id="inlineRadio2" th:field="*{accountDisabled}"
type="radio" value="false">
<label class="form-check-label" for="inlineRadio2">활성화</label>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div>
</div>
</div> </div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}"> <!-- 계정잠김 -->
에러 메세지 <div class="row mb-3">
<label class="col-sm-2 col-form-label" for="accountLocked1">계정잠김 여부*</label>
<div class="col-sm-4 pt-1">
<div class="form-check form-check-inline">
<input class="form-check-input" id="accountLocked1" th:field="*{accountLocked}"
type="radio" value="true">
<label class="form-check-label" for="accountLocked1">Locked</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" id="accountLocked2" th:field="*{accountLocked}"
type="radio" value="false">
<label class="form-check-label" for="accountLocked2">Unlocked</label>
</div>
<div class="invalid-feedback fw-bold" th:errors="*{roleIds}"
th:if="${#fields.hasErrors('roleIds')}">
에러 메세지
</div>
</div>
</div> </div>
</div>
</div>
<div class="row w-50"> <div class="row w-50">
<!-- audit area --> <!-- audit area -->
<div th:replace="common/components :: auditArea"></div> <div th:replace="common/components :: auditArea"></div>
</div> </div>
<button class="btn btn-primary float-end" type="submit">저장</button> <button class="btn btn-primary float-end" type="submit">저장</button>
<button class="btn btn-light" onclick="gotoList();return false;" type="button">목록으로 이동</button> <button class="btn btn-light" onclick="gotoList();return false;" type="button">목록으로 이동
</form> </button>
</form>
<!-- 이전 목록페이지의 검색 및 정렬조건 폼 --> <!-- 이전 목록페이지의 검색 및 정렬조건 폼 -->
<form method="get" name="prevAdminParamForm" <th:block th:if="${listStatus != null}">
th:action="@{/settings/admins}" <form method="get" name="prevAdminParamForm"
th:object="${listStatus}"> th:action="@{/settings/admins}"
<input th:field="*{searchField}" type="hidden"> th:object="${listStatus}">
<input th:field="*{searchValue}" type="hidden"> <input th:field="*{searchField}" type="hidden">
<input th:field="*{searchRole}" type="hidden"> <input th:field="*{searchValue}" type="hidden">
<th:block th:if="${pageable != null}"> <input th:field="*{searchRole}" type="hidden">
<input name="page" th:value="${pageable.page}" type="hidden"/> <th:block th:if="${pageable != null}">
<input name="sort" th:value="${pageable.sort}" type="hidden"/> <input name="page" th:value="${pageable.page}" type="hidden"/>
<input name="sort" th:value="${pageable.sort}" type="hidden"/>
</th:block>
</form>
</th:block> </th:block>
</form>
<script th:inline="javascript"> <script th:inline="javascript">
function gotoList() { function gotoList() {
if (document.prevParamForm) { if (document.prevAdminParamForm) {
const f = document.prevParamForm; const f = document.prevAdminParamForm;
f.sort.value = convertToPageableSortValue(f.sort.value); f.sort.value = convertToPageableSortValue(f.sort.value);
f.submit(); f.submit();
} else { } else {
location.href = '/settings/admins'; location.href = '/settings/admins';
} }
} }
$(document).ready(() => { $(document).ready(() => {
showAudit([[${bindingVO.id}]], [[${bindingVO.createdBy}]], showAudit([[${bindingVO.id}]], [[${bindingVO.createdBy}]],
[[${#temporals.format(bindingVO.createdAt, "yyyy-MM-dd'T'HH:mm:ss")}]], [[${#temporals.format(bindingVO.createdAt, "yyyy-MM-dd'T'HH:mm:ss")}]],
[[${bindingVO.updatedBy}]], [[${bindingVO.updatedBy}]],
[[${#temporals.format(bindingVO.updatedAt, "yyyy-MM-dd'T'HH:mm:ss")}]]); [[${#temporals.format(bindingVO.updatedAt, "yyyy-MM-dd'T'HH:mm:ss")}]]);
}); });
</script> </script>
<script>
const onRoleChange = (el) => {
$('.regionMainCodeArea').toggle(el.value !== "ROLE_ADMIN");
}
</script>
</section> </section>

View File

@@ -48,6 +48,7 @@ class AdminAuthFailHandlerTest {
testUsername, testUsername,
"test.1@#$", "test.1@#$",
"xx4@test.com", "xx4@test.com",
null,
false, false,
false, false,
Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));

View File

@@ -43,6 +43,7 @@ class AdminDetailsServiceTest {
username, username,
password, password,
"xx1@test.com", "xx1@test.com",
null,
false, false,
false, false,
Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));

View File

@@ -39,6 +39,7 @@ class AdminCreateUpdateDaoTest {
"admin_for_createDao_test", "admin_for_createDao_test",
"test.1@#$", "test.1@#$",
"admin_for_createDao_test@test.com", "admin_for_createDao_test@test.com",
null,
false, false,
false, false,
Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));
@@ -56,6 +57,7 @@ class AdminCreateUpdateDaoTest {
"admin_for_createDao_test", "admin_for_createDao_test",
"test.1@#$", "test.1@#$",
"admin_for_createDao_test@test.com", "admin_for_createDao_test@test.com",
null,
false, false,
false, false,
List.of("ROLE_STAFF")); List.of("ROLE_STAFF"));

View File

@@ -52,6 +52,7 @@ class CreateAdminController {
reqVO.getId(), reqVO.getId(),
reqVO.getPassword(), reqVO.getPassword(),
reqVO.getEmail(), reqVO.getEmail(),
reqVO.getRegionMainCode(),
reqVO.getAccountDisabled(), reqVO.getAccountDisabled(),
reqVO.getAccountLocked(), reqVO.getAccountLocked(),
reqVO.getRoleIds()); reqVO.getRoleIds());

View File

@@ -28,6 +28,9 @@ public class CreateAdminReqVO {
@Schema(description = "email", example = "admin-email@email.com") @Schema(description = "email", example = "admin-email@email.com")
private String email; private String email;
@Schema(description = "실사지역코드", example = "code.region.main.1")
private String regionMainCode;
@Schema(description = "계정 비활성화", example = "false") @Schema(description = "계정 비활성화", example = "false")
private Boolean accountDisabled; private Boolean accountDisabled;

View File

@@ -58,6 +58,7 @@ class UpdateAdminController {
reqVO.getId(), reqVO.getId(),
reqVO.getUpdatePassword(), reqVO.getUpdatePassword(),
reqVO.getEmail(), reqVO.getEmail(),
reqVO.getRegionMainCode(),
reqVO.getAccountDisabled(), reqVO.getAccountDisabled(),
reqVO.getAccountLocked(), reqVO.getAccountLocked(),
reqVO.getRoleIds()); reqVO.getRoleIds());

View File

@@ -35,6 +35,9 @@ public class UpdateAdminReqVO {
@Schema(description = "email", example = "staff@new-staff.com") @Schema(description = "email", example = "staff@new-staff.com")
private String email; private String email;
@Schema(description = "실사지역코드", example = "code.region.main.1")
private String regionMainCode;
@Schema(description = "계정 비활성화 여부", example = "false") @Schema(description = "계정 비활성화 여부", example = "false")
private Boolean accountDisabled; private Boolean accountDisabled;

View File

@@ -33,6 +33,7 @@ public class InitAdminData implements ApplicationRunner {
"test-admin", "test-admin",
"admin1@#$", "admin1@#$",
"admin@framework.org", "admin@framework.org",
null,
false, false,
false, false,
List.of("ROLE_ADMIN")); List.of("ROLE_ADMIN"));
@@ -43,6 +44,7 @@ public class InitAdminData implements ApplicationRunner {
"test-analyst", "test-analyst",
"analyst1@#$", "analyst1@#$",
"analyst@framework.org", "analyst@framework.org",
"code.region.main.1",
false, false,
false, false,
List.of("ROLE_ANALYST")); List.of("ROLE_ANALYST"));
@@ -53,6 +55,7 @@ public class InitAdminData implements ApplicationRunner {
"test-researcher", "test-researcher",
"researcher1@#$", "researcher1@#$",
"researcher@framework.org", "researcher@framework.org",
"code.region.main.1",
false, false,
false, false,
List.of("ROLE_RESEARCHER")); List.of("ROLE_RESEARCHER"));

View File

@@ -9,6 +9,7 @@ public interface SaveAdminPortIn {
String id, String id,
String password, String password,
String email, String email,
String regionMainCode,
Boolean accountDisabled, Boolean accountDisabled,
Boolean accountLocked, Boolean accountLocked,
List<String> roleIds); List<String> roleIds);

View File

@@ -26,6 +26,7 @@ public class SaveAdminService implements SaveAdminPortIn {
String id, String id,
String password, String password,
String email, String email,
String regionMainCode,
Boolean accountDisabled, Boolean accountDisabled,
Boolean accountLocked, Boolean accountLocked,
List<String> roleIds) { List<String> roleIds) {
@@ -58,6 +59,7 @@ public class SaveAdminService implements SaveAdminPortIn {
password, password,
passwordUpdatedAt, passwordUpdatedAt,
email, email,
regionMainCode,
accountDisabled, accountDisabled,
loginFailCnt, loginFailCnt,
accountLocked, accountLocked,

View File

@@ -16,6 +16,7 @@ public class SaveAdminCmd extends AuditCommand {
private String encodedPassword; private String encodedPassword;
private LocalDateTime passwordUpdatedAt; private LocalDateTime passwordUpdatedAt;
private String email; private String email;
private String regionMainCode;
private Boolean accountDisabled; private Boolean accountDisabled;
private Integer loginFailCnt; private Integer loginFailCnt;
private Boolean accountLocked; private Boolean accountLocked;

View File

@@ -18,6 +18,7 @@ public class AdminView implements Serializable {
private String email; private String email;
private String name; private String name;
private String contact; private String contact;
private String regionMainCode;
private Integer inspectionArea; private Integer inspectionArea;
private LocalDateTime passwordUpdatedAt; private LocalDateTime passwordUpdatedAt;
private Boolean accountDisabled; private Boolean accountDisabled;

View File

@@ -13,7 +13,7 @@
a.email, a.email,
a.name, a.name,
a.contact, a.contact,
a.inspection_area, a.region_main_code,
a.password_updated_at, a.password_updated_at,
a.account_disabled, a.account_disabled,
a.login_fail_cnt, a.login_fail_cnt,

View File

@@ -13,6 +13,7 @@
id, id,
password, password,
email, email,
region_main_code,
password_updated_at, password_updated_at,
account_disabled, account_disabled,
login_fail_cnt, login_fail_cnt,
@@ -22,6 +23,7 @@
#{id}, #{id},
#{encodedPassword}, #{encodedPassword},
#{email}, #{email},
#{regionMainCode},
#{passwordUpdatedAt}, #{passwordUpdatedAt},
#{accountDisabled}, #{accountDisabled},
#{loginFailCnt}, #{loginFailCnt},
@@ -35,6 +37,7 @@
SET SET
password = #{encodedPassword}, password = #{encodedPassword},
email = #{email}, email = #{email},
region_main_code = #{regionMainCode},
password_updated_at = #{passwordUpdatedAt}, password_updated_at = #{passwordUpdatedAt},
account_disabled = #{accountDisabled}, account_disabled = #{accountDisabled},
login_fail_cnt = #{loginFailCnt}, login_fail_cnt = #{loginFailCnt},

View File

@@ -187,7 +187,7 @@ CREATE TABLE admin (
password_updated_at timestamp(6) NOT NULL, -- 비밀번호 수정일 password_updated_at timestamp(6) NOT NULL, -- 비밀번호 수정일
name varchar(4), -- 관리자 이름 name varchar(4), -- 관리자 이름
contact varchar(15), -- 연락처 contact varchar(15), -- 연락처
inspection_area varchar(10), -- 실사지역 region_main_code varchar(255), -- 실사(공통코드)
account_disabled boolean, -- 계정 비활성화 여부 account_disabled boolean, -- 계정 비활성화 여부
login_fail_cnt integer, -- 로그인 실패 횟수 login_fail_cnt integer, -- 로그인 실패 횟수
account_locked boolean, -- 계정 잠김 여부 account_locked boolean, -- 계정 잠김 여부
@@ -211,7 +211,7 @@ COMMENT ON COLUMN admin.password IS '비밀번호';
COMMENT ON COLUMN admin.password_updated_at IS '비밀번호 수정일'; COMMENT ON COLUMN admin.password_updated_at IS '비밀번호 수정일';
COMMENT ON COLUMN admin.name IS '관리자 이름'; COMMENT ON COLUMN admin.name IS '관리자 이름';
COMMENT ON COLUMN admin.contact IS '연락처'; COMMENT ON COLUMN admin.contact IS '연락처';
COMMENT ON COLUMN admin.inspection_area IS '실사지역'; COMMENT ON COLUMN admin.region_main_code IS '실사';
COMMENT ON COLUMN admin.account_disabled IS '계정 비활성화 여부'; COMMENT ON COLUMN admin.account_disabled IS '계정 비활성화 여부';
COMMENT ON COLUMN admin.login_fail_cnt IS '로그인 실패 횟수'; COMMENT ON COLUMN admin.login_fail_cnt IS '로그인 실패 횟수';
COMMENT ON COLUMN admin.account_locked IS '계정 잠김 여부'; COMMENT ON COLUMN admin.account_locked IS '계정 잠김 여부';