[2025.05.31] initData 작업
This commit is contained in:
@@ -34,7 +34,7 @@ public class RoleUpdateAspect {
|
|||||||
public Object operate(ProceedingJoinPoint joinPoint) throws Throwable {
|
public Object operate(ProceedingJoinPoint joinPoint) throws Throwable {
|
||||||
Object[] args = joinPoint.getArgs();
|
Object[] args = joinPoint.getArgs();
|
||||||
|
|
||||||
String adminId = (String) args[0];
|
String adminId = (String) args[1];
|
||||||
List<String> currentRoles = Collections.emptyList();
|
List<String> currentRoles = Collections.emptyList();
|
||||||
|
|
||||||
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
|
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
|
||||||
|
|||||||
@@ -4,10 +4,6 @@ import app.module.core.config.adapters.web.security.domain.CorePrivilege;
|
|||||||
import app.module.core.config.adapters.web.security.domain.CoreRole;
|
import app.module.core.config.adapters.web.security.domain.CoreRole;
|
||||||
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.adminResearch.getAdmin.ports.GetAdminPortIn;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
|
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -21,13 +17,13 @@ import org.springframework.security.core.userdetails.UserDetails;
|
|||||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||||
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class AdminDetailsService implements UserDetailsService {
|
public class AdminDetailsService implements UserDetailsService {
|
||||||
|
|
||||||
private final AdminViewPortIn adminViewPortIn;
|
private final AdminViewPortIn adminViewPortIn;
|
||||||
private final GetAdminPortIn getAdminPortIn;
|
|
||||||
|
|
||||||
@Value("${app.admin.password.validity.period.days}")
|
@Value("${app.admin.password.validity.period.days}")
|
||||||
private long passwordValidPeriodDays;
|
private long passwordValidPeriodDays;
|
||||||
@@ -36,28 +32,23 @@ public class AdminDetailsService implements UserDetailsService {
|
|||||||
@Transactional
|
@Transactional
|
||||||
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
|
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
|
||||||
|
|
||||||
GetAdmin getAdmin =
|
AdminView adminUser =
|
||||||
getAdminPortIn
|
adminViewPortIn
|
||||||
.operate(new GetAdminCmd(username))
|
.connect(username)
|
||||||
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
|
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
|
||||||
|
|
||||||
// AdminView adminUser =
|
boolean accountLocked = Optional.ofNullable(adminUser.getAccountLocked()).orElse(false);
|
||||||
// adminViewPortIn
|
boolean accountDisabled = Optional.ofNullable(adminUser.getAccountDisabled()).orElse(false);
|
||||||
// .connect(username)
|
|
||||||
// .orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
|
|
||||||
|
|
||||||
boolean accountLocked = Optional.ofNullable(getAdmin.getAccountLocked()).orElse(false);
|
|
||||||
boolean accountDisabled = Optional.ofNullable(getAdmin.getAccountDisabled()).orElse(false);
|
|
||||||
|
|
||||||
return new AdminUser(
|
return new AdminUser(
|
||||||
getAdmin.getId(),
|
adminUser.getId(),
|
||||||
getAdmin.getPassword(),
|
adminUser.getPassword(),
|
||||||
!accountDisabled,
|
!accountDisabled,
|
||||||
true,
|
true,
|
||||||
isCredentialsNonExpired(getAdmin.getPasswordUpdatedAt()),
|
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),
|
||||||
!accountLocked,
|
!accountLocked,
|
||||||
getAuthorities(getAdmin.getRoles()),
|
getAuthorities(adminUser.getRoles()),
|
||||||
passwordValidPeriodDays - getDaysPassedFrom(getAdmin.getPasswordUpdatedAt()));
|
passwordValidPeriodDays - getDaysPassedFrom(adminUser.getPasswordUpdatedAt()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ public class AdminCreatePostController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
savePortIn.connect(
|
savePortIn.connect(
|
||||||
|
bindingVO.getSeq(),
|
||||||
bindingVO.getId(),
|
bindingVO.getId(),
|
||||||
bindingVO.getPassword(),
|
bindingVO.getPassword(),
|
||||||
bindingVO.getEmail(),
|
bindingVO.getEmail(),
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ class AdminUpdateGetController {
|
|||||||
output.getCreatedAt(),
|
output.getCreatedAt(),
|
||||||
output.getUpdatedBy(),
|
output.getUpdatedBy(),
|
||||||
output.getUpdatedAt(),
|
output.getUpdatedAt(),
|
||||||
|
output.getSeq(),
|
||||||
output.getId(),
|
output.getId(),
|
||||||
null,
|
null,
|
||||||
output.getEmail(),
|
output.getEmail(),
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ class AdminUpdatePostController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
|
bindingVO.getSeq(),
|
||||||
bindingVO.getId(),
|
bindingVO.getId(),
|
||||||
bindingVO.getUpdatePassword(),
|
bindingVO.getUpdatePassword(),
|
||||||
bindingVO.getEmail(),
|
bindingVO.getEmail(),
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import lombok.Setter;
|
|||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class AdminCreateBindingVO {
|
public class AdminCreateBindingVO {
|
||||||
|
private Long seq;
|
||||||
private String id;
|
private String id;
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public class AdminUpdateBindingVO implements AuditOutput {
|
|||||||
|
|
||||||
private final LocalDateTime updatedAt;
|
private final LocalDateTime updatedAt;
|
||||||
|
|
||||||
|
private Long seq;
|
||||||
private String id;
|
private String id;
|
||||||
private String updatePassword;
|
private String updatePassword;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
|
import app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI.model.GetAnalystDashboardReqVO;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class GetAnalystDashboardController {
|
||||||
|
|
||||||
|
@GetMapping(path = "/analyst/dashboard")
|
||||||
|
String operate(
|
||||||
|
Model model,
|
||||||
|
@ModelAttribute("reqVO") GetAnalystDashboardReqVO reqVO) {
|
||||||
|
|
||||||
|
return "analyst/dashboard";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.core.usecase.adminResearch.getAdmin.ports.application.domain;
|
package app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI.model;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
@@ -9,6 +9,5 @@ import lombok.Setter;
|
|||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@EqualsAndHashCode
|
@EqualsAndHashCode
|
||||||
public class GetAdminCmd {
|
public class GetAnalystDashboardReqVO {
|
||||||
private String id;
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package app.module.admin.usecase.communication.notice.getNoticesUI;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
|
import app.module.admin.usecase.communication.notice.getNoticesUI.model.GetNoticesReqVO;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class GetNoticesController {
|
||||||
|
|
||||||
|
@GetMapping(path = "/communication/notices")
|
||||||
|
String operate(
|
||||||
|
Model model,
|
||||||
|
@ModelAttribute("reqVO") GetNoticesReqVO reqVO) {
|
||||||
|
|
||||||
|
return "communication/notices";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package app.module.admin.usecase.communication.notice.getNoticesUI.model;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class GetNoticesReqVO {
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package app.module.admin.usecase.communication.sms.getSmsUI;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
|
import app.module.admin.usecase.communication.sms.getSmsUI.model.GetSmsReqVO;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class GetSmsController {
|
||||||
|
|
||||||
|
@GetMapping(path = "/communication/sms")
|
||||||
|
String operate(
|
||||||
|
Model model,
|
||||||
|
@ModelAttribute("reqVO") GetSmsReqVO reqVO) {
|
||||||
|
|
||||||
|
return "communication/sms";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package app.module.admin.usecase.communication.sms.getSmsUI.model;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class GetSmsReqVO {
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package app.module.admin.usecase.household.getHouseholdsUI;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
|
import app.module.admin.usecase.household.getHouseholdsUI.model.GetHouseholdsUIReqVO;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class GetHouseholdsUIController {
|
||||||
|
|
||||||
|
@GetMapping(path = "/household/households")
|
||||||
|
String operate(
|
||||||
|
Model model,
|
||||||
|
@ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) {
|
||||||
|
|
||||||
|
return "household/households";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package app.module.admin.usecase.household.getHouseholdsUI.model;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class GetHouseholdsUIReqVO {
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
|
import app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web.model.GetResearcherDashboardUIReqVO;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class GetResearcherDashboardUIController {
|
||||||
|
|
||||||
|
@GetMapping(path = "/researcher/dashboard")
|
||||||
|
String operate(
|
||||||
|
Model model,
|
||||||
|
@ModelAttribute("reqVO") GetResearcherDashboardUIReqVO reqVO) {
|
||||||
|
|
||||||
|
return "researcher/dashboard";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web.model;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class GetResearcherDashboardUIReqVO {
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
|
import app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web.model.GetResearcherHouseholdsUIReqVO;
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class GetResearcherHouseholdsUIController {
|
||||||
|
|
||||||
|
@GetMapping(path = "/researcher/households")
|
||||||
|
String operate(
|
||||||
|
Model model,
|
||||||
|
@ModelAttribute("reqVO") GetResearcherHouseholdsUIReqVO reqVO) {
|
||||||
|
|
||||||
|
return "researcher/households";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web.model;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class GetResearcherHouseholdsUIReqVO {
|
||||||
|
}
|
||||||
@@ -26,4 +26,23 @@ uri.admin.analysis.operationLog=Operation Log (\uC218\uD589\uB85C\uADF8)
|
|||||||
uri.admin.analysis.operationLog.{{pathVar}}=\uC218\uD589\uB85C\uADF8 \uC0C1\uC138
|
uri.admin.analysis.operationLog.{{pathVar}}=\uC218\uD589\uB85C\uADF8 \uC0C1\uC138
|
||||||
uri.admin.addons=Add-ons (\uBD80\uAC00\uAE30\uB2A5)
|
uri.admin.addons=Add-ons (\uBD80\uAC00\uAE30\uB2A5)
|
||||||
uri.admin.addons.email=Email
|
uri.admin.addons.email=Email
|
||||||
uri.admin.addons.email.form=Email \uBC1C\uC1A1\uD3FC
|
uri.admin.addons.email.create=Email \uBC1C\uC1A1\uD3FC
|
||||||
|
|
||||||
|
uri.admin.researcher=\uC870\uC0AC\uC6D0
|
||||||
|
uri.admin.researcher.household=\uC784\uAC00\uD604\uD669
|
||||||
|
uri.admin.researcher.household.{{pathVar}}=\uC784\uAC00\uD604\uD669 \uC0C1\uC138
|
||||||
|
uri.admin.researcher.dashboard=\uB300\uC2DC\uBCF4\uB4DC
|
||||||
|
|
||||||
|
uri.admin.analyst=\uC5F0\uAD6C\uC6D0
|
||||||
|
uri.admin.analyst.dashboard=\uB300\uC2DC\uBCF4\uB4DC
|
||||||
|
|
||||||
|
uri.admin.communication=\uCEE4\uBBA4\uB2C8\uCF00\uC774\uC158
|
||||||
|
uri.admin.communication.notice=\uACF5\uC9C0\uC0AC\uD56D
|
||||||
|
uri.admin.communication.notice.create=\uACF5\uC9C0\uC0AC\uD56D \uB4F1\uB85D
|
||||||
|
uri.admin.communication.notice.update.{{pathVar}}=\uACF5\uC9C0\uC0AC\uD56D \uC218\uC815
|
||||||
|
uri.admin.communication.sms=\uBB38\uC790\uBC1C\uC1A1
|
||||||
|
|
||||||
|
uri.admin.household=\uC784\uAC00\uD68C\uC6D0\uAD00\uB9AC
|
||||||
|
uri.admin.household.household=\uC784\uAC00\uD68C\uC6D0
|
||||||
|
uri.admin.household.household.create=\uC784\uAC00\uD68C\uC6D0 \uB4F1\uB85D
|
||||||
|
uri.admin.household.household.update.{{pathVar}}=\uC784\uAC00\uD68C\uC6D0 \uC218\uC815
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
|
||||||
|
layout:decorate="~{layout/layout}">
|
||||||
|
|
||||||
|
<section layout:fragment="content">
|
||||||
|
<h1>/analyst/dashboard</h1>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
|
||||||
|
layout:decorate="~{layout/layout}">
|
||||||
|
|
||||||
|
<section layout:fragment="content">
|
||||||
|
<h1>/communication/notices</h1>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
|
||||||
|
layout:decorate="~{layout/layout}">
|
||||||
|
|
||||||
|
<section layout:fragment="content">
|
||||||
|
<h1>/communication/sms</h1>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
|
||||||
|
layout:decorate="~{layout/layout}">
|
||||||
|
|
||||||
|
<section layout:fragment="content">
|
||||||
|
<h1>/household/households</h1>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
|
||||||
|
layout:decorate="~{layout/layout}">
|
||||||
|
|
||||||
|
<section layout:fragment="content">
|
||||||
|
<h1>/researcher/dashboard</h1>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
|
||||||
|
layout:decorate="~{layout/layout}">
|
||||||
|
|
||||||
|
<section layout:fragment="content">
|
||||||
|
<h1>/researcher/households</h1>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</html>
|
||||||
@@ -44,6 +44,7 @@ class AdminAuthFailHandlerTest {
|
|||||||
@BeforeAll
|
@BeforeAll
|
||||||
public void beforeAll() {
|
public void beforeAll() {
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
|
1L,
|
||||||
testUsername,
|
testUsername,
|
||||||
"test.1@#$",
|
"test.1@#$",
|
||||||
"xx4@test.com",
|
"xx4@test.com",
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ class AdminAuthSuccessHandlerTest {
|
|||||||
@BeforeAll
|
@BeforeAll
|
||||||
public void beforeAll() {
|
public void beforeAll() {
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
|
1L,
|
||||||
username,
|
username,
|
||||||
password,
|
password,
|
||||||
"admin_for_createDao_test@test.com",
|
"admin_for_createDao_test@test.com",
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ class AdminDetailsServiceTest {
|
|||||||
@BeforeAll
|
@BeforeAll
|
||||||
public void beforeAll() {
|
public void beforeAll() {
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
|
1L,
|
||||||
username,
|
username,
|
||||||
password,
|
password,
|
||||||
"xx1@test.com",
|
"xx1@test.com",
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ class AdminCreateUpdateDaoTest {
|
|||||||
void operate() {
|
void operate() {
|
||||||
|
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
|
1L,
|
||||||
"admin_for_createDao_test",
|
"admin_for_createDao_test",
|
||||||
"test.1@#$",
|
"test.1@#$",
|
||||||
"admin_for_createDao_test@test.com",
|
"admin_for_createDao_test@test.com",
|
||||||
@@ -51,6 +52,7 @@ class AdminCreateUpdateDaoTest {
|
|||||||
retrieveUser.getRoles().size()));
|
retrieveUser.getRoles().size()));
|
||||||
|
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
|
2L,
|
||||||
"admin_for_createDao_test",
|
"admin_for_createDao_test",
|
||||||
"test.1@#$",
|
"test.1@#$",
|
||||||
"admin_for_createDao_test@test.com",
|
"admin_for_createDao_test@test.com",
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ class CreateAdminController {
|
|||||||
|
|
||||||
String createdId =
|
String createdId =
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
|
reqVO.getSeq(),
|
||||||
reqVO.getId(),
|
reqVO.getId(),
|
||||||
reqVO.getPassword(),
|
reqVO.getPassword(),
|
||||||
reqVO.getEmail(),
|
reqVO.getEmail(),
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import lombok.Setter;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@EqualsAndHashCode
|
@EqualsAndHashCode
|
||||||
public class CreateAdminReqVO {
|
public class CreateAdminReqVO {
|
||||||
|
private Long seq;
|
||||||
private String id;
|
private String id;
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ class UpdateAdminController {
|
|||||||
|
|
||||||
String updatedId =
|
String updatedId =
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
|
reqVO.getSeq(),
|
||||||
reqVO.getId(),
|
reqVO.getId(),
|
||||||
reqVO.getUpdatePassword(),
|
reqVO.getUpdatePassword(),
|
||||||
reqVO.getEmail(),
|
reqVO.getEmail(),
|
||||||
|
|||||||
@@ -18,6 +18,9 @@ import lombok.Setter;
|
|||||||
@Schema(description = "UpdateAdmin request")
|
@Schema(description = "UpdateAdmin request")
|
||||||
public class UpdateAdminReqVO {
|
public class UpdateAdminReqVO {
|
||||||
|
|
||||||
|
@Schema(description = "seq", example = "seq")
|
||||||
|
private Long seq;
|
||||||
|
|
||||||
@Schema(description = "id", example = "staff")
|
@Schema(description = "id", example = "staff")
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
|
|||||||
@@ -26,4 +26,4 @@ uri.admin.analysis.operationLog=Operation Log (\uC218\uD589\uB85C\uADF8)
|
|||||||
uri.admin.analysis.operationLog.{{pathVar}}=\uC218\uD589\uB85C\uADF8 \uC0C1\uC138
|
uri.admin.analysis.operationLog.{{pathVar}}=\uC218\uD589\uB85C\uADF8 \uC0C1\uC138
|
||||||
uri.admin.addons=Add-ons (\uBD80\uAC00\uAE30\uB2A5)
|
uri.admin.addons=Add-ons (\uBD80\uAC00\uAE30\uB2A5)
|
||||||
uri.admin.addons.email=Email
|
uri.admin.addons.email=Email
|
||||||
uri.admin.addons.email.form=Email \uBC1C\uC1A1\uD3FC
|
uri.admin.addons.email.create=Email \uBC1C\uC1A1\uD3FC
|
||||||
|
|||||||
@@ -26,4 +26,4 @@ uri.admin.analysis.operationLog=Operation Log
|
|||||||
uri.admin.analysis.operationLog.{{pathVar}}=Operation Log Details
|
uri.admin.analysis.operationLog.{{pathVar}}=Operation Log Details
|
||||||
uri.admin.addons=Add-ons
|
uri.admin.addons=Add-ons
|
||||||
uri.admin.addons.email=Email
|
uri.admin.addons.email=Email
|
||||||
uri.admin.addons.email.form=Email Sending Form
|
uri.admin.addons.email.create=Email Sending Form
|
||||||
@@ -12,6 +12,7 @@ import lombok.Setter;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class Admin extends AuditEntity {
|
public class Admin extends AuditEntity {
|
||||||
|
private Long seq;
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
|
|||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Order(3)
|
@Order(5)
|
||||||
public class InitAdminData implements ApplicationRunner {
|
public class InitAdminData implements ApplicationRunner {
|
||||||
|
|
||||||
private final SaveAdminPortIn saveAdminPortIn;
|
private final SaveAdminPortIn saveAdminPortIn;
|
||||||
@@ -27,20 +27,19 @@ public class InitAdminData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 관리자
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
"recycle-super", "recycle1@#$", "super@framework.org", false, false,
|
null,"test-admin", "admin1@#$", "admin@framework.org", false, false,
|
||||||
List.of("ROLE_SUPER"));
|
List.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
// 연구원
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
"recycle-manager",
|
null,"test-analysis", "analysis1@#$", "analysis@framework.org", false, false,
|
||||||
"manager1@#$",
|
List.of("ROLE_ANALYST"));
|
||||||
"manager@framework.org",
|
|
||||||
false,
|
|
||||||
false,
|
|
||||||
List.of("ROLE_MANAGER"));
|
|
||||||
|
|
||||||
|
// 조사원
|
||||||
saveAdminPortIn.connect(
|
saveAdminPortIn.connect(
|
||||||
"recycle-staff", "staff1@#$", "staff@framework.org", false, false,
|
null,"test-researcher", "researcher1@#$", "researcher@framework.org", false, false,
|
||||||
List.of("ROLE_STAFF"));
|
List.of("ROLE_RESEARCHER"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ public class InitArticleData implements ApplicationRunner {
|
|||||||
|
|
||||||
// article_has_upload_file 테이블 우선 삭제
|
// article_has_upload_file 테이블 우선 삭제
|
||||||
removeAllArticleMapper.deleteAllFiles();
|
removeAllArticleMapper.deleteAllFiles();
|
||||||
// article_comment 테이블 우선 삭ㅈ데
|
// article_comment 테이블 우선 삭제
|
||||||
removeAllArticleMapper.deleteAllComments();
|
removeAllArticleMapper.deleteAllComments();
|
||||||
// article 전체 데이터 삭제
|
// article 전체 데이터 삭제
|
||||||
removeAllArticleMapper.deleteAll();
|
removeAllArticleMapper.deleteAll();
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData;
|
package app.module.core.config.adapters.persistence.initData;
|
||||||
|
|
||||||
import app.module.core.config.application.enums.SignUpType;
|
import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
|
||||||
import app.module.core.usecase.user.createUser.ports.CreateUserPortIn;
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
|
||||||
import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd;
|
|
||||||
import java.util.Set;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@@ -15,10 +13,10 @@ import org.springframework.stereotype.Component;
|
|||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Order(3)
|
@Order(5)
|
||||||
public class InitFrontUserData implements ApplicationRunner {
|
public class InitFrontUserData implements ApplicationRunner {
|
||||||
|
|
||||||
private final CreateUserPortIn createUserPortIn;
|
private final CreateHouseholdPortIn createHouseholdPortIn;
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -29,16 +27,23 @@ public class InitFrontUserData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// createUserPortIn.operate(
|
createHouseholdPortIn.operate(new CreateHouseholdInCmd(
|
||||||
// new CreateUserCmd(
|
"11111",
|
||||||
// "generalUser",
|
"테스트임가",
|
||||||
// "generalUser1@#$",
|
58,
|
||||||
// "general-user@recycle.com",
|
null,
|
||||||
// "recycle-사용자",
|
"01011111111",
|
||||||
// SignUpType.NORMAL,
|
"서울",
|
||||||
// false,
|
"마포구",
|
||||||
// 0,
|
"와와빌딩 2층",
|
||||||
// false,
|
14,
|
||||||
// Set.of("ROLE_GENERAL")));
|
13,
|
||||||
|
11,
|
||||||
|
10,
|
||||||
|
10,
|
||||||
|
true,
|
||||||
|
null,
|
||||||
|
null
|
||||||
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData;
|
package app.module.core.config.adapters.persistence.initData;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Privilege;
|
|
||||||
import app.module.core.config.application.enums.AppType;
|
import app.module.core.config.application.enums.AppType;
|
||||||
import app.module.core.usecase.privilege.save.adapters.persistence.PrivilegeSaveMapper;
|
import app.module.core.usecase.privilege.save.ports.PrivilegeSavePortIn;
|
||||||
import app.module.core.usecase.privilege.save.adapters.persistence.PrivilegeSaveRepo;
|
import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.ApplicationArguments;
|
import org.springframework.boot.ApplicationArguments;
|
||||||
@@ -13,10 +12,10 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Order(1)
|
@Order(2)
|
||||||
public class InitPrivilegeData implements ApplicationRunner {
|
public class InitPrivilegeData implements ApplicationRunner {
|
||||||
|
|
||||||
private final PrivilegeSaveMapper privilegeSaveMapper;
|
private final PrivilegeSavePortIn privilegeSavePortIn;
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -27,7 +26,7 @@ public class InitPrivilegeData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_API", "ADMIN API 이용 권한", AppType.ADMIN, 0));
|
privilegeSavePortIn.connect(new PrivilegeSaveCommand( AppType.ADMIN, "ADMIN_API", "ADMIN API 이용 권한", 0));
|
||||||
// privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_ACCESS", "ADMIN 사이트 접근 권한", AppType.ADMIN, 1));
|
privilegeSavePortIn.connect(new PrivilegeSaveCommand(AppType.ADMIN,"ADMIN_ACCESS", "ADMIN 사이트 접근 권한", 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,14 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData;
|
package app.module.core.config.adapters.persistence.initData;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Privilege;
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Role;
|
import app.module.core.config.adapters.persistence.entity.Role;
|
||||||
import app.module.core.config.adapters.persistence.entity.RoleHasPrivilege;
|
|
||||||
import app.module.core.config.adapters.persistence.repository.PrivilegeRepo;
|
|
||||||
import app.module.core.config.adapters.persistence.repository.RoleRepo;
|
|
||||||
import app.module.core.config.application.enums.AppType;
|
import app.module.core.config.application.enums.AppType;
|
||||||
import app.module.core.config.application.util.CommonUtil;
|
|
||||||
import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper;
|
import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper;
|
||||||
import app.module.core.usecase.privilege.view.ports.application.domain.PrivilegeView;
|
import app.module.core.usecase.privilege.view.ports.application.domain.PrivilegeView;
|
||||||
import app.module.core.usecase.role.save.adapters.persistence.RoleSaveMapper;
|
import app.module.core.usecase.role.save.adapters.persistence.RoleSaveMapper;
|
||||||
import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam;
|
import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam;
|
||||||
|
import app.module.core.usecase.role.save.ports.RoleSavePortIn;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.ApplicationArguments;
|
import org.springframework.boot.ApplicationArguments;
|
||||||
@@ -23,11 +18,10 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Order(2)
|
@Order(3)
|
||||||
public class InitRoleData implements ApplicationRunner {
|
public class InitRoleData implements ApplicationRunner {
|
||||||
|
|
||||||
private final RoleSaveMapper roleSaveMapper;
|
private final RoleSavePortIn roleSavePortIn;
|
||||||
private final PrivilegeViewMapper privilegeViewRepo;
|
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -38,43 +32,27 @@ public class InitRoleData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// // 권한 `privilege` 정보 가져오기
|
int orderNo = 0;
|
||||||
// PrivilegeView apiPrivilege = privilegeViewRepo.findById("ADMIN_API").orElseThrow();
|
|
||||||
// PrivilegeView privilege = privilegeViewRepo.findById("ADMIN_ACCESS").orElseThrow();
|
roleSavePortIn.connect(
|
||||||
//
|
AppType.ADMIN,
|
||||||
// int orderNo = 0;
|
"ROLE_ADMIN",
|
||||||
//
|
"관리자",
|
||||||
// roleSaveMapper.insertRole(new Role("ROLE_SUPER", "SUPER 관리자", AppType.ADMIN, orderNo++));
|
orderNo++,
|
||||||
// roleSaveMapper.insertRoleHasPrivileges(
|
List.of("ADMIN_API", "ADMIN_ACCESS"));
|
||||||
// new RoleHasPrivilegeSaveParam(
|
|
||||||
// "ROLE_SUPER",
|
roleSavePortIn.connect(
|
||||||
// List.of(apiPrivilege.getId(), privilege.getId()),
|
AppType.ADMIN,
|
||||||
// LocalDateTime.now(),
|
"ROLE_ANALYST",
|
||||||
// "INIT_DATA",
|
"연구원",
|
||||||
// LocalDateTime.now(),
|
orderNo++,
|
||||||
// "INIT_DATA"
|
List.of("ADMIN_API", "ADMIN_ACCESS"));
|
||||||
// ));
|
|
||||||
//
|
roleSavePortIn.connect(
|
||||||
// roleSaveMapper.insertRole(new Role("ROLE_MANAGER", "매니저", AppType.ADMIN, orderNo++));
|
AppType.ADMIN,
|
||||||
// roleSaveMapper.insertRoleHasPrivileges(
|
"ROLE_RESEARCHER",
|
||||||
// new RoleHasPrivilegeSaveParam(
|
"조사원",
|
||||||
// "ROLE_MANAGER",
|
orderNo++,
|
||||||
// List.of(apiPrivilege.getId(), privilege.getId()),
|
List.of("ADMIN_API", "ADMIN_ACCESS"));
|
||||||
// LocalDateTime.now(),
|
|
||||||
// "INIT_DATA",
|
|
||||||
// LocalDateTime.now(),
|
|
||||||
// "INIT_DATA"
|
|
||||||
// ));
|
|
||||||
//
|
|
||||||
// roleSaveMapper.insertRole(new Role("ROLE_STAFF", "스텝", AppType.ADMIN, orderNo++));
|
|
||||||
// roleSaveMapper.insertRoleHasPrivileges(
|
|
||||||
// new RoleHasPrivilegeSaveParam(
|
|
||||||
// "ROLE_STAFF",
|
|
||||||
// List.of(apiPrivilege.getId(), privilege.getId()),
|
|
||||||
// LocalDateTime.now(),
|
|
||||||
// "INIT_DATA",
|
|
||||||
// LocalDateTime.now(),
|
|
||||||
// "INIT_DATA"
|
|
||||||
// ));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,11 +7,13 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.ApplicationArguments;
|
import org.springframework.boot.ApplicationArguments;
|
||||||
import org.springframework.boot.ApplicationRunner;
|
import org.springframework.boot.ApplicationRunner;
|
||||||
|
import org.springframework.core.annotation.Order;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
@Order(4)
|
||||||
public class InitUICodeData implements ApplicationRunner {
|
public class InitUICodeData implements ApplicationRunner {
|
||||||
|
|
||||||
private final UICodeSavePortIn uiCodeSavePortIn;
|
private final UICodeSavePortIn uiCodeSavePortIn;
|
||||||
@@ -25,42 +27,42 @@ public class InitUICodeData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// final String UICODE = "code";
|
final String UICODE = "code";
|
||||||
// final String UICODE_PAGEABLE = "code.pageable";
|
final String UICODE_PAGEABLE = "code.pageable";
|
||||||
// final String UICODE_PAGEABLE_ROWS = "code.pageable.rows";
|
final String UICODE_PAGEABLE_ROWS = "code.pageable.rows";
|
||||||
//
|
|
||||||
// // root 노드 - code
|
// root 노드 - code
|
||||||
// uiCodeSavePortIn.connect(
|
uiCodeSavePortIn.connect(
|
||||||
// new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null, true), false);
|
new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null, true), false);
|
||||||
//
|
|
||||||
// // code - board
|
// code - board
|
||||||
// uiCodeSavePortIn.connect(
|
uiCodeSavePortIn.connect(
|
||||||
// new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null, true), false);
|
new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null, true), false);
|
||||||
//
|
|
||||||
// // code - board - rows
|
// code - board - rows
|
||||||
// uiCodeSavePortIn.connect(
|
uiCodeSavePortIn.connect(
|
||||||
// new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null,
|
new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null,
|
||||||
// true),
|
true),
|
||||||
// false);
|
false);
|
||||||
//
|
|
||||||
// uiCodeSavePortIn.connect(
|
uiCodeSavePortIn.connect(
|
||||||
// new UICodeSaveCommand(
|
new UICodeSaveCommand(
|
||||||
// UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 1, "10", "10", null, true),
|
UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 1, "10", "10", null, true),
|
||||||
// false);
|
false);
|
||||||
//
|
|
||||||
// uiCodeSavePortIn.connect(
|
uiCodeSavePortIn.connect(
|
||||||
// new UICodeSaveCommand(
|
new UICodeSaveCommand(
|
||||||
// UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 2, "20", "20", null, true),
|
UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 2, "20", "20", null, true),
|
||||||
// false);
|
false);
|
||||||
//
|
|
||||||
// uiCodeSavePortIn.connect(
|
uiCodeSavePortIn.connect(
|
||||||
// new UICodeSaveCommand(
|
new UICodeSaveCommand(
|
||||||
// UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 3, "50", "50", null, true),
|
UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 3, "50", "50", null, true),
|
||||||
// false);
|
false);
|
||||||
//
|
|
||||||
// uiCodeSavePortIn.connect(
|
uiCodeSavePortIn.connect(
|
||||||
// new UICodeSaveCommand(
|
new UICodeSaveCommand(
|
||||||
// UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 4, "100", "100", null, true),
|
UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 4, "100", "100", null, true),
|
||||||
// false);
|
false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData;
|
package app.module.core.config.adapters.persistence.initData;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllAdminURIMapper;
|
|
||||||
import app.module.core.config.application.enums.AppType;
|
import app.module.core.config.application.enums.AppType;
|
||||||
import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn;
|
|
||||||
import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement;
|
|
||||||
import app.module.core.usecase.uri.save.ports.URISavePortIn;
|
import app.module.core.usecase.uri.save.ports.URISavePortIn;
|
||||||
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
|
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@@ -22,12 +17,10 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Order(3)
|
@Order(4)
|
||||||
public class InitUriAdminData implements ApplicationRunner {
|
public class InitUriAdminData implements ApplicationRunner {
|
||||||
|
|
||||||
private final GetUrisPortIn getUrisPortIn;
|
|
||||||
private final URISavePortIn uriSavePortIn;
|
private final URISavePortIn uriSavePortIn;
|
||||||
private final RemoveAllAdminURIMapper removeAllAdminURIMapper;
|
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -39,326 +32,503 @@ public class InitUriAdminData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// List<URIElement> uris = getUrisPortIn.connect(AppType.ADMIN);
|
final String ADMIN = "uri.admin";
|
||||||
// removeAllAdminURIMapper.deleteAllByAdminUriIds(
|
|
||||||
// uris.stream().map(URIElement::getId).collect(Collectors.toList()));
|
final String ADMIN_BOARD = "uri.admin.board";
|
||||||
// removeAllAdminURIMapper.deleteAllByAppType(AppType.ADMIN);
|
|
||||||
//
|
final String ADMIN_ARTICLE = "uri.admin.board.article";
|
||||||
// final String ADMIN = "uri.admin";
|
final String ADMIN_ARTICLE_CREATE = "uri.admin.board.article.create";
|
||||||
//
|
final String ADMIN_ARTICLE_UPDATE = "uri.admin.board.article.update.{{pathVar}}";
|
||||||
// final String ADMIN_BOARD = "uri.admin.board";
|
final String ADMIN_ARTICLE_DELETE = "uri.admin.board.article.delete";
|
||||||
//
|
final String ADMIN_ARTICLE_EXCEL = "uri.admin.board.article.excel";
|
||||||
// final String ADMIN_ARTICLE = "uri.admin.board.article";
|
|
||||||
// final String ADMIN_ARTICLE_CREATE = "uri.admin.board.article.create";
|
final String ADMIN_SETTINGS = "uri.admin.settings";
|
||||||
// final String ADMIN_ARTICLE_UPDATE = "uri.admin.board.article.update.{{pathVar}}";
|
|
||||||
// final String ADMIN_ARTICLE_DELETE = "uri.admin.board.article.delete";
|
final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group";
|
||||||
// final String ADMIN_ARTICLE_EXCEL = "uri.admin.board.article.excel";
|
final String ADMIN_SETTINGS_ADMIN = "uri.admin.settings.admins";
|
||||||
//
|
final String ADMIN_SETTINGS_ADMIN_CREATE = "uri.admin.settings.admins.create";
|
||||||
// final String ADMIN_SETTINGS = "uri.admin.settings";
|
final String ADMIN_SETTINGS_ADMIN_UPDATE = "uri.admin.settings.admins.update.{{pathVar}}";
|
||||||
//
|
final String ADMIN_SETTINGS_ADMIN_DELETE = "uri.admin.settings.admins.delete";
|
||||||
// final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group";
|
final String ADMIN_SETTINGS_ADMIN_EXCEL = "uri.admin.settings.admins.excel";
|
||||||
// final String ADMIN_SETTINGS_ADMIN = "uri.admin.settings.admins";
|
final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles";
|
||||||
// final String ADMIN_SETTINGS_ADMIN_CREATE = "uri.admin.settings.admins.create";
|
final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege";
|
||||||
// final String ADMIN_SETTINGS_ADMIN_UPDATE = "uri.admin.settings.admins.update.{{pathVar}}";
|
|
||||||
// final String ADMIN_SETTINGS_ADMIN_DELETE = "uri.admin.settings.admins.delete";
|
final String ADMIN_SETTINGS_USER_GROUP = "uri.admin.settings.user.group";
|
||||||
// final String ADMIN_SETTINGS_ADMIN_EXCEL = "uri.admin.settings.admins.excel";
|
final String ADMIN_SETTINGS_USER = "uri.admin.settings.user";
|
||||||
// final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles";
|
final String ADMIN_SETTINGS_USER_UPDATE = "uri.admin.settings.user.update";
|
||||||
// final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege";
|
final String ADMIN_SETTINGS_USER_ROLE = "uri.admin.settings.user.role";
|
||||||
//
|
final String ADMIN_SETTINGS_USER_PRIVILEGE = "uri.admin.settings.user.privilege";
|
||||||
// final String ADMIN_SETTINGS_USER_GROUP = "uri.admin.settings.user.group";
|
|
||||||
// final String ADMIN_SETTINGS_USER = "uri.admin.settings.user";
|
final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin";
|
||||||
// final String ADMIN_SETTINGS_USER_UPDATE = "uri.admin.settings.user.update";
|
final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front";
|
||||||
// final String ADMIN_SETTINGS_USER_ROLE = "uri.admin.settings.user.role";
|
final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode";
|
||||||
// final String ADMIN_SETTINGS_USER_PRIVILEGE = "uri.admin.settings.user.privilege";
|
|
||||||
//
|
final String ADMIN_ANALYSIS = "uri.admin.analysis";
|
||||||
// final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin";
|
final String ADMIN_ANALYSIS_OPERATION_LOG = "uri.admin.analysis.operationLog";
|
||||||
// final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front";
|
final String ADMIN_ANALYSIS_OPERATION_LOG_UPDATE =
|
||||||
// final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode";
|
"uri.admin.analysis.operationLog.{{pathVar}}";
|
||||||
//
|
final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel";
|
||||||
// final String ADMIN_ANALYSIS = "uri.admin.analysis";
|
|
||||||
// final String ADMIN_ANALYSIS_OPERATION_LOG = "uri.admin.analysis.operationLog";
|
final String ADMIN_ADD_ONS = "uri.admin.addons";
|
||||||
// final String ADMIN_ANALYSIS_OPERATION_LOG_UPDATE =
|
final String ADMIN_ADD_ONS_SEND_EMAIL = "uri.admin.addons.email";
|
||||||
// "uri.admin.analysis.operationLog.{{pathVar}}";
|
final String ADMIN_ADD_ONS_SEND_EMAIL_CREATE = "uri.admin.addons.email.create";
|
||||||
// final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel";
|
|
||||||
//
|
// 조사원 메뉴
|
||||||
// final String ADMIN_ADD_ONS = "uri.admin.addons";
|
final String ADMIN_RESEARCHER = "uri.admin.researcher";
|
||||||
// final String ADMIN_ADD_ONS_SEND_EMAIL = "uri.admin.addons.email";
|
|
||||||
// final String ADMIN_ADD_ONS_SEND_EMAIL_CREATE = "uri.admin.addons.email.create";
|
final String ADMIN_RESEARCHER_HOUSEHOLD = "uri.admin.researcher.household";
|
||||||
//
|
final String ADMIN_RESEARCHER_HOUSEHOLD_VIEW = "uri.admin.researcher.household.{{pathVar}}";
|
||||||
// // 최상위 URI 정보
|
final String ADMIN_RESEARCHER_DASHBOARD = "uri.admin.researcher.dashboard";
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
final String ADMIN_RESEARCHER_RESEARCHER = "uri.admin.researcher.researcher";
|
||||||
// null,
|
final String ADMIN_RESEARCHER_RESEARCHER_CREATE = "uri.admin.researcher.researcher.create";
|
||||||
// ADMIN,
|
final String ADMIN_RESEARCHER_RESEARCHER_UPDATE = "uri.admin.researcher.researcher.update.{{pathVar}}";
|
||||||
// "메인",
|
|
||||||
// "/",
|
// 연구원 메뉴
|
||||||
// true,
|
final String ADMIN_ANALYST = "uri.admin.analyst";
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
|
final String ADMIN_ANALYST_DASHBOARD = "uri.admin.analyst.dashboard";
|
||||||
//
|
|
||||||
// // `1` depth URI 정의 - 시작
|
// 커뮤니케이션 메뉴
|
||||||
//
|
final String ADMIN_COMMUNICATION = "uri.admin.communication";
|
||||||
// appendURI(
|
final String ADMIN_COMMUNICATION_NOTICE = "uri.admin.communication.notice";
|
||||||
// AppType.ADMIN,
|
final String ADMIN_COMMUNICATION_NOTICE_CREATE = "uri.admin.communication.notice.create";
|
||||||
// ADMIN,
|
final String ADMIN_COMMUNICATION_NOTICE_UPDATE = "uri.admin.communication.notice.update.{{pathVar}}";
|
||||||
// ADMIN_SETTINGS,
|
final String ADMIN_COMMUNICATION_SMS = "uri.admin.communication.sms";
|
||||||
// "Settings",
|
|
||||||
// "/true",
|
// 임가회원관리 메뉴
|
||||||
// true,
|
final String ADMIN_HOUSEHOLD = "uri.admin.household";
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
final String ADMIN_HOUSEHOLD_HOUSEHOLD = "uri.admin.household.household";
|
||||||
//
|
final String ADMIN_HOUSEHOLD_HOUSEHOLD_CREATE = "uri.admin.household.household.create";
|
||||||
// appendURI(AppType.ADMIN, ADMIN, ADMIN_ANALYSIS, "분석", "/analysis", true,
|
final String ADMIN_HOUSEHOLD_HOUSEHOLD_UPDATE = "uri.admin.household.household.update.{{pathVar}}";
|
||||||
// Set.of("ROLE_SUPER"));
|
|
||||||
//
|
// 최상위 URI 정보
|
||||||
// appendURI(AppType.ADMIN, ADMIN, ADMIN_BOARD, "게시판", "/board", true, Set.of("ROLE_SUPER"));
|
appendURI(
|
||||||
//
|
AppType.ADMIN,
|
||||||
// appendURI(
|
null,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN,
|
"메인",
|
||||||
// ADMIN_ADD_ONS,
|
"/",
|
||||||
// "Add-ons (부가기능)",
|
true,
|
||||||
// "/add-ons",
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
// true,
|
|
||||||
// Set.of("ROLE_SUPER"));
|
// `1` depth URI 정의 - 시작
|
||||||
// // `1` depth URI 정의 - 끝
|
|
||||||
//
|
appendURI(
|
||||||
// appendURI(
|
AppType.ADMIN,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN_SETTINGS,
|
ADMIN_RESEARCHER,
|
||||||
// ADMIN_SETTINGS_ADMIN_GROUP,
|
"조사원",
|
||||||
// "관리자 & 역할",
|
"/researcher",
|
||||||
// "/settings/adminGroup",
|
true,
|
||||||
// true,
|
Set.of("ROLE_ADMIN", "ROLE_RESEARCHER"));
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
|
||||||
//
|
appendURI(
|
||||||
// appendURI(
|
AppType.ADMIN,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN_SETTINGS_ADMIN_GROUP,
|
ADMIN_ANALYST,
|
||||||
// ADMIN_SETTINGS_ADMIN,
|
"연구원",
|
||||||
// "관리자 목록",
|
"/analyst",
|
||||||
// "/settings/admins",
|
true,
|
||||||
// true,
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
|
||||||
//
|
appendURI(
|
||||||
// appendURI(
|
AppType.ADMIN,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN_SETTINGS_ADMIN,
|
ADMIN_COMMUNICATION,
|
||||||
// ADMIN_SETTINGS_ADMIN_CREATE,
|
"커뮤니케이션",
|
||||||
// "관리자 등록",
|
"/communication",
|
||||||
// "/settings/admins/create",
|
true,
|
||||||
// false,
|
Set.of("ROLE_ADMIN"));
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
|
||||||
//
|
appendURI(
|
||||||
// appendURI(
|
AppType.ADMIN,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN_SETTINGS_ADMIN,
|
ADMIN_HOUSEHOLD,
|
||||||
// ADMIN_SETTINGS_ADMIN_UPDATE,
|
"임가회원관리",
|
||||||
// "관리자 수정",
|
"/household",
|
||||||
// "/settings/admins/update/{{pathVar}}",
|
true,
|
||||||
// false,
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
|
||||||
//
|
appendURI(
|
||||||
// appendURI(
|
AppType.ADMIN,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN_SETTINGS_ADMIN,
|
ADMIN_ANALYSIS,
|
||||||
// ADMIN_SETTINGS_ADMIN_DELETE,
|
"분석",
|
||||||
// "관리자 삭제",
|
"/analysis",
|
||||||
// "/settings/admins/delete",
|
true,
|
||||||
// false,
|
Set.of("ROLE_ADMIN"));
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
|
||||||
//
|
appendURI(
|
||||||
// appendURI(
|
AppType.ADMIN,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN_SETTINGS_ADMIN,
|
ADMIN_BOARD,
|
||||||
// ADMIN_SETTINGS_ADMIN_EXCEL,
|
"게시판",
|
||||||
// "관리자 엑셀 다운로드",
|
"/board",
|
||||||
// "/settings/admins/excel",
|
true,
|
||||||
// false,
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
|
||||||
//
|
appendURI(
|
||||||
// appendURI(
|
AppType.ADMIN,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN_SETTINGS_ADMIN_GROUP,
|
ADMIN_ADD_ONS,
|
||||||
// ADMIN_SETTINGS_ADMIN_ROLE,
|
"Add-ons (부가기능)",
|
||||||
// "관리자 역할",
|
"/add-ons",
|
||||||
// "/settings/adminRoles",
|
true,
|
||||||
// true,
|
Set.of("ROLE_ADMIN"));
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
|
||||||
//
|
appendURI(
|
||||||
// appendURI(
|
AppType.ADMIN,
|
||||||
// AppType.ADMIN,
|
ADMIN,
|
||||||
// ADMIN_SETTINGS_ADMIN_GROUP,
|
ADMIN_SETTINGS,
|
||||||
// ADMIN_SETTINGS_ADMIN_PRIVILEGE,
|
"Settings",
|
||||||
// "관리자 권한",
|
"/true",
|
||||||
// "/settings/adminPrivilege",
|
true,
|
||||||
// true,
|
Set.of("ROLE_ADMIN"));
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
// `1` depth URI 정의 - 끝
|
||||||
//
|
|
||||||
// // 사용자 & 역할 - 시작
|
// 조사원 메뉴 시작
|
||||||
// appendURI(
|
appendURI(
|
||||||
// AppType.ADMIN,
|
AppType.ADMIN,
|
||||||
// ADMIN_SETTINGS,
|
ADMIN_RESEARCHER,
|
||||||
// ADMIN_SETTINGS_USER_GROUP,
|
ADMIN_RESEARCHER_HOUSEHOLD,
|
||||||
// "사용자 & 역할",
|
"임가현황조회",
|
||||||
// "/settings/userGroup",
|
"/researcher/households",
|
||||||
// true,
|
true,
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
Set.of("ROLE_ADMIN", "ROLE_RESEARCHER"));
|
||||||
//
|
|
||||||
// appendURI(
|
appendURI(
|
||||||
// AppType.ADMIN,
|
AppType.ADMIN,
|
||||||
// ADMIN_SETTINGS_USER_GROUP,
|
ADMIN_RESEARCHER,
|
||||||
// ADMIN_SETTINGS_USER,
|
ADMIN_RESEARCHER_HOUSEHOLD_VIEW,
|
||||||
// "사용자 목록",
|
"임가현황조회 상세",
|
||||||
// "/settings/users",
|
"/researcher/households/{{pathVar}}",
|
||||||
// true,
|
false,
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
Set.of("ROLE_ADMIN", "ROLE_RESEARCHER"));
|
||||||
//
|
|
||||||
// appendURI(
|
appendURI(
|
||||||
// AppType.ADMIN,
|
AppType.ADMIN,
|
||||||
// ADMIN_SETTINGS_USER,
|
ADMIN_RESEARCHER,
|
||||||
// ADMIN_SETTINGS_USER_UPDATE,
|
ADMIN_RESEARCHER_DASHBOARD,
|
||||||
// "사용자 수정",
|
"대시보드",
|
||||||
// "/settings/users/{{pathVar}}",
|
"/researcher/dashboard",
|
||||||
// false,
|
true,
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
Set.of("ROLE_ADMIN", "ROLE_RESEARCHER"));
|
||||||
//
|
|
||||||
// appendURI(
|
// 연구원 메뉴 시작
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_SETTINGS_USER_GROUP,
|
AppType.ADMIN,
|
||||||
// ADMIN_SETTINGS_USER_ROLE,
|
ADMIN_ANALYST,
|
||||||
// "사용자 역할",
|
ADMIN_ANALYST_DASHBOARD,
|
||||||
// "/settings/userRoles",
|
"대시보드",
|
||||||
// true,
|
"/analyst/dashboard",
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
true,
|
||||||
//
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
// 커뮤니케이션 메뉴 시작
|
||||||
// ADMIN_SETTINGS_USER_GROUP,
|
appendURI(
|
||||||
// ADMIN_SETTINGS_USER_PRIVILEGE,
|
AppType.ADMIN,
|
||||||
// "사용자 권한",
|
ADMIN_COMMUNICATION,
|
||||||
// "/settings/userPrivilege",
|
ADMIN_COMMUNICATION_NOTICE,
|
||||||
// true,
|
"공지사항",
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
"/communication/notices",
|
||||||
// // 사용자 & 역할 - 끝
|
true,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_SETTINGS,
|
AppType.ADMIN,
|
||||||
// ADMIN_SETTINGS_URI_ADMIN,
|
ADMIN_COMMUNICATION,
|
||||||
// "URI 관리 (관리자)",
|
ADMIN_COMMUNICATION_NOTICE_CREATE,
|
||||||
// "/settings/uri/ADMIN",
|
"공지사항 등록",
|
||||||
// true,
|
"/communication/notices/create",
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
false,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_SETTINGS,
|
AppType.ADMIN,
|
||||||
// ADMIN_SETTINGS_URI_FRONT,
|
ADMIN_COMMUNICATION,
|
||||||
// "URI 관리 (FRONT)",
|
ADMIN_COMMUNICATION_NOTICE_UPDATE,
|
||||||
// "/settings/uri/FRONT",
|
"공지사항 수정",
|
||||||
// true,
|
"/communication/notices/update/{{pathVar}}",
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
false,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_SETTINGS,
|
AppType.ADMIN,
|
||||||
// ADMIN_SETTINGS_CODE,
|
ADMIN_COMMUNICATION,
|
||||||
// "UI 코드 (공통코드)",
|
ADMIN_COMMUNICATION_SMS,
|
||||||
// "/settings/uicode",
|
"문자발송",
|
||||||
// true,
|
"/communication/sms",
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
|
true,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// // 예제 게시판 - 시작
|
|
||||||
// //
|
// 임가회원관리 메뉴 시작
|
||||||
// appendURI(
|
appendURI(
|
||||||
// AppType.ADMIN,
|
AppType.ADMIN,
|
||||||
// ADMIN_BOARD,
|
ADMIN_HOUSEHOLD,
|
||||||
// ADMIN_ARTICLE,
|
ADMIN_HOUSEHOLD_HOUSEHOLD,
|
||||||
// "예제 게시판",
|
"임가회원",
|
||||||
// "/board/articles",
|
"/household/households",
|
||||||
// true,
|
true,
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
//
|
|
||||||
// appendURI(
|
appendURI(
|
||||||
// AppType.ADMIN,
|
AppType.ADMIN,
|
||||||
// ADMIN_ARTICLE,
|
ADMIN_HOUSEHOLD,
|
||||||
// ADMIN_ARTICLE_CREATE,
|
ADMIN_HOUSEHOLD_HOUSEHOLD_CREATE,
|
||||||
// "예제 게시판 등록",
|
"임가회원 등록",
|
||||||
// "/board/articles/create",
|
"/household/households/create",
|
||||||
// false,
|
false,
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
//
|
|
||||||
// appendURI(
|
appendURI(
|
||||||
// AppType.ADMIN,
|
AppType.ADMIN,
|
||||||
// ADMIN_ARTICLE,
|
ADMIN_HOUSEHOLD,
|
||||||
// ADMIN_ARTICLE_UPDATE,
|
ADMIN_HOUSEHOLD_HOUSEHOLD_UPDATE,
|
||||||
// "예제 게시판 수정",
|
"임가회원 수정",
|
||||||
// "/board/articles/{{pathVar}}",
|
"/household/households/update/{{pathVar}}",
|
||||||
// false,
|
false,
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
//
|
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
// 관리자 시작
|
||||||
// ADMIN_ARTICLE,
|
appendURI(
|
||||||
// ADMIN_ARTICLE_DELETE,
|
AppType.ADMIN,
|
||||||
// "예제 게시판 삭제",
|
ADMIN_SETTINGS,
|
||||||
// "/board/articles/delete",
|
ADMIN_SETTINGS_ADMIN_GROUP,
|
||||||
// false,
|
"관리자 & 역할",
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
|
"/settings/adminGroup",
|
||||||
//
|
true,
|
||||||
// appendURI(
|
Set.of("ROLE_ADMIN"));
|
||||||
// AppType.ADMIN,
|
|
||||||
// ADMIN_ARTICLE,
|
appendURI(
|
||||||
// ADMIN_ARTICLE_EXCEL,
|
AppType.ADMIN,
|
||||||
// "예제 게시판 엑셀 다운로드",
|
ADMIN_SETTINGS_ADMIN_GROUP,
|
||||||
// "/board/articles/excel",
|
ADMIN_SETTINGS_ADMIN,
|
||||||
// false,
|
"관리자 목록",
|
||||||
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
|
"/settings/admins",
|
||||||
// // 예제 게시판 - 끝
|
true,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_ANALYSIS,
|
AppType.ADMIN,
|
||||||
// ADMIN_ANALYSIS_OPERATION_LOG,
|
ADMIN_SETTINGS_ADMIN,
|
||||||
// "Operation Log (수행로그)",
|
ADMIN_SETTINGS_ADMIN_CREATE,
|
||||||
// "/analysis/operationlog",
|
"관리자 등록",
|
||||||
// true,
|
"/settings/admins/create",
|
||||||
// Set.of("ROLE_SUPER"));
|
false,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_ANALYSIS,
|
AppType.ADMIN,
|
||||||
// ADMIN_ANALYSIS_OPERATION_LOG_UPDATE,
|
ADMIN_SETTINGS_ADMIN,
|
||||||
// "수행로그 상세",
|
ADMIN_SETTINGS_ADMIN_UPDATE,
|
||||||
// "/analysis/operationlog/{{pathVar}}",
|
"관리자 수정",
|
||||||
// false,
|
"/settings/admins/update/{{pathVar}}",
|
||||||
// Set.of("ROLE_SUPER"));
|
false,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_ANALYSIS_OPERATION_LOG,
|
AppType.ADMIN,
|
||||||
// ADMIN_ANALYSIS_OPERATION_LOG_EXCEL,
|
ADMIN_SETTINGS_ADMIN,
|
||||||
// "수행로그 Excel",
|
ADMIN_SETTINGS_ADMIN_DELETE,
|
||||||
// "/analysis/operationlog/excel",
|
"관리자 삭제",
|
||||||
// false,
|
"/settings/admins/delete",
|
||||||
// Set.of("ROLE_SUPER"));
|
false,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_ADD_ONS,
|
AppType.ADMIN,
|
||||||
// ADMIN_ADD_ONS_SEND_EMAIL,
|
ADMIN_SETTINGS_ADMIN,
|
||||||
// "Email 발송",
|
ADMIN_SETTINGS_ADMIN_EXCEL,
|
||||||
// "/addons/email/form",
|
"관리자 엑셀 다운로드",
|
||||||
// true,
|
"/settings/admins/excel",
|
||||||
// Set.of("ROLE_SUPER"));
|
false,
|
||||||
//
|
Set.of("ROLE_ADMIN"));
|
||||||
// appendURI(
|
|
||||||
// AppType.ADMIN,
|
appendURI(
|
||||||
// ADMIN_ADD_ONS_SEND_EMAIL,
|
AppType.ADMIN,
|
||||||
// ADMIN_ADD_ONS_SEND_EMAIL_CREATE,
|
ADMIN_SETTINGS_ADMIN_GROUP,
|
||||||
// "Email 입력폼",
|
ADMIN_SETTINGS_ADMIN_ROLE,
|
||||||
// "/addons/email/form",
|
"관리자 역할",
|
||||||
// false,
|
"/settings/adminRoles",
|
||||||
// Set.of("ROLE_SUPER"));
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS_ADMIN_GROUP,
|
||||||
|
ADMIN_SETTINGS_ADMIN_PRIVILEGE,
|
||||||
|
"관리자 권한",
|
||||||
|
"/settings/adminPrivilege",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
// 사용자 & 역할 - 시작
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS,
|
||||||
|
ADMIN_SETTINGS_USER_GROUP,
|
||||||
|
"사용자 & 역할",
|
||||||
|
"/settings/userGroup",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS_USER_GROUP,
|
||||||
|
ADMIN_SETTINGS_USER,
|
||||||
|
"사용자 목록",
|
||||||
|
"/settings/users",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS_USER,
|
||||||
|
ADMIN_SETTINGS_USER_UPDATE,
|
||||||
|
"사용자 수정",
|
||||||
|
"/settings/users/{{pathVar}}",
|
||||||
|
false,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS_USER_GROUP,
|
||||||
|
ADMIN_SETTINGS_USER_ROLE,
|
||||||
|
"사용자 역할",
|
||||||
|
"/settings/userRoles",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS_USER_GROUP,
|
||||||
|
ADMIN_SETTINGS_USER_PRIVILEGE,
|
||||||
|
"사용자 권한",
|
||||||
|
"/settings/userPrivilege",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
// 사용자 & 역할 - 끝
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS,
|
||||||
|
ADMIN_SETTINGS_URI_ADMIN,
|
||||||
|
"URI 관리 (관리자)",
|
||||||
|
"/settings/uri/ADMIN",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS,
|
||||||
|
ADMIN_SETTINGS_URI_FRONT,
|
||||||
|
"URI 관리 (FRONT)",
|
||||||
|
"/settings/uri/FRONT",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_SETTINGS,
|
||||||
|
ADMIN_SETTINGS_CODE,
|
||||||
|
"UI 코드 (공통코드)",
|
||||||
|
"/settings/uicode",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
// 예제 게시판 - 시작
|
||||||
|
//
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_BOARD,
|
||||||
|
ADMIN_ARTICLE,
|
||||||
|
"예제 게시판",
|
||||||
|
"/board/articles",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ARTICLE,
|
||||||
|
ADMIN_ARTICLE_CREATE,
|
||||||
|
"예제 게시판 등록",
|
||||||
|
"/board/articles/create",
|
||||||
|
false,
|
||||||
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ARTICLE,
|
||||||
|
ADMIN_ARTICLE_UPDATE,
|
||||||
|
"예제 게시판 수정",
|
||||||
|
"/board/articles/{{pathVar}}",
|
||||||
|
false,
|
||||||
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ARTICLE,
|
||||||
|
ADMIN_ARTICLE_DELETE,
|
||||||
|
"예제 게시판 삭제",
|
||||||
|
"/board/articles/delete",
|
||||||
|
false,
|
||||||
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ARTICLE,
|
||||||
|
ADMIN_ARTICLE_EXCEL,
|
||||||
|
"예제 게시판 엑셀 다운로드",
|
||||||
|
"/board/articles/excel",
|
||||||
|
false,
|
||||||
|
Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER"));
|
||||||
|
// 예제 게시판 - 끝
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ANALYSIS,
|
||||||
|
ADMIN_ANALYSIS_OPERATION_LOG,
|
||||||
|
"Operation Log (수행로그)",
|
||||||
|
"/analysis/operationlog",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ANALYSIS,
|
||||||
|
ADMIN_ANALYSIS_OPERATION_LOG_UPDATE,
|
||||||
|
"수행로그 상세",
|
||||||
|
"/analysis/operationlog/{{pathVar}}",
|
||||||
|
false,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ANALYSIS_OPERATION_LOG,
|
||||||
|
ADMIN_ANALYSIS_OPERATION_LOG_EXCEL,
|
||||||
|
"수행로그 Excel",
|
||||||
|
"/analysis/operationlog/excel",
|
||||||
|
false,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ADD_ONS,
|
||||||
|
ADMIN_ADD_ONS_SEND_EMAIL,
|
||||||
|
"Email 발송",
|
||||||
|
"/addons/email/form",
|
||||||
|
true,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
|
|
||||||
|
appendURI(
|
||||||
|
AppType.ADMIN,
|
||||||
|
ADMIN_ADD_ONS_SEND_EMAIL,
|
||||||
|
ADMIN_ADD_ONS_SEND_EMAIL_CREATE,
|
||||||
|
"Email 입력폼",
|
||||||
|
"/addons/email/form",
|
||||||
|
false,
|
||||||
|
Set.of("ROLE_ADMIN"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void appendURI(
|
private void appendURI(
|
||||||
|
|||||||
@@ -22,12 +22,10 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Order(3)
|
@Order(4)
|
||||||
public class InitUriFrontData implements ApplicationRunner {
|
public class InitUriFrontData implements ApplicationRunner {
|
||||||
|
|
||||||
private final GetUrisPortIn getUrisPortIn;
|
|
||||||
private final URISavePortIn uriSavePortIn;
|
private final URISavePortIn uriSavePortIn;
|
||||||
private final RemoveAllFrontURIMapper removeAllFrontURIMapper;
|
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -39,154 +37,149 @@ public class InitUriFrontData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// List<URIElement> uris = getUrisPortIn.connect(AppType.FRONT);
|
final String FRONT_ROOT_ID = "uri.front";
|
||||||
// removeAllFrontURIMapper.deleteAllByFrontUriIds(
|
|
||||||
// uris.stream().map(URIElement::getId).collect(Collectors.toList()));
|
uriSavePortIn.connect(
|
||||||
// removeAllFrontURIMapper.deleteAllByAppType(AppType.FRONT);
|
new URISaveCommand(
|
||||||
//
|
FRONT_ROOT_ID,
|
||||||
// final String FRONT_ROOT_ID = "uri.front";
|
null,
|
||||||
//
|
AppType.FRONT,
|
||||||
// uriSavePortIn.connect(
|
"/",
|
||||||
// new URISaveCommand(
|
true,
|
||||||
// FRONT_ROOT_ID,
|
"프론트",
|
||||||
// null,
|
null,
|
||||||
// AppType.FRONT,
|
"프론트 홈",
|
||||||
// "/",
|
"프론트 메인",
|
||||||
// true,
|
"front",
|
||||||
// "프론트",
|
null,
|
||||||
// null,
|
null),
|
||||||
// "프론트 홈",
|
null,
|
||||||
// "프론트 메인",
|
false);
|
||||||
// "front",
|
|
||||||
// null,
|
// 로그인
|
||||||
// null),
|
uriSavePortIn.connect(
|
||||||
// null,
|
new URISaveCommand(
|
||||||
// false);
|
FRONT_ROOT_ID + ".login",
|
||||||
//
|
FRONT_ROOT_ID,
|
||||||
// // 로그인
|
AppType.FRONT,
|
||||||
// uriSavePortIn.connect(
|
"/login",
|
||||||
// new URISaveCommand(
|
false,
|
||||||
// FRONT_ROOT_ID + ".login",
|
"로그인",
|
||||||
// FRONT_ROOT_ID,
|
null,
|
||||||
// AppType.FRONT,
|
"로그인",
|
||||||
// "/login",
|
"로그인 페이지",
|
||||||
// false,
|
"front",
|
||||||
// "로그인",
|
null,
|
||||||
// null,
|
null),
|
||||||
// "로그인",
|
null,
|
||||||
// "로그인 페이지",
|
false);
|
||||||
// "front",
|
|
||||||
// null,
|
// 회원가입
|
||||||
// null),
|
uriSavePortIn.connect(
|
||||||
// null,
|
new URISaveCommand(
|
||||||
// false);
|
FRONT_ROOT_ID + ".user.register",
|
||||||
//
|
FRONT_ROOT_ID,
|
||||||
// // 회원가입
|
AppType.FRONT,
|
||||||
// uriSavePortIn.connect(
|
"/user/register",
|
||||||
// new URISaveCommand(
|
false,
|
||||||
// FRONT_ROOT_ID + ".user.register",
|
"회원가입",
|
||||||
// FRONT_ROOT_ID,
|
null,
|
||||||
// AppType.FRONT,
|
"회원가입",
|
||||||
// "/user/register",
|
"회원가입 페이지",
|
||||||
// false,
|
"회원가입",
|
||||||
// "회원가입",
|
null,
|
||||||
// null,
|
null),
|
||||||
// "회원가입",
|
null,
|
||||||
// "회원가입 페이지",
|
false);
|
||||||
// "회원가입",
|
|
||||||
// null,
|
// 정보수정
|
||||||
// null),
|
uriSavePortIn.connect(
|
||||||
// null,
|
new URISaveCommand(
|
||||||
// false);
|
FRONT_ROOT_ID + ".user.info",
|
||||||
//
|
FRONT_ROOT_ID,
|
||||||
// // 정보수정
|
AppType.FRONT,
|
||||||
// uriSavePortIn.connect(
|
"/user/info",
|
||||||
// new URISaveCommand(
|
false,
|
||||||
// FRONT_ROOT_ID + ".user.info",
|
"정보수정",
|
||||||
// FRONT_ROOT_ID,
|
null,
|
||||||
// AppType.FRONT,
|
"정보수정",
|
||||||
// "/user/info",
|
"정보수정 페이지",
|
||||||
// false,
|
"정보수정",
|
||||||
// "정보수정",
|
null,
|
||||||
// null,
|
Set.of("ROLE_GENERAL")),
|
||||||
// "정보수정",
|
null,
|
||||||
// "정보수정 페이지",
|
false);
|
||||||
// "정보수정",
|
|
||||||
// null,
|
// 예제게시판
|
||||||
// Set.of("ROLE_GENERAL")),
|
uriSavePortIn.connect(
|
||||||
// null,
|
new URISaveCommand(
|
||||||
// false);
|
FRONT_ROOT_ID + ".board.articles",
|
||||||
//
|
FRONT_ROOT_ID,
|
||||||
// // 예제게시판
|
AppType.FRONT,
|
||||||
// uriSavePortIn.connect(
|
"/board/articles",
|
||||||
// new URISaveCommand(
|
true,
|
||||||
// FRONT_ROOT_ID + ".board.articles",
|
"예제게시판",
|
||||||
// FRONT_ROOT_ID,
|
null,
|
||||||
// AppType.FRONT,
|
"예제게시판",
|
||||||
// "/board/articles",
|
"예제게시판 페이지",
|
||||||
// true,
|
"예제게시판",
|
||||||
// "예제게시판",
|
null,
|
||||||
// null,
|
Set.of("ROLE_GENERAL")),
|
||||||
// "예제게시판",
|
null,
|
||||||
// "예제게시판 페이지",
|
false);
|
||||||
// "예제게시판",
|
|
||||||
// null,
|
// 예제 게시판 등록
|
||||||
// Set.of("ROLE_GENERAL")),
|
uriSavePortIn.connect(
|
||||||
// null,
|
new URISaveCommand(
|
||||||
// false);
|
FRONT_ROOT_ID + ".board.article.create",
|
||||||
//
|
FRONT_ROOT_ID,
|
||||||
// // 예제 게시판 등록
|
AppType.FRONT,
|
||||||
// uriSavePortIn.connect(
|
"/board/articles/create",
|
||||||
// new URISaveCommand(
|
false,
|
||||||
// FRONT_ROOT_ID + ".board.article.create",
|
"예제 게시판 등록",
|
||||||
// FRONT_ROOT_ID,
|
null,
|
||||||
// AppType.FRONT,
|
"예제 게시판 등록",
|
||||||
// "/board/articles/create",
|
"예제 게시판 등록 페이지",
|
||||||
// false,
|
"예제 게시판 등록",
|
||||||
// "예제 게시판 등록",
|
null,
|
||||||
// null,
|
Set.of("ROLE_GENERAL")),
|
||||||
// "예제 게시판 등록",
|
null,
|
||||||
// "예제 게시판 등록 페이지",
|
false);
|
||||||
// "예제 게시판 등록",
|
|
||||||
// null,
|
// 예제 게시판 상세
|
||||||
// Set.of("ROLE_GENERAL")),
|
uriSavePortIn.connect(
|
||||||
// null,
|
new URISaveCommand(
|
||||||
// false);
|
FRONT_ROOT_ID + ".board.article.{{pathVar}}",
|
||||||
//
|
FRONT_ROOT_ID,
|
||||||
// // 예제 게시판 상세
|
AppType.FRONT,
|
||||||
// uriSavePortIn.connect(
|
"/board/articles/{{pathVar}}",
|
||||||
// new URISaveCommand(
|
false,
|
||||||
// FRONT_ROOT_ID + ".board.article.{{pathVar}}",
|
"예제 게시판 상세",
|
||||||
// FRONT_ROOT_ID,
|
null,
|
||||||
// AppType.FRONT,
|
"예제 게시판 상세",
|
||||||
// "/board/articles/{{pathVar}}",
|
"예제 게시판 상세 페이지",
|
||||||
// false,
|
"예제 게시판 상세",
|
||||||
// "예제 게시판 상세",
|
null,
|
||||||
// null,
|
Set.of("ROLE_GENERAL")),
|
||||||
// "예제 게시판 상세",
|
null,
|
||||||
// "예제 게시판 상세 페이지",
|
false);
|
||||||
// "예제 게시판 상세",
|
|
||||||
// null,
|
// 예제 게시판 수정
|
||||||
// Set.of("ROLE_GENERAL")),
|
uriSavePortIn.connect(
|
||||||
// null,
|
new URISaveCommand(
|
||||||
// false);
|
FRONT_ROOT_ID + ".board.article.update.{{pathVar}}",
|
||||||
//
|
FRONT_ROOT_ID,
|
||||||
// // 예제 게시판 수정
|
AppType.FRONT,
|
||||||
// uriSavePortIn.connect(
|
"/board/articles/update/{{pathVar}}",
|
||||||
// new URISaveCommand(
|
false,
|
||||||
// FRONT_ROOT_ID + ".board.article.update.{{pathVar}}",
|
"예제 게시판 수정",
|
||||||
// FRONT_ROOT_ID,
|
null,
|
||||||
// AppType.FRONT,
|
"예제 게시판 수정",
|
||||||
// "/board/articles/update/{{pathVar}}",
|
"예제 게시판 수정 페이지",
|
||||||
// false,
|
"예제 게시판 수정",
|
||||||
// "예제 게시판 수정",
|
null,
|
||||||
// null,
|
Set.of("ROLE_GENERAL")),
|
||||||
// "예제 게시판 수정",
|
null,
|
||||||
// "예제 게시판 수정 페이지",
|
false);
|
||||||
// "예제 게시판 수정",
|
|
||||||
// null,
|
|
||||||
// Set.of("ROLE_GENERAL")),
|
|
||||||
// null,
|
|
||||||
// false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Order(1)
|
@Order(2)
|
||||||
public class InitUserPrivilegeData implements ApplicationRunner {
|
public class InitUserPrivilegeData implements ApplicationRunner {
|
||||||
|
|
||||||
private final SaveUserPrivilegePortIn saveUserPrivilegePortIn;
|
private final SaveUserPrivilegePortIn saveUserPrivilegePortIn;
|
||||||
@@ -25,8 +25,8 @@ public class InitUserPrivilegeData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// saveUserPrivilegePortIn.operate(new SaveUserPrivilegeCmd("FRONT_API", "Front API 사용권한", 0));
|
saveUserPrivilegePortIn.operate(new SaveUserPrivilegeCmd("FRONT_API", "Front API 사용권한", 0));
|
||||||
// saveUserPrivilegePortIn.operate(
|
saveUserPrivilegePortIn.operate(
|
||||||
// new SaveUserPrivilegeCmd("FRONT_ACCESS", "Front 사이트 접근 권한", 1));
|
new SaveUserPrivilegeCmd("FRONT_ACCESS", "Front 사이트 접근 권한", 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Order(2)
|
@Order(3)
|
||||||
public class InitUserRoleData implements ApplicationRunner {
|
public class InitUserRoleData implements ApplicationRunner {
|
||||||
|
|
||||||
private final SaveUserRolePortIn saveUserRolePortIn;
|
private final SaveUserRolePortIn saveUserRolePortIn;
|
||||||
@@ -26,7 +26,7 @@ public class InitUserRoleData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// saveUserRolePortIn.operate(
|
saveUserRolePortIn.operate(
|
||||||
// new SaveUserRoleCmd("ROLE_GENERAL", "일반 사용자", 0, List.of("FRONT_API", "FRONT_ACCESS")));
|
new SaveUserRoleCmd("ROLE_GENERAL", "일반 사용자", 0, List.of("FRONT_API", "FRONT_ACCESS")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package app.module.core.config.adapters.persistence.initData;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleMapper;
|
||||||
|
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllMapper;
|
||||||
|
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn;
|
||||||
|
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.stream.IntStream;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.ApplicationArguments;
|
||||||
|
import org.springframework.boot.ApplicationRunner;
|
||||||
|
import org.springframework.core.annotation.Order;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Order(1)
|
||||||
|
public class RemoveInitData implements ApplicationRunner {
|
||||||
|
|
||||||
|
private final RemoveAllMapper mapper;
|
||||||
|
|
||||||
|
@Value("${app.initData.core}")
|
||||||
|
private boolean isCoreDataRequired;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run(ApplicationArguments args) throws Exception {
|
||||||
|
if (!isCoreDataRequired) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
mapper.deleteAllAdminHasRole();
|
||||||
|
mapper.deleteAllAdmin();
|
||||||
|
|
||||||
|
mapper.deleteAllHouseholdHasRole();
|
||||||
|
mapper.deleteAllHousehold();
|
||||||
|
|
||||||
|
mapper.deleteAllRoleHasPrivilege();
|
||||||
|
mapper.deleteAllPrivilege();
|
||||||
|
|
||||||
|
mapper.deleteAllUriHasRole();
|
||||||
|
mapper.deleteAllUri();
|
||||||
|
|
||||||
|
mapper.deleteAllFrontUserHasRole();
|
||||||
|
mapper.deleteAllFrontUser();
|
||||||
|
|
||||||
|
mapper.deleteAllRole();
|
||||||
|
|
||||||
|
mapper.deleteAllUicode();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package app.module.core.config.adapters.persistence.initData.helper;
|
||||||
|
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface RemoveAllMapper {
|
||||||
|
void deleteAllAdminHasRole();
|
||||||
|
void deleteAllAdmin();
|
||||||
|
|
||||||
|
void deleteAllRoleHasPrivilege();
|
||||||
|
void deleteAllPrivilege();
|
||||||
|
|
||||||
|
void deleteAllUriHasRole();
|
||||||
|
void deleteAllUri();
|
||||||
|
|
||||||
|
void deleteAllFrontUserHasRole();
|
||||||
|
void deleteAllFrontUser();
|
||||||
|
|
||||||
|
void deleteAllHouseholdHasRole();
|
||||||
|
void deleteAllHousehold();
|
||||||
|
|
||||||
|
void deleteAllRole();
|
||||||
|
|
||||||
|
void deleteAllUicode();
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package app.module.core.config.application.util;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
|
|
||||||
|
public class AuditUtil {
|
||||||
|
private AuditUtil() {}
|
||||||
|
|
||||||
|
public static <T extends AuditCommand> T create(T cmd) {
|
||||||
|
cmd.create();
|
||||||
|
return cmd;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T extends AuditCommand> T update(T cmd) {
|
||||||
|
cmd.update();
|
||||||
|
return cmd;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T extends AuditCommand> T delete(T cmd) {
|
||||||
|
cmd.delete();
|
||||||
|
return cmd;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,7 +32,7 @@ class GetAdminsDao implements GetAdminsPortOut {
|
|||||||
|
|
||||||
// 관리자의 역할 목록 조회
|
// 관리자의 역할 목록 조회
|
||||||
List<GetAdminsRole> roles = getAdminsMapper.findRolesWithPrivilegesByAdminIds(
|
List<GetAdminsRole> roles = getAdminsMapper.findRolesWithPrivilegesByAdminIds(
|
||||||
admins.stream().map(GetAdminsDto::getId).toList());
|
admins.stream().map(GetAdminsDto::getSeq).toList());
|
||||||
|
|
||||||
return new PageImpl<>(
|
return new PageImpl<>(
|
||||||
admins.stream()
|
admins.stream()
|
||||||
@@ -47,7 +47,7 @@ class GetAdminsDao implements GetAdminsPortOut {
|
|||||||
admin.getAccountLocked(),
|
admin.getAccountLocked(),
|
||||||
admin.getTotal(),
|
admin.getTotal(),
|
||||||
roles.stream()
|
roles.stream()
|
||||||
.filter(r -> r.getAdminId().equals(admin.getId()))
|
.filter(r -> r.getAdminSeq().equals(admin.getSeq()))
|
||||||
.collect(Collectors.toList())
|
.collect(Collectors.toList())
|
||||||
)).toList(),
|
)).toList(),
|
||||||
pageable,
|
pageable,
|
||||||
|
|||||||
@@ -12,5 +12,5 @@ import org.springframework.data.domain.Pageable;
|
|||||||
@Mapper
|
@Mapper
|
||||||
public interface GetAdminsMapper {
|
public interface GetAdminsMapper {
|
||||||
List<GetAdminsDto> findAll(@Param("cmd") GetAdminsCmd cmd, @Param("pageable") Pageable pageable);
|
List<GetAdminsDto> findAll(@Param("cmd") GetAdminsCmd cmd, @Param("pageable") Pageable pageable);
|
||||||
List<GetAdminsRole> findRolesWithPrivilegesByAdminIds(@Param("ids") List<String> ids);
|
List<GetAdminsRole> findRolesWithPrivilegesByAdminIds(@Param("seqs") List<Long> seqs);
|
||||||
}
|
}
|
||||||
@@ -7,6 +7,7 @@ import lombok.Setter;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
public class GetAdminsDto {
|
public class GetAdminsDto {
|
||||||
|
private Long seq;
|
||||||
private String id;
|
private String id;
|
||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import lombok.Setter;
|
|||||||
public class GetAdminsRole implements Serializable {
|
public class GetAdminsRole implements Serializable {
|
||||||
private Integer adminHasRoleId;
|
private Integer adminHasRoleId;
|
||||||
private String id;
|
private String id;
|
||||||
private String adminId;
|
private Long adminSeq;
|
||||||
private String description;
|
private String description;
|
||||||
private Integer orderNo;
|
private Integer orderNo;
|
||||||
private List<GetAdminsPrivilege> privileges;
|
private List<GetAdminsPrivilege> privileges;
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package app.module.core.usecase.admin.saveAdmin.adapters.persistence;
|
package app.module.core.usecase.admin.saveAdmin.adapters.persistence;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Admin;
|
import app.module.core.config.adapters.persistence.entity.Admin;
|
||||||
|
import app.module.core.config.application.annotation.CreateCommand;
|
||||||
|
import app.module.core.config.application.util.AuditUtil;
|
||||||
import app.module.core.config.application.util.CommonUtil;
|
import app.module.core.config.application.util.CommonUtil;
|
||||||
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut;
|
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut;
|
||||||
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.DeleteAdminHasRoleParam;
|
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.DeleteAdminHasRoleParam;
|
||||||
@@ -22,50 +24,29 @@ class SaveAdminDao implements SaveAdminPortOut {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
|
@CreateCommand
|
||||||
public String connect(SaveAdminCmd cmd) {
|
public String connect(SaveAdminCmd cmd) {
|
||||||
String userId = CommonUtil.getLoginUsername();
|
|
||||||
LocalDateTime now = LocalDateTime.now();
|
|
||||||
|
|
||||||
Admin admin = new Admin(
|
if (viewMapper.findById(cmd.getId()).isPresent()) {
|
||||||
cmd.getId(),
|
// update
|
||||||
cmd.getEncodedPassword(),
|
mapper.updateAdmin(cmd);
|
||||||
cmd.getEmail(),
|
mapper.deleteAdminRolesByAdminId(
|
||||||
cmd.getPasswordUpdatedAt(),
|
AuditUtil.delete(new DeleteAdminHasRoleParam(cmd.getSeq())));
|
||||||
cmd.getAccountDisabled(),
|
|
||||||
cmd.getLoginFailCnt(),
|
|
||||||
cmd.getAccountLocked()
|
|
||||||
);
|
|
||||||
|
|
||||||
|
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
||||||
if (viewMapper.findAdminUserById(cmd.getId()).isPresent()) {
|
mapper.insertAdminHasRoles(
|
||||||
updateAdmin(admin, cmd, userId, now);
|
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds())));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
insertAdmin(admin, cmd, userId, now);
|
// create
|
||||||
|
mapper.insertAdmin(cmd);
|
||||||
|
|
||||||
|
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
||||||
|
mapper.insertAdminHasRoles(
|
||||||
|
AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds())));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return cmd.getId();
|
return cmd.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateAdmin(Admin admin, SaveAdminCmd cmd, String userId, LocalDateTime now) {
|
|
||||||
mapper.updateAdmin(admin);
|
|
||||||
mapper.deleteAdminRolesByAdminId(new DeleteAdminHasRoleParam(
|
|
||||||
cmd.getId(), now, userId, now, userId
|
|
||||||
));
|
|
||||||
|
|
||||||
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
|
||||||
mapper.insertAdminHasRoles(new SaveAdminHasRoleParam(
|
|
||||||
cmd.getId(), cmd.getRoleIds(), now, userId, now, userId
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void insertAdmin(Admin admin, SaveAdminCmd cmd, String userId, LocalDateTime now) {
|
|
||||||
mapper.insertAdmin(admin);
|
|
||||||
|
|
||||||
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
|
||||||
mapper.insertAdminHasRoles(new SaveAdminHasRoleParam(
|
|
||||||
cmd.getId(), cmd.getRoleIds(), now, userId, now, userId
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
package app.module.core.usecase.admin.saveAdmin.adapters.persistence;
|
package app.module.core.usecase.admin.saveAdmin.adapters.persistence;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Admin;
|
|
||||||
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.DeleteAdminHasRoleParam;
|
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.DeleteAdminHasRoleParam;
|
||||||
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.SaveAdminHasRoleParam;
|
import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.SaveAdminHasRoleParam;
|
||||||
|
import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface SaveAdminMapper {
|
public interface SaveAdminMapper {
|
||||||
void insertAdmin(Admin admin);
|
void insertAdmin(SaveAdminCmd cmd);
|
||||||
void updateAdmin(Admin admin);
|
void updateAdmin(SaveAdminCmd cmd);
|
||||||
void insertAdminHasRoles(SaveAdminHasRoleParam param);
|
void insertAdminHasRoles(SaveAdminHasRoleParam param);
|
||||||
void deleteAdminRolesByAdminId(DeleteAdminHasRoleParam param);
|
void deleteAdminRolesByAdminId(DeleteAdminHasRoleParam param);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model;
|
package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -8,10 +9,6 @@ import lombok.Setter;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class DeleteAdminHasRoleParam {
|
public class DeleteAdminHasRoleParam extends AuditCommand {
|
||||||
private String adminId;
|
private Long adminSeq;
|
||||||
private LocalDateTime updatedAt;
|
|
||||||
private String updatedBy;
|
|
||||||
private LocalDateTime deletedAt;
|
|
||||||
private String deletedBy;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model;
|
package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
@@ -9,11 +10,7 @@ import lombok.Setter;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class SaveAdminHasRoleParam {
|
public class SaveAdminHasRoleParam extends AuditCommand {
|
||||||
private String adminId;
|
private Long adminSeq;
|
||||||
private List<String> roleIds;
|
private List<String> roleIds;
|
||||||
private LocalDateTime createdAt;
|
|
||||||
private String createdBy;
|
|
||||||
private LocalDateTime updatedAt;
|
|
||||||
private String updatedBy;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ import java.util.List;
|
|||||||
|
|
||||||
public interface SaveAdminPortIn {
|
public interface SaveAdminPortIn {
|
||||||
|
|
||||||
String connect(String id,
|
String connect(
|
||||||
|
Long seq,
|
||||||
|
String id,
|
||||||
String password,
|
String password,
|
||||||
String email,
|
String email,
|
||||||
Boolean accountDisabled,
|
Boolean accountDisabled,
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public class SaveAdminService implements SaveAdminPortIn {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String connect(
|
public String connect(
|
||||||
|
Long seq,
|
||||||
String id,
|
String id,
|
||||||
String password,
|
String password,
|
||||||
String email,
|
String email,
|
||||||
@@ -52,6 +53,7 @@ public class SaveAdminService implements SaveAdminPortIn {
|
|||||||
|
|
||||||
return saveAdminPortOut.connect(
|
return saveAdminPortOut.connect(
|
||||||
new SaveAdminCmd(
|
new SaveAdminCmd(
|
||||||
|
seq,
|
||||||
id,
|
id,
|
||||||
password,
|
password,
|
||||||
passwordUpdatedAt,
|
passwordUpdatedAt,
|
||||||
|
|||||||
@@ -1,13 +1,17 @@
|
|||||||
package app.module.core.usecase.admin.saveAdmin.ports.application.domain;
|
package app.module.core.usecase.admin.saveAdmin.ports.application.domain;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class SaveAdminCmd {
|
public class SaveAdminCmd extends AuditCommand {
|
||||||
|
private Long seq;
|
||||||
private String id;
|
private String id;
|
||||||
private String encodedPassword;
|
private String encodedPassword;
|
||||||
private LocalDateTime passwordUpdatedAt;
|
private LocalDateTime passwordUpdatedAt;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import app.module.core.usecase.admin.view.ports.AdminViewPortOut;
|
|||||||
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.apache.commons.collections4.ListUtils;
|
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@@ -12,26 +11,14 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
class AdminViewDao implements AdminViewPortOut {
|
class AdminViewDao implements AdminViewPortOut {
|
||||||
|
|
||||||
private final AdminViewMapper adminViewMapper;
|
private final AdminViewMapper mapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public Optional<AdminView> connect(String id) {
|
public Optional<AdminView> connect(String id) {
|
||||||
return adminViewMapper.findAdminUserById(id)
|
return mapper.findById(id).map(admin -> {
|
||||||
.map(admin -> new AdminView(
|
admin.setRoles(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq()));
|
||||||
admin.getId(),
|
return admin;
|
||||||
admin.getPassword(),
|
});
|
||||||
admin.getEmail(),
|
|
||||||
admin.getPasswordUpdatedAt(),
|
|
||||||
admin.getAccountDisabled(),
|
|
||||||
admin.getLoginFailCnt(),
|
|
||||||
admin.getAccountLocked(),
|
|
||||||
ListUtils.emptyIfNull(
|
|
||||||
adminViewMapper.findRolesWithPrivilegesByAdminId(id)),
|
|
||||||
admin.getCreatedAt(),
|
|
||||||
admin.getCreatedBy(),
|
|
||||||
admin.getUpdatedAt(),
|
|
||||||
admin.getUpdatedBy()
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
package app.module.core.usecase.admin.view.adapters.persistence;
|
package app.module.core.usecase.admin.view.adapters.persistence;
|
||||||
|
|
||||||
import app.module.core.config.adapters.web.security.domain.CoreRole;
|
import app.module.core.config.adapters.web.security.domain.CoreRole;
|
||||||
import app.module.core.usecase.admin.view.adapters.persistence.model.AdminViewDto;
|
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface AdminViewMapper {
|
public interface AdminViewMapper {
|
||||||
Optional<AdminViewDto> findAdminUserById(String id);
|
Optional<AdminView> findById(String id);
|
||||||
List<CoreRole> findRolesWithPrivilegesByAdminId(String adminId);
|
List<CoreRole> findRoleHasPrivilegesByAdminId(Long id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,16 +12,20 @@ import lombok.NoArgsConstructor;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
public class AdminView implements Serializable {
|
public class AdminView implements Serializable {
|
||||||
|
private Long seq;
|
||||||
private String id;
|
private String id;
|
||||||
private String password;
|
private String password;
|
||||||
private String email;
|
private String email;
|
||||||
|
private String name;
|
||||||
|
private String contact;
|
||||||
|
private Integer inspectionAreaCode;
|
||||||
private LocalDateTime passwordUpdatedAt;
|
private LocalDateTime passwordUpdatedAt;
|
||||||
private Boolean accountDisabled;
|
private Boolean accountDisabled;
|
||||||
private Integer loginFailCnt;
|
private Integer loginFailCnt;
|
||||||
private Boolean accountLocked;
|
private Boolean accountLocked;
|
||||||
private List<CoreRole> roles;
|
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
|
private List<CoreRole> roles;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
package app.module.core.usecase.adminResearch.getAdmin.adapters.persistence;
|
|
||||||
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortOut;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
|
|
||||||
import java.util.Optional;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.stereotype.Repository;
|
|
||||||
|
|
||||||
@Repository
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
class GetAdminDao implements GetAdminPortOut {
|
|
||||||
|
|
||||||
private final GetAdminMapper mapper;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<GetAdmin> operate(GetAdminCmd cmd) {
|
|
||||||
return mapper.findById(cmd).map(admin -> {
|
|
||||||
admin.setRoles(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq()));
|
|
||||||
return admin;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package app.module.core.usecase.adminResearch.getAdmin.adapters.persistence;
|
|
||||||
|
|
||||||
import app.module.core.config.adapters.web.security.domain.CoreRole;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
|
||||||
|
|
||||||
@Mapper
|
|
||||||
public interface GetAdminMapper {
|
|
||||||
Optional<GetAdmin> findById(GetAdminCmd cmd);
|
|
||||||
List<CoreRole> findRoleHasPrivilegesByAdminId(Long id);
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package app.module.core.usecase.adminResearch.getAdmin.ports;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
|
|
||||||
|
|
||||||
public interface GetAdminPortIn {
|
|
||||||
Optional<GetAdmin> operate(GetAdminCmd cmd);
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package app.module.core.usecase.adminResearch.getAdmin.ports;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
|
|
||||||
|
|
||||||
public interface GetAdminPortOut {
|
|
||||||
Optional<GetAdmin> operate(GetAdminCmd cmd);
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package app.module.core.usecase.adminResearch.getAdmin.ports.application;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortIn;
|
|
||||||
import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortOut;
|
|
||||||
import java.util.Optional;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
class GetAdminService implements GetAdminPortIn {
|
|
||||||
private final GetAdminPortOut portOut;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<GetAdmin> operate(GetAdminCmd cmd) {
|
|
||||||
return portOut.operate(cmd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package app.module.core.usecase.adminResearch.getAdmin.ports.application.domain;
|
|
||||||
|
|
||||||
import app.module.core.config.adapters.web.security.domain.CoreRole;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.List;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.EqualsAndHashCode;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.Setter;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
@NoArgsConstructor
|
|
||||||
@EqualsAndHashCode
|
|
||||||
public class GetAdmin {
|
|
||||||
private Long seq;
|
|
||||||
private String id;
|
|
||||||
private String password;
|
|
||||||
private String name;
|
|
||||||
private String contact;
|
|
||||||
private Integer inspectionAreaCode;
|
|
||||||
private LocalDateTime passwordUpdatedAt;
|
|
||||||
private Boolean accountDisabled;
|
|
||||||
private Integer loginFailCnt;
|
|
||||||
private Boolean accountLocked;
|
|
||||||
private LocalDateTime createdAt;
|
|
||||||
private String createdBy;
|
|
||||||
private LocalDateTime updatedAt;
|
|
||||||
private String updatedBy;
|
|
||||||
private List<CoreRole> roles;
|
|
||||||
}
|
|
||||||
@@ -1,20 +1,15 @@
|
|||||||
package app.module.core.usecase.article.createArticle.adapters.persistence;
|
package app.module.core.usecase.article.createArticle.adapters.persistence;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Article;
|
|
||||||
import app.module.core.config.adapters.persistence.entity.UploadFile;
|
|
||||||
import app.module.core.config.application.util.CommonUtil;
|
|
||||||
import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleDto;
|
import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleDto;
|
||||||
import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleHasUploadFilesParam;
|
import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleHasUploadFilesParam;
|
||||||
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortOut;
|
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortOut;
|
||||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle;
|
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle;
|
||||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package app.module.core.usecase.household.createHousehold.adapters.persistence;
|
||||||
|
|
||||||
|
import app.module.core.config.application.annotation.CreateCommand;
|
||||||
|
import app.module.core.config.application.util.AuditUtil;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class CreateHouseholdDao implements CreateHouseholdPortOut {
|
||||||
|
private final CreateHouseholdMapper mapper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@CreateCommand
|
||||||
|
public void operate(CreateHouseholdOutCmd outCmd) {
|
||||||
|
mapper.createHousehold(outCmd);
|
||||||
|
mapper.createHouseholdHasRole(
|
||||||
|
AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds())));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package app.module.core.usecase.household.createHousehold.adapters.persistence;
|
||||||
|
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface CreateHouseholdMapper {
|
||||||
|
void createHousehold(CreateHouseholdOutCmd outCmd);
|
||||||
|
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package app.module.core.usecase.household.createHousehold.ports;
|
||||||
|
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
|
||||||
|
|
||||||
|
public interface CreateHouseholdPortIn {
|
||||||
|
void operate(CreateHouseholdInCmd inCmd);
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package app.module.core.usecase.household.createHousehold.ports;
|
||||||
|
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
|
||||||
|
|
||||||
|
public interface CreateHouseholdPortOut {
|
||||||
|
void operate(CreateHouseholdOutCmd outCmd);
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package app.module.core.usecase.household.createHousehold.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
|
||||||
|
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
class CreateHouseholdService implements CreateHouseholdPortIn {
|
||||||
|
|
||||||
|
private final CreateHouseholdPortOut portOut;
|
||||||
|
private final BCryptPasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void operate(CreateHouseholdInCmd inCmd) {
|
||||||
|
portOut.operate(new CreateHouseholdOutCmd(
|
||||||
|
null,
|
||||||
|
inCmd.getHouseholdNum(),
|
||||||
|
inCmd.getOwnerName(),
|
||||||
|
inCmd.getOwnerAge(),
|
||||||
|
inCmd.getTel(),
|
||||||
|
inCmd.getPhone(),
|
||||||
|
passwordEncoder.encode(StringUtils.right(inCmd.getPhone(), 4)), // 비밀번호 핸드폰 뒤 네자리
|
||||||
|
inCmd.getRegion(),
|
||||||
|
inCmd.getCity(),
|
||||||
|
inCmd.getAddressDetail(),
|
||||||
|
inCmd.getIndustryLargeCode(),
|
||||||
|
inCmd.getIndustryMiddleCode(),
|
||||||
|
inCmd.getIndustrySmallCode(),
|
||||||
|
inCmd.getScaleCode(),
|
||||||
|
inCmd.getEmploymentCode(),
|
||||||
|
inCmd.getIsPanel(),
|
||||||
|
inCmd.getMemo(),
|
||||||
|
inCmd.getDropReason(),
|
||||||
|
List.of("ROLE_GENERAL")
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package app.module.core.usecase.household.createHousehold.ports.application.domain;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class CreateHouseholdHasRoleCmd extends AuditCommand {
|
||||||
|
private Long householdSeq;
|
||||||
|
private List<String> roleIds;
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package app.module.core.usecase.household.createHousehold.ports.application.domain;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class CreateHouseholdInCmd {
|
||||||
|
private String householdNum;
|
||||||
|
private String ownerName;
|
||||||
|
private Integer ownerAge;
|
||||||
|
private String tel;
|
||||||
|
private String phone;
|
||||||
|
private String region;
|
||||||
|
private String city;
|
||||||
|
private String addressDetail;
|
||||||
|
private Integer industryLargeCode;
|
||||||
|
private Integer industryMiddleCode;
|
||||||
|
private Integer industrySmallCode;
|
||||||
|
private Integer scaleCode;
|
||||||
|
private Integer employmentCode;
|
||||||
|
private Boolean isPanel;
|
||||||
|
private String memo;
|
||||||
|
private String dropReason;
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package app.module.core.usecase.household.createHousehold.ports.application.domain;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
@EqualsAndHashCode
|
||||||
|
public class CreateHouseholdOutCmd extends AuditCommand {
|
||||||
|
private Long seq;
|
||||||
|
private String householdNum;
|
||||||
|
private String ownerName;
|
||||||
|
private Integer ownerAge;
|
||||||
|
private String tel;
|
||||||
|
private String phone;
|
||||||
|
private String encodedPassword;
|
||||||
|
private String region;
|
||||||
|
private String city;
|
||||||
|
private String addressDetail;
|
||||||
|
private Integer industryLargeCode;
|
||||||
|
private Integer industryMiddleCode;
|
||||||
|
private Integer industrySmallCode;
|
||||||
|
private Integer scaleCode;
|
||||||
|
private Integer employmentCode;
|
||||||
|
private Boolean isPanel;
|
||||||
|
private String memo;
|
||||||
|
private String dropReason;
|
||||||
|
private List<String> roleIds;
|
||||||
|
}
|
||||||
@@ -1,14 +1,10 @@
|
|||||||
package app.module.core.usecase.privilege.save.adapters.persistence;
|
package app.module.core.usecase.privilege.save.adapters.persistence;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Privilege;
|
import app.module.core.config.application.util.AuditUtil;
|
||||||
import app.module.core.config.application.util.CommonUtil;
|
|
||||||
import app.module.core.usecase.privilege.save.ports.PrivilegeSavePortOut;
|
import app.module.core.usecase.privilege.save.ports.PrivilegeSavePortOut;
|
||||||
import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand;
|
import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand;
|
||||||
import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper;
|
import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper;
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.Optional;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.security.core.parameters.P;
|
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
@@ -21,17 +17,10 @@ public class PrivilegeSaveDao implements PrivilegeSavePortOut {
|
|||||||
@Override
|
@Override
|
||||||
public String connect(PrivilegeSaveCommand saveInput) {
|
public String connect(PrivilegeSaveCommand saveInput) {
|
||||||
|
|
||||||
Privilege privilege = new Privilege(
|
|
||||||
saveInput.getId(),
|
|
||||||
saveInput.getDescription(),
|
|
||||||
saveInput.getAppType(),
|
|
||||||
saveInput.getOrderNo()
|
|
||||||
);
|
|
||||||
|
|
||||||
if (viewMapper.findById(saveInput.getId()).isPresent()) {
|
if (viewMapper.findById(saveInput.getId()).isPresent()) {
|
||||||
mapper.updatePrivilege(privilege);
|
mapper.updatePrivilege(AuditUtil.update(saveInput));
|
||||||
} else {
|
} else {
|
||||||
mapper.insertPrivilege(privilege);
|
mapper.insertPrivilege(AuditUtil.create(saveInput));
|
||||||
}
|
}
|
||||||
|
|
||||||
return saveInput.getId();
|
return saveInput.getId();
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
package app.module.core.usecase.privilege.save.adapters.persistence;
|
package app.module.core.usecase.privilege.save.adapters.persistence;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Privilege;
|
import app.module.core.config.adapters.persistence.entity.Privilege;
|
||||||
|
import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface PrivilegeSaveMapper {
|
public interface PrivilegeSaveMapper {
|
||||||
void insertPrivilege(Privilege privilege);
|
void insertPrivilege(PrivilegeSaveCommand cmd);
|
||||||
void updatePrivilege(Privilege privilege);
|
void updatePrivilege(PrivilegeSaveCommand cmd);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.core.usecase.privilege.save.ports.application.domain;
|
package app.module.core.usecase.privilege.save.ports.application.domain;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
import app.module.core.config.application.enums.AppType;
|
import app.module.core.config.application.enums.AppType;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -8,7 +9,7 @@ import lombok.Setter;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class PrivilegeSaveCommand {
|
public class PrivilegeSaveCommand extends AuditCommand {
|
||||||
|
|
||||||
private AppType appType;
|
private AppType appType;
|
||||||
private final String id;
|
private final String id;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package app.module.core.usecase.role.save.adapters.persistence;
|
|||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Role;
|
import app.module.core.config.adapters.persistence.entity.Role;
|
||||||
import app.module.core.config.application.enums.AppType;
|
import app.module.core.config.application.enums.AppType;
|
||||||
|
import app.module.core.config.application.util.AuditUtil;
|
||||||
import app.module.core.config.application.util.CommonUtil;
|
import app.module.core.config.application.util.CommonUtil;
|
||||||
import app.module.core.usecase.role.save.ports.RoleSavePortOut;
|
import app.module.core.usecase.role.save.ports.RoleSavePortOut;
|
||||||
import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeDeleteParam;
|
import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeDeleteParam;
|
||||||
@@ -27,40 +28,27 @@ public class RoleSaveDao implements RoleSavePortOut {
|
|||||||
AppType appType, String id, String description, Integer orderNo,
|
AppType appType, String id, String description, Integer orderNo,
|
||||||
List<String> privilegeIds) {
|
List<String> privilegeIds) {
|
||||||
|
|
||||||
String userId = CommonUtil.getLoginUsername();
|
|
||||||
LocalDateTime now = LocalDateTime.now();
|
|
||||||
|
|
||||||
Role role = new Role(id, description, appType, orderNo);
|
Role role = new Role(id, description, appType, orderNo);
|
||||||
|
|
||||||
if (viewMapper.findRoleById(id).isPresent()) {
|
if (viewMapper.findRoleById(id).isPresent()) {
|
||||||
updateRole(role, privilegeIds, userId, now);
|
mapper.deleteAllRoleHasPrivileges(
|
||||||
|
AuditUtil.delete(new RoleHasPrivilegeDeleteParam(role.getId())));
|
||||||
|
|
||||||
|
mapper.updateRole(role);
|
||||||
|
|
||||||
|
if (CollectionUtils.isNotEmpty(privilegeIds)) {
|
||||||
|
mapper.insertRoleHasPrivileges(
|
||||||
|
AuditUtil.create(new RoleHasPrivilegeSaveParam(role.getId(), privilegeIds)));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
insertRole(role, privilegeIds, userId, now);
|
mapper.insertRole(role);
|
||||||
|
|
||||||
|
if (CollectionUtils.isNotEmpty(privilegeIds)) {
|
||||||
|
mapper.insertRoleHasPrivileges(
|
||||||
|
AuditUtil.create(new RoleHasPrivilegeSaveParam(role.getId(), privilegeIds)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateRole(Role role, List<String> privilegeIds, String userId, LocalDateTime now) {
|
|
||||||
mapper.deleteAllRoleHasPrivileges(new RoleHasPrivilegeDeleteParam(
|
|
||||||
role.getId(), now, userId, now, userId
|
|
||||||
));
|
|
||||||
mapper.updateRole(role);
|
|
||||||
|
|
||||||
if (CollectionUtils.isNotEmpty(privilegeIds)) {
|
|
||||||
mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam(
|
|
||||||
role.getId(), privilegeIds, now, userId, now, userId
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void insertRole(Role role, List<String> privilegeIds, String userId, LocalDateTime now) {
|
|
||||||
mapper.insertRole(role);
|
|
||||||
|
|
||||||
if (CollectionUtils.isNotEmpty(privilegeIds)) {
|
|
||||||
mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam(
|
|
||||||
role.getId(), privilegeIds, now, userId, now, userId
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package app.module.core.usecase.role.save.adapters.persistence.model;
|
package app.module.core.usecase.role.save.adapters.persistence.model;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
|
import app.module.core.config.application.util.AuditUtil;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -8,10 +10,6 @@ import lombok.Setter;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class RoleHasPrivilegeDeleteParam {
|
public class RoleHasPrivilegeDeleteParam extends AuditCommand {
|
||||||
private String roleId;
|
private String roleId;
|
||||||
private LocalDateTime updatedAt;
|
|
||||||
private String updatedBy;
|
|
||||||
private LocalDateTime deletedAt;
|
|
||||||
private String deletedBy;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.core.usecase.role.save.adapters.persistence.model;
|
package app.module.core.usecase.role.save.adapters.persistence.model;
|
||||||
|
|
||||||
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
@@ -9,11 +10,7 @@ import lombok.Setter;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
public class RoleHasPrivilegeSaveParam {
|
public class RoleHasPrivilegeSaveParam extends AuditCommand {
|
||||||
private String roleId;
|
private String roleId;
|
||||||
private List<String> privilegeIds;
|
private List<String> privilegeIds;
|
||||||
private LocalDateTime createdAt;
|
|
||||||
private String createdBy;
|
|
||||||
private LocalDateTime updatedAt;
|
|
||||||
private String updatedBy;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,9 +53,7 @@ spring:
|
|||||||
# 초기 스키마 생성 SQL 경로 설정
|
# 초기 스키마 생성 SQL 경로 설정
|
||||||
sql:
|
sql:
|
||||||
init:
|
init:
|
||||||
schema-locations:
|
schema-locations: classpath:sql/schema/
|
||||||
- classpath:sql/drop-all.sql
|
|
||||||
- classpath:sql/create-all.sql
|
|
||||||
|
|
||||||
# ==============================================
|
# ==============================================
|
||||||
# 암호화 설정
|
# 암호화 설정
|
||||||
|
|||||||
@@ -3,27 +3,31 @@
|
|||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
<mapper namespace="app.module.core.usecase.admin.view.adapters.persistence.AdminViewMapper">
|
<mapper namespace="app.module.core.usecase.admin.view.adapters.persistence.AdminViewMapper">
|
||||||
|
|
||||||
<select id="findAdminUserById"
|
<select id="findById"
|
||||||
resultType="app.module.core.usecase.admin.view.adapters.persistence.model.AdminViewDto">
|
resultType="app.module.core.usecase.admin.view.ports.application.domain.AdminView">
|
||||||
/* findAdminUserById : 관리자 상세 조회 */
|
/* findById : 관리자 상세 조회 */
|
||||||
SELECT
|
SELECT
|
||||||
a.id,
|
a.seq,
|
||||||
a.password,
|
a.id,
|
||||||
a.email,
|
a.password,
|
||||||
a.password_updated_at,
|
a.email,
|
||||||
a.account_disabled,
|
a.name,
|
||||||
a.login_fail_cnt,
|
a.contact,
|
||||||
a.account_locked,
|
a.inspection_area_code,
|
||||||
a.created_at,
|
a.password_updated_at,
|
||||||
a.created_by,
|
a.account_disabled,
|
||||||
a.updated_at,
|
a.login_fail_cnt,
|
||||||
a.updated_by
|
a.account_locked,
|
||||||
|
a.created_at,
|
||||||
|
a.created_by,
|
||||||
|
a.updated_at,
|
||||||
|
a.updated_by
|
||||||
FROM admin a
|
FROM admin a
|
||||||
WHERE id = #{id}
|
WHERE id = #{id}
|
||||||
AND a.is_deleted = false
|
AND a.is_deleted = false
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<resultMap id="AdminRoleWithPrivilegesMap" type="app.module.core.config.adapters.web.security.domain.CoreRole">
|
<resultMap id="AdminRoleHasPrivilegesMap" type="app.module.core.config.adapters.web.security.domain.CoreRole">
|
||||||
<id property="id" column="role_id"/>
|
<id property="id" column="role_id"/>
|
||||||
<result property="description" column="role_description"/>
|
<result property="description" column="role_description"/>
|
||||||
|
|
||||||
@@ -32,18 +36,18 @@
|
|||||||
</collection>
|
</collection>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<select id="findRolesWithPrivilegesByAdminId" resultMap="AdminRoleWithPrivilegesMap">
|
<select id="findRoleHasPrivilegesByAdminId" resultMap="AdminRoleHasPrivilegesMap">
|
||||||
/* findRolesWithPrivilegesByAdminId : 관리자 권한, 역할 조회 */
|
/* findRoleHasPrivilegesByAdminId : 관리자 권한, 역할 조회 */
|
||||||
SELECT
|
SELECT
|
||||||
r.id AS role_id,
|
r.id AS role_id,
|
||||||
r.description AS role_description,
|
r.description AS role_description,
|
||||||
p.id AS privilege_id
|
p.id AS privilege_id
|
||||||
FROM admin_has_role ahr
|
FROM admin_has_role ahr
|
||||||
JOIN role r ON ahr.role_id = r.id AND r.is_deleted = FALSE
|
JOIN role r ON ahr.role_id = r.id AND r.is_deleted = false
|
||||||
LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = FALSE
|
LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false
|
||||||
LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = FALSE
|
LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false
|
||||||
WHERE ahr.admin_id = #{adminId}
|
WHERE ahr.admin_seq = #{seq}
|
||||||
AND ahr.is_deleted = FALSE
|
AND ahr.is_deleted = false
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
|
||||||
<mapper
|
|
||||||
namespace="app.module.core.usecase.adminResearch.getAdmin.adapters.persistence.GetAdminMapper">
|
|
||||||
<select id="findById"
|
|
||||||
resultType="app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin">
|
|
||||||
/* findById : 관리자 상세 조회 */
|
|
||||||
SELECT
|
|
||||||
a.seq,
|
|
||||||
a.id,
|
|
||||||
a.password,
|
|
||||||
a.name,
|
|
||||||
a.contact,
|
|
||||||
a.inspection_area_code,
|
|
||||||
a.password_updated_at,
|
|
||||||
a.account_disabled,
|
|
||||||
a.login_fail_cnt,
|
|
||||||
a.account_locked,
|
|
||||||
a.created_at,
|
|
||||||
a.created_by,
|
|
||||||
a.updated_at,
|
|
||||||
a.updated_by
|
|
||||||
FROM admin_research a
|
|
||||||
WHERE id = #{id}
|
|
||||||
AND a.is_deleted = false
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<resultMap id="AdminRoleHasPrivilegesMap" type="app.module.core.config.adapters.web.security.domain.CoreRole">
|
|
||||||
<id property="id" column="role_id"/>
|
|
||||||
<result property="description" column="role_description"/>
|
|
||||||
|
|
||||||
<collection property="privileges" ofType="app.module.core.config.adapters.web.security.domain.CorePrivilege">
|
|
||||||
<id property="id" column="privilege_id"/>
|
|
||||||
</collection>
|
|
||||||
</resultMap>
|
|
||||||
|
|
||||||
<select id="findRoleHasPrivilegesByAdminId" resultMap="AdminRoleHasPrivilegesMap">
|
|
||||||
/* findRoleHasPrivilegesByAdminId : 관리자 권한, 역할 조회 */
|
|
||||||
SELECT
|
|
||||||
r.id AS role_id,
|
|
||||||
r.description AS role_description,
|
|
||||||
p.id AS privilege_id
|
|
||||||
FROM admin_research_has_role ahr
|
|
||||||
JOIN role r ON ahr.role_id = r.id AND r.is_deleted = false
|
|
||||||
LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false
|
|
||||||
LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false
|
|
||||||
WHERE ahr.admin_seq = #{seq}
|
|
||||||
AND ahr.is_deleted = false
|
|
||||||
</select>
|
|
||||||
</mapper>
|
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
<select id="findAll" resultType="app.module.core.usecase.admin.getAdmins.adapters.persistence.model.GetAdminsDto">
|
<select id="findAll" resultType="app.module.core.usecase.admin.getAdmins.adapters.persistence.model.GetAdminsDto">
|
||||||
SELECT
|
SELECT
|
||||||
|
a.seq,
|
||||||
a.id AS id,
|
a.id AS id,
|
||||||
a.created_by,
|
a.created_by,
|
||||||
a.created_at,
|
a.created_at,
|
||||||
@@ -28,7 +29,7 @@
|
|||||||
AND EXISTS (
|
AND EXISTS (
|
||||||
SELECT 1
|
SELECT 1
|
||||||
FROM admin_has_role ahr
|
FROM admin_has_role ahr
|
||||||
WHERE ahr.admin_id = a.id
|
WHERE ahr.admin_seq = a.seq
|
||||||
AND ahr.role_id = #{cmd.searchRole}
|
AND ahr.role_id = #{cmd.searchRole}
|
||||||
AND ahr.is_deleted = false
|
AND ahr.is_deleted = false
|
||||||
)
|
)
|
||||||
@@ -58,7 +59,7 @@
|
|||||||
|
|
||||||
<resultMap id="GetAdminsRoleMap" type="app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole">
|
<resultMap id="GetAdminsRoleMap" type="app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole">
|
||||||
<id property="adminHasRoleId" column="admin_has_role_id" />
|
<id property="adminHasRoleId" column="admin_has_role_id" />
|
||||||
<result property="adminId" column="admin_id" />
|
<result property="adminSeq" column="admin_seq" />
|
||||||
<result property="id" column="role_id" />
|
<result property="id" column="role_id" />
|
||||||
<result property="description" column="role_description" />
|
<result property="description" column="role_description" />
|
||||||
<result property="orderNo" column="role_order_no" />
|
<result property="orderNo" column="role_order_no" />
|
||||||
@@ -71,7 +72,7 @@
|
|||||||
<select id="findRolesWithPrivilegesByAdminIds" resultMap="GetAdminsRoleMap">
|
<select id="findRolesWithPrivilegesByAdminIds" resultMap="GetAdminsRoleMap">
|
||||||
SELECT
|
SELECT
|
||||||
ahr.id AS admin_has_role_id,
|
ahr.id AS admin_has_role_id,
|
||||||
ahr.admin_id AS admin_id,
|
ahr.admin_seq AS admin_seq,
|
||||||
r.id AS role_id,
|
r.id AS role_id,
|
||||||
r.description AS role_description,
|
r.description AS role_description,
|
||||||
r.order_no AS role_order_no,
|
r.order_no AS role_order_no,
|
||||||
@@ -81,9 +82,9 @@
|
|||||||
LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false
|
LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false
|
||||||
LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false
|
LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false
|
||||||
WHERE ahr.is_deleted = false
|
WHERE ahr.is_deleted = false
|
||||||
AND ahr.admin_id IN
|
AND ahr.admin_seq IN
|
||||||
<foreach collection="ids" item="id" open="(" separator="," close=")">
|
<foreach collection="seqs" item="seq" open="(" separator="," close=")">
|
||||||
#{id}
|
#{seq}
|
||||||
</foreach>
|
</foreach>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,13 @@
|
|||||||
<mapper namespace="app.module.core.usecase.admin.saveAdmin.adapters.persistence.SaveAdminMapper">
|
<mapper namespace="app.module.core.usecase.admin.saveAdmin.adapters.persistence.SaveAdminMapper">
|
||||||
|
|
||||||
<insert id="insertAdmin">
|
<insert id="insertAdmin">
|
||||||
|
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
|
||||||
|
SELECT nextval('admin_seq')
|
||||||
|
</selectKey>
|
||||||
|
|
||||||
/* insertAdmin : 관리자 등록 */
|
/* insertAdmin : 관리자 등록 */
|
||||||
INSERT INTO admin (id,
|
INSERT INTO admin (seq,
|
||||||
|
id,
|
||||||
password,
|
password,
|
||||||
email,
|
email,
|
||||||
password_updated_at,
|
password_updated_at,
|
||||||
@@ -13,8 +18,9 @@
|
|||||||
login_fail_cnt,
|
login_fail_cnt,
|
||||||
account_locked,
|
account_locked,
|
||||||
<include refid="common.fields.CreateUpdateBaseColumns"/>)
|
<include refid="common.fields.CreateUpdateBaseColumns"/>)
|
||||||
VALUES (#{id},
|
VALUES (#{seq},
|
||||||
#{password},
|
#{id},
|
||||||
|
#{encodedPassword},
|
||||||
#{email},
|
#{email},
|
||||||
#{passwordUpdatedAt},
|
#{passwordUpdatedAt},
|
||||||
#{accountDisabled},
|
#{accountDisabled},
|
||||||
@@ -27,28 +33,28 @@
|
|||||||
/* updateAdmin : 관리자 정보 수정 */
|
/* updateAdmin : 관리자 정보 수정 */
|
||||||
UPDATE admin
|
UPDATE admin
|
||||||
SET
|
SET
|
||||||
password = #{password},
|
password = #{encodedPassword},
|
||||||
email = #{email},
|
email = #{email},
|
||||||
password_updated_at = #{passwordUpdatedAt},
|
password_updated_at = #{passwordUpdatedAt},
|
||||||
account_disabled = #{accountDisabled},
|
account_disabled = #{accountDisabled},
|
||||||
login_fail_cnt = #{loginFailCnt},
|
login_fail_cnt = #{loginFailCnt},
|
||||||
account_locked = #{accountLocked},
|
account_locked = #{accountLocked},
|
||||||
<include refid="common.fields.UpdateBaseSet"/>
|
<include refid="common.fields.UpdateBaseSet"/>
|
||||||
WHERE id = #{id}
|
WHERE seq = #{seq}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<insert id="insertAdminHasRoles">
|
<insert id="insertAdminHasRoles">
|
||||||
/* insertAdminHasRoles : 관리자 역할 매핑 정보 저장 */
|
/* insertAdminHasRoles : 관리자 역할 매핑 정보 저장 */
|
||||||
INSERT INTO admin_has_role (
|
INSERT INTO admin_has_role (
|
||||||
id,
|
id,
|
||||||
admin_id,
|
admin_seq,
|
||||||
role_id,
|
role_id,
|
||||||
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||||
) VALUES
|
) VALUES
|
||||||
<foreach collection="roleIds" item="roleId" separator=",">
|
<foreach collection="roleIds" item="roleId" separator=",">
|
||||||
(
|
(
|
||||||
nextval('admin_has_role_seq'),
|
nextval('admin_has_role_seq'),
|
||||||
#{adminId},
|
#{adminSeq},
|
||||||
#{roleId},
|
#{roleId},
|
||||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||||
)
|
)
|
||||||
@@ -59,6 +65,6 @@
|
|||||||
/* deleteAdminRolesByAdminId : 관리자 역할 매핑 정보 수정 */
|
/* deleteAdminRolesByAdminId : 관리자 역할 매핑 정보 수정 */
|
||||||
UPDATE admin_has_role
|
UPDATE admin_has_role
|
||||||
SET <include refid="common.fields.DeleteBaseSet"/>
|
SET <include refid="common.fields.DeleteBaseSet"/>
|
||||||
WHERE admin_id = #{adminId}
|
WHERE admin_seq = #{adminSeq}
|
||||||
</update>
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
|
<mapper
|
||||||
|
namespace="app.module.core.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper">
|
||||||
|
|
||||||
|
<insert id="createHousehold">
|
||||||
|
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
|
||||||
|
SELECT nextval('household_seq')
|
||||||
|
</selectKey>
|
||||||
|
|
||||||
|
INSERT INTO household (
|
||||||
|
seq,
|
||||||
|
household_num,
|
||||||
|
owner_name,
|
||||||
|
owner_age,
|
||||||
|
tel,
|
||||||
|
phone,
|
||||||
|
password,
|
||||||
|
region,
|
||||||
|
city,
|
||||||
|
address_detail,
|
||||||
|
industry_large_code,
|
||||||
|
industry_middle_code,
|
||||||
|
industry_small_code,
|
||||||
|
scale_code,
|
||||||
|
employment_code,
|
||||||
|
is_panel,
|
||||||
|
memo,
|
||||||
|
drop_reason,
|
||||||
|
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||||
|
) VALUES (
|
||||||
|
#{seq},
|
||||||
|
#{householdNum},
|
||||||
|
#{ownerName},
|
||||||
|
#{ownerAge},
|
||||||
|
#{tel},
|
||||||
|
#{phone},
|
||||||
|
#{encodedPassword},
|
||||||
|
#{region},
|
||||||
|
#{city},
|
||||||
|
#{addressDetail},
|
||||||
|
#{industryLargeCode},
|
||||||
|
#{industryMiddleCode},
|
||||||
|
#{industrySmallCode},
|
||||||
|
#{scaleCode},
|
||||||
|
#{employmentCode},
|
||||||
|
#{isPanel},
|
||||||
|
#{memo},
|
||||||
|
#{dropReason},
|
||||||
|
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||||
|
)
|
||||||
|
</insert>
|
||||||
|
|
||||||
|
<insert id="createHouseholdHasRole">
|
||||||
|
INSERT INTO household_has_role (id,
|
||||||
|
household_seq,
|
||||||
|
role_id,
|
||||||
|
<include refid="common.fields.CreateUpdateBaseColumns"/>)
|
||||||
|
VALUES
|
||||||
|
<foreach collection="roleIds" item="roleId" separator=",">
|
||||||
|
(
|
||||||
|
nextval('household_has_role_seq'),
|
||||||
|
#{householdSeq},
|
||||||
|
#{roleId},
|
||||||
|
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||||
|
)
|
||||||
|
</foreach>
|
||||||
|
</insert>
|
||||||
|
</mapper>
|
||||||
52
core/src/main/resources/mappers/initData/RemoveAllMapper.xml
Normal file
52
core/src/main/resources/mappers/initData/RemoveAllMapper.xml
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
|
<mapper namespace="app.module.core.config.adapters.persistence.initData.helper.RemoveAllMapper">
|
||||||
|
<delete id="deleteAllAdminHasRole">
|
||||||
|
DELETE FROM admin_has_role;
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllAdmin">
|
||||||
|
DELETE FROM admin
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllHouseholdHasRole">
|
||||||
|
DELETE FROM household_has_role
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllHousehold">
|
||||||
|
DELETE FROM household
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllRoleHasPrivilege">
|
||||||
|
DELETE FROM role_has_privilege
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllPrivilege">
|
||||||
|
DELETE FROM privilege
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllUriHasRole">
|
||||||
|
DELETE FROM uri_has_role
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllUri">
|
||||||
|
DELETE FROM uri
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllFrontUserHasRole">
|
||||||
|
DELETE FROM front_user_has_role
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllFrontUser">
|
||||||
|
DELETE FROM front_user
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllRole">
|
||||||
|
DELETE FROM role
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllUicode">
|
||||||
|
DELETE FROM uicode
|
||||||
|
</delete>
|
||||||
|
</mapper>
|
||||||
60
core/src/main/resources/sql/01_admin.sql
Normal file
60
core/src/main/resources/sql/01_admin.sql
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
-- 관리자 테이블 생성
|
||||||
|
DROP TABLE IF EXISTS admin;
|
||||||
|
|
||||||
|
CREATE TABLE admin
|
||||||
|
(
|
||||||
|
seq int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY UNIQUE,
|
||||||
|
id varchar(255),
|
||||||
|
password varchar(255),
|
||||||
|
password_updated_at timestamp(6) NOT NULL,
|
||||||
|
name varchar(4) ,
|
||||||
|
contact varchar(15) ,
|
||||||
|
inspection_area_code varchar(10) ,
|
||||||
|
account_disabled boolean ,
|
||||||
|
login_fail_cnt int4 ,
|
||||||
|
account_locked boolean ,
|
||||||
|
created_at timestamp(6),
|
||||||
|
created_by varchar(255),
|
||||||
|
updated_at timestamp(6),
|
||||||
|
updated_by varchar(255),
|
||||||
|
deleted_at timestamp(6),
|
||||||
|
deleted_by varchar(255),
|
||||||
|
is_deleted boolean NOT NULL DEFAULT false,
|
||||||
|
PRIMARY KEY (seq)
|
||||||
|
);
|
||||||
|
|
||||||
|
COMMENT ON TABLE admin IS '관리자';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.seq IS '관리자 내부키';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.id IS '관리자 계정 아이디';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.password IS '비밀번호';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.password_updated_at IS '비밀번호 수정일';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.name IS '성명';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.contact IS '연락처';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.inspection_area_code IS '실사구역';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.account_disabled IS '비활성화 여부';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.login_fail_cnt IS '로그인 실패 횟수';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.account_locked IS '잠금 여부';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.created_at IS '생성일';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.created_by IS '생성자';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.updated_at IS '수정일';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.updated_by IS '수정자';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.deleted_at IS '삭제일';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.deleted_by IS '삭제자';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin.is_deleted IS '삭제여부';
|
||||||
84
core/src/main/resources/sql/02_household.sql
Normal file
84
core/src/main/resources/sql/02_household.sql
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
-- 임가정보 테이블 생성
|
||||||
|
DROP TABLE IF EXISTS household;
|
||||||
|
|
||||||
|
CREATE TABLE household
|
||||||
|
(
|
||||||
|
seq int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY UNIQUE,
|
||||||
|
household_num varchar(5) NOT NULL,
|
||||||
|
owner_name varchar(10) NOT NULL,
|
||||||
|
owner_age int2 NOT NULL,
|
||||||
|
tel varchar(20) ,
|
||||||
|
phone varchar(15) NOT NULL,
|
||||||
|
password varchar(4) NOT NULL,
|
||||||
|
region varchar(20) ,
|
||||||
|
city varchar(30) ,
|
||||||
|
address_detail varchar(255),
|
||||||
|
industry_large_code int4 ,
|
||||||
|
industry_middle_code int4 ,
|
||||||
|
industry_small_code int4 ,
|
||||||
|
scale_code int4 ,
|
||||||
|
employment_code int2 ,
|
||||||
|
is_panel boolean DEFAULT true,
|
||||||
|
memo varchar(255),
|
||||||
|
drop_reason varchar(255),
|
||||||
|
created_at timestamp(6) NOT NULL,
|
||||||
|
created_by varchar(255) NOT NULL,
|
||||||
|
updated_at timestamp(6) NOT NULL,
|
||||||
|
updated_by varchar(255) NOT NULL,
|
||||||
|
deleted_at timestamp(6),
|
||||||
|
deleted_by varchar(255),
|
||||||
|
is_deleted boolean DEFAULT false,
|
||||||
|
PRIMARY KEY (seq)
|
||||||
|
);
|
||||||
|
|
||||||
|
COMMENT ON TABLE household IS '임가정보';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.seq IS '임가정보내부키';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.household_num IS '임가번호';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.owner_name IS '경영주';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.owner_age IS '경영주연령';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.tel IS '가구연락처';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.phone IS '핸드폰 번호';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.password IS '비밀번호';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.region IS '시/도 (주소관리테이블)';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.city IS '시/군/구 (주소관리테이블)';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.address_detail IS '세부 주소';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.industry_large_code IS '업종 대분류';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.industry_middle_code IS '업종 중분류';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.industry_small_code IS '업종 소분류';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.scale_code IS '규모';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.employment_code IS '전/겸업 종류';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.is_panel IS '패널유지여부';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.memo IS '비고';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.drop_reason IS '탈락사유';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.created_at IS '생성일';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.created_by IS '생성자';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.updated_at IS '수정일';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.updated_by IS '수정자';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.deleted_at IS '삭제일';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.deleted_by IS '삭제자';
|
||||||
|
|
||||||
|
COMMENT ON COLUMN household.is_deleted IS '삭제여부';
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
-- test
|
|
||||||
CREATE TABLE my_first_table (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
name VARCHAR(255) NOT NULL
|
|
||||||
);
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
-- test
|
|
||||||
DROP TABLE IF EXISTS my_first_table;
|
|
||||||
Reference in New Issue
Block a user