Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -63,7 +63,7 @@ public class RoleUpdateAspect {
|
||||
|| currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) {
|
||||
createLog = true;
|
||||
}
|
||||
} else if (currentRoles.size() > 0) {
|
||||
} else if (!currentRoles.isEmpty()) {
|
||||
createLog = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,8 @@ import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand;
|
||||
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -37,7 +39,7 @@ public class AdminAuthFailEvent {
|
||||
@EventListener
|
||||
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
|
||||
HttpServletRequest request =
|
||||
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||
((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
|
||||
|
||||
if (event.getException() instanceof BadCredentialsException) {
|
||||
adminViewPortIn
|
||||
|
||||
@@ -10,6 +10,8 @@ import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Objects;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
@@ -49,7 +51,7 @@ public class AdminAuthSuccessEvent {
|
||||
AdminUser adminUser = (AdminUser) authentication.getPrincipal();
|
||||
|
||||
HttpServletRequest request =
|
||||
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||
((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
|
||||
|
||||
// 로그인 실패 회수 초기화
|
||||
adminViewPortIn
|
||||
|
||||
@@ -82,7 +82,7 @@ public class AdminSecurityConfig {
|
||||
List<String> permitPaths =
|
||||
Arrays.stream(PublicAccess.values())
|
||||
.map(PublicAccess::getPath)
|
||||
.collect(Collectors.toList());
|
||||
.toList();
|
||||
|
||||
http.authorizeHttpRequests(
|
||||
(auth) ->
|
||||
|
||||
@@ -2,10 +2,12 @@ package app.module.admin.config.application.security;
|
||||
|
||||
import java.util.Collection;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.userdetails.User;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class AdminUser extends User {
|
||||
private Long seq;
|
||||
private String roleId;
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
package app.module.admin.config.application.util.model;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.apache.poi.ss.usermodel.IndexedColors;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class ExcelSheetDto {
|
||||
/**
|
||||
* 시트명
|
||||
@@ -36,10 +40,4 @@ public class ExcelSheetDto {
|
||||
this.commaColumns = commaColumns;
|
||||
this.headerBgColors = headerBgColors;
|
||||
}
|
||||
|
||||
public String getSheetName() { return sheetName; }
|
||||
public List<String> getHeaders() { return headers; }
|
||||
public List<List<String>> getData() { return data; }
|
||||
public Set<Integer> getCommaColumns() { return commaColumns; }
|
||||
public Map<Integer, IndexedColors> getHeaderBgColors() { return headerBgColors; }
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package app.module.admin.usecase.home.adapters.web;
|
||||
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
|
||||
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import java.security.Principal;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -28,8 +29,9 @@ public class HomeController {
|
||||
model.addAttribute("loginUserRoles", loginUser.getRole());
|
||||
});
|
||||
|
||||
model.addAttribute("smsActive",
|
||||
getSmsAutoStatusPortIn.operate().orElse(null).getActive());
|
||||
GetSmsAutoStatus smsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null);
|
||||
|
||||
model.addAttribute("smsActive", smsAutoStatus != null && smsAutoStatus.getActive());
|
||||
|
||||
return "home";
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ class CreateHouseholdUIController {
|
||||
RedirectAttributes redirectAttributes) {
|
||||
|
||||
// 임가 등록 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/households";
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null);
|
||||
ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3));
|
||||
|
||||
if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) {
|
||||
if(checkHouseholdNum != null && !checkHouseholdNum.getIsDuplicated() && contactVO != null) {
|
||||
int flag = 0;
|
||||
ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO();
|
||||
household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호
|
||||
|
||||
@@ -31,7 +31,7 @@ class GetHouseholdsStatusUIController {
|
||||
|
||||
// 로그인한 관리자 역할
|
||||
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
|
||||
model.addAttribute("userRegionMainCode", admin.getRegionMainCode());
|
||||
model.addAttribute("userRegionMainCode", admin != null ? admin.getRegionMainCode() : null);
|
||||
|
||||
// 실사 코드 목록
|
||||
// 지방실사와 조사원은 담당실사 지역만 조회
|
||||
|
||||
@@ -39,7 +39,7 @@ class SaveBankAutoTransferExpenseService implements SaveBankAutoTransferExpenseP
|
||||
inCmd.getPrice(),
|
||||
"code.bank.output", // 지출 type code
|
||||
"2", // 지출 유형 2 고정
|
||||
monthlyInputStatus.getId(),
|
||||
monthlyInputStatus.getBankAutoTransferOutputStatus()));
|
||||
monthlyInputStatus != null ? monthlyInputStatus.getId() : null,
|
||||
monthlyInputStatus != null ? monthlyInputStatus.getBankAutoTransferOutputStatus() : null));
|
||||
}
|
||||
}
|
||||
@@ -41,8 +41,8 @@ class SaveBankAutoTransferIncomeService implements SaveBankAutoTransferIncomePor
|
||||
inCmd.getPrice(),
|
||||
"code.bank.input", // 수입 type code
|
||||
"1", // 수입 유형 1 고정
|
||||
monthlyInputStatus.getId(),
|
||||
monthlyInputStatus.getBankAutoTransferInputStatus()
|
||||
monthlyInputStatus != null ? monthlyInputStatus.getId() : null,
|
||||
monthlyInputStatus != null ? monthlyInputStatus.getBankAutoTransferInputStatus() : null
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -32,7 +32,7 @@ class UpdateHouseholdStatusUIController {
|
||||
RedirectAttributes redirectAttributes) {
|
||||
|
||||
// 임가 수정 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/households";
|
||||
}
|
||||
@@ -52,34 +52,36 @@ class UpdateHouseholdStatusUIController {
|
||||
GetHouseholdStatus result =
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null);
|
||||
|
||||
model.addAttribute("householdInfo",
|
||||
new UpdateHouseholdStatusUIResVO(
|
||||
result.getHouseholdSeq(),
|
||||
result.getHouseholdNum(),
|
||||
result.getHouseholdName(),
|
||||
result.getHouseholdAge(),
|
||||
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "",
|
||||
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "",
|
||||
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "",
|
||||
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "",
|
||||
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "",
|
||||
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "",
|
||||
result.getRegionMainCode(),
|
||||
result.getRegionSubCode(),
|
||||
result.getRegionDetailCode(),
|
||||
result.getAddress(),
|
||||
result.getIndustryLargeCode(),
|
||||
result.getIndustryMiddleCode(),
|
||||
result.getIndustrySubMiddleName(),
|
||||
result.getIndustryDetailName(),
|
||||
result.getIsPanel(),
|
||||
result.getUsageType(),
|
||||
result.getEmploymentType(),
|
||||
result.getMemo(),
|
||||
result.getResearcherSeq(),
|
||||
result.getResearcherName(),
|
||||
result.getResearcherPhone()
|
||||
));
|
||||
if (result != null) {
|
||||
model.addAttribute("householdInfo",
|
||||
new UpdateHouseholdStatusUIResVO(
|
||||
result.getHouseholdSeq(),
|
||||
result.getHouseholdNum(),
|
||||
result.getHouseholdName(),
|
||||
result.getHouseholdAge(),
|
||||
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "",
|
||||
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "",
|
||||
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "",
|
||||
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "",
|
||||
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "",
|
||||
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "",
|
||||
result.getRegionMainCode(),
|
||||
result.getRegionSubCode(),
|
||||
result.getRegionDetailCode(),
|
||||
result.getAddress(),
|
||||
result.getIndustryLargeCode(),
|
||||
result.getIndustryMiddleCode(),
|
||||
result.getIndustrySubMiddleName(),
|
||||
result.getIndustryDetailName(),
|
||||
result.getIsPanel(),
|
||||
result.getUsageType(),
|
||||
result.getEmploymentType(),
|
||||
result.getMemo(),
|
||||
result.getResearcherSeq(),
|
||||
result.getResearcherName(),
|
||||
result.getResearcherPhone()
|
||||
));
|
||||
}
|
||||
|
||||
return "households/update/{seq}";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user