diff --git a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java index c4cf8d63..084c4a73 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java @@ -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; } diff --git a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java new file mode 100644 index 00000000..7b5ffb8f --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -0,0 +1,35 @@ +package app.module.admin.config.application.batch; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +@Slf4j +public class BatchLogRunner { + private final BatchLogPortIn batchLogPortIn; + + public void run(BatchLogType batchType, Runnable action) { + // 이미 실행 중인지 확인 + if (batchLogPortIn.exists(batchType)) { + log.warn("[{}] 배치가 이미 실행 중 입니다.", batchType.name()); + return; + } + + // 실행 로그 insert (RUNNING) + Long logId = batchLogPortIn.create(batchType); + + try { + action.run(); + // 성공 처리 + batchLogPortIn.update(logId, "SUCCESS", null); + } catch (Exception e) { + // 실패 처리 + batchLogPortIn.update(logId, "FAIL", e.getMessage()); + log.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); + } + } +} diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java index 3854cdd8..124ac72f 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java @@ -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 diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java index 61c61a2b..bd3dee3a 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java @@ -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 diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java b/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java index 342b773d..8a3e6acd 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java @@ -82,7 +82,7 @@ public class AdminSecurityConfig { List permitPaths = Arrays.stream(PublicAccess.values()) .map(PublicAccess::getPath) - .collect(Collectors.toList()); + .toList(); http.authorizeHttpRequests( (auth) -> diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java index 789a447a..ee18560c 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java b/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java index 176d6ba7..d9cbbad9 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java +++ b/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java @@ -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 getHeaders() { return headers; } - public List> getData() { return data; } - public Set getCommaColumns() { return commaColumns; } - public Map getHeaderBgColors() { return headerBgColors; } } diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java new file mode 100644 index 00000000..0388b1f6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.batchLog.adapters.persistence; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortOut; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class BatchLogDao implements BatchLogPortOut { + private final BatchLogMapper mapper; + + @Override + public boolean exists(BatchLogType type) { + return mapper.exists(type.name()); + } + + @Override + public Long create(BatchLogType type) { + BatchLogCmd cmd = new BatchLogCmd(null, type.name(), "RUNNING", LocalDateTime.now()); + mapper.create(cmd); + return cmd.getId(); + } + + @Override + public void update(Long id, String status, String errorMessage) { + mapper.update(id, status, errorMessage); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java new file mode 100644 index 00000000..cf204385 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.batchLog.adapters.persistence; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BatchLogMapper { + boolean exists(String type); + Long create(BatchLogCmd cmd); + void update(Long id, String status, String errorMessage); +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java new file mode 100644 index 00000000..1c2d1947 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.batchLog.ports; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; + +public interface BatchLogPortIn { + boolean exists(BatchLogType type); + Long create(BatchLogType type); + void update(Long id, String status, String errorMessage); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java new file mode 100644 index 00000000..916ff343 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/BatchLogPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.batchLog.ports; + +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; + +public interface BatchLogPortOut { + boolean exists(BatchLogType type); + Long create(BatchLogType type); + void update(Long id, String status, String errorMessage); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java new file mode 100644 index 00000000..426060aa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/BatchLogService.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.batchLog.ports.application; + +import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; +import app.module.admin.usecase.batchLog.ports.BatchLogPortOut; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class BatchLogService implements BatchLogPortIn { + private final BatchLogPortOut portOut; + + @Override + public boolean exists(BatchLogType type) { + return portOut.exists(type); + } + + @Override + public Long create(BatchLogType type) { + return portOut.create(type); + } + + @Override + public void update(Long id, String status, String errorMessage) { + portOut.update(id, status, errorMessage); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java new file mode 100644 index 00000000..fc4d1d75 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class BatchLog { + private Long id; + private String type; + private String status; + private LocalDateTime startAt; + private LocalDateTime endAt; + private String errorMessage; + private LocalDateTime createdAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java new file mode 100644 index 00000000..5074fe5b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class BatchLogCmd { + private Long id; + private String type; + private String status; + private LocalDateTime startAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java new file mode 100644 index 00000000..5e7f5a24 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogType.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.batchLog.ports.application.domain; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum BatchLogType { + AUTO_SMS, + MONTHLY_STATUS, + CARRYOVER; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java index 1e4dc05b..ce9d4801 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java @@ -11,9 +11,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; + @Controller @RequiredArgsConstructor class CreateNoticeController { @@ -23,8 +28,13 @@ class CreateNoticeController { ResponseEntity operate(@RequestBody @Valid CreateNoticeReqVO reqVO, BindingResult bindingResult) { if (bindingResult.hasErrors()) { + List fieldOrder = Arrays.asList("title", "content", "visible", "startDate", "endDate"); + + List sortedErrors = bindingResult.getFieldErrors().stream() + .sorted(Comparator.comparingInt(error -> fieldOrder.indexOf(error.getField()))) + .toList(); return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) - .body(bindingResult.getFieldErrors()); + .body(sortedErrors); } CreateNotice article = diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java index 2d1faf61..6a7db3fd 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java @@ -15,19 +15,19 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode public class CreateNoticeReqVO { - @NotBlank(message = "{valid.common.required}") + @NotBlank(message = "제목은 필수입력값입니다.") private String title; - @NotBlank(message = "{valid.common.required}") + @NotBlank(message = "내용은 {valid.common.required}") private String content; - @NotNull(message = "{valid.common.required}") + @NotNull(message = "노출 여부는 {valid.common.required}") private Boolean visible; - @NotNull(message = "{valid.common.required}") + @NotNull(message = "시작일은 {valid.common.required}") private LocalDateTime startDate; - @NotNull(message = "{valid.common.required}") + @NotNull(message = "종료일은 {valid.common.required}") private LocalDateTime endDate; private List fileMappingId; diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java index 079c05e7..35996152 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java @@ -11,10 +11,15 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; + @RestController @RequiredArgsConstructor class UpdateNoticeController { @@ -26,8 +31,13 @@ class UpdateNoticeController { if (bindingResult.hasErrors()) { + List fieldOrder = Arrays.asList("title", "content", "visible", "startDate", "endDate"); + + List sortedErrors = bindingResult.getFieldErrors().stream() + .sorted(Comparator.comparingInt(error -> fieldOrder.indexOf(error.getField()))) + .toList(); return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) - .body(bindingResult.getFieldErrors()); + .body(sortedErrors); } updateFilePortIn.operate( diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java index 2124128a..e405d90c 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java @@ -17,20 +17,20 @@ public class UpdateNoticeReqVO { @NotNull(message = "{valid.common.required}") private Long id; - @NotBlank(message = "{valid.common.required}") + @NotBlank(message = "제목은 {valid.common.required}") private String title; - @NotBlank(message = "{valid.common.required}") + @NotBlank(message = "내용은 {valid.common.required}") private String content; - @NotNull(message = "{valid.common.required}") + @NotNull(message = "노출여부는 {valid.common.required}") private Boolean visible; - @NotNull(message = "{valid.common.required}") + @NotNull(message = "시작일은 {valid.common.required}") private LocalDateTime startDate; - @NotNull(message = "{valid.common.required}") + @NotNull(message = "종료일은 {valid.common.required}") private LocalDateTime endDate; private List fileMappingId; diff --git a/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java b/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java index 7585f5aa..a02f7bbb 100644 --- a/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java @@ -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"; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java index 4c61700a..32418eb7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java @@ -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"; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 99d7f34b..5f975f59 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -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))); // 임가번호 diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java index 8b9b9d5f..c30ae5de 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java @@ -31,7 +31,7 @@ class GetHouseholdsStatusUIController { // 로그인한 관리자 역할 model.addAttribute("userRole", AdminUtil.getLoginUserRole()); - model.addAttribute("userRegionMainCode", admin.getRegionMainCode()); + model.addAttribute("userRegionMainCode", admin != null ? admin.getRegionMainCode() : null); // 실사 코드 목록 // 지방실사와 조사원은 담당실사 지역만 조회 diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java index 432b0860..7fca3102 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java @@ -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)); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java index e690d351..19bf915a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java @@ -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 )); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index c338737e..667c3457 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -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}"; } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java index 420526d7..43a8cab0 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java @@ -1,14 +1,12 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; +import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; - @Slf4j @Repository @RequiredArgsConstructor @@ -24,24 +22,9 @@ class AutoSchedulesDao implements AutoSchedulesPortOut { return Optional.of(true); } catch (Exception e) { - // 예외 발생 시 false 반환 - return Optional.of(false); - } + log.error("[AutoSchedule][createMonthlyInputStatus] message: {}", e.getMessage(), e); - } - - @Override - @Transactional - public Optional sendAutoSms(CreateSmsAutoSendCmd cmd) { - try { - mapper.createSmsAutoSend(cmd); - - return Optional.of(true); - } catch (Exception e) { - log.info(e.getMessage()); - - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("월별 입력 항목 관리 생성 중 오류: " + e.getMessage(), e); } } @@ -55,8 +38,7 @@ class AutoSchedulesDao implements AutoSchedulesPortOut { } catch (Exception e) { log.error("[AutoSchedule][monthlyCarryOver] message: {}", e.getMessage(), e); - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("일계부 월초이월금 생성 중 오류: " + e.getMessage(), e); } } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java index 984ccafd..5c6abc8a 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesMapper.java @@ -1,11 +1,9 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface AutoSchedulesMapper { - void createMonthlyInputStatus(); - void createSmsAutoSend(CreateSmsAutoSendCmd cmd); + String createMonthlyInputStatus(); String createMonthlyCarryOver(); } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java index 5ee03e7a..c2d9d35a 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/web/AutoSchedulesController.java @@ -1,9 +1,6 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.web; -import app.module.admin.config.application.util.DateUiUtil; -import app.module.admin.config.application.util.model.DayRange; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; -import java.time.LocalDate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -17,13 +14,19 @@ public class AutoSchedulesController { this.portIn = portIn; } - // 매 월 1일 1초 마다 실행되는 스케줄러 + /** + * 월별입력상태 등록 + * 매 월 1일 1초 마다 실행되는 스케줄러 + */ @Scheduled(cron = "1 0 0 1 * *") public void fetchArticlesPeriodically() { portIn.operate(); } - // 매일 오후 5시 마다 실행되는 스케줄러 + /** + * 문자자동발송 등록 + * 매일 오후 5시 마다 실행되는 스케줄러 + */ @Scheduled(cron = "0 0 17 * * ?") public void fetchSmsAutoSend() { portIn.sendAutoSms(); @@ -37,14 +40,4 @@ public class AutoSchedulesController { public void fetchMonthlyCarryOver() { portIn.monthlyCarryOver(); } - - /** - * TODO 스케쥴 있다면.. 추가. - */ - - // 매일 오후 5시 마다 실행되는 스케줄러 - @Scheduled(cron = "0 1 * * * ?") - public void fetchSmsAutoSenTest() { - portIn.sendAutoSmsTest(); - } } diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java index 4317bf4b..7720745e 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortIn.java @@ -7,5 +7,4 @@ public interface AutoSchedulesPortIn { Optional operate(); Optional sendAutoSms(); Optional monthlyCarryOver(); - Optional sendAutoSmsTest(); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java index c91b9179..1d9b5328 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/AutoSchedulesPortOut.java @@ -1,11 +1,9 @@ package app.module.admin.usecase.schedule.autoSchedules.ports; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import java.util.Optional; public interface AutoSchedulesPortOut { Optional operate(); - Optional sendAutoSms(CreateSmsAutoSendCmd cmd); Optional monthlyCarryOver(); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java index e5626845..e74033ea 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java @@ -1,38 +1,42 @@ package app.module.admin.usecase.schedule.autoSchedules.ports.application; +import app.module.admin.config.application.batch.BatchLogRunner; import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.config.application.util.model.DayRange; +import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut; -import app.module.admin.usecase.schedule.autoSchedules.ports.application.domain.CreateSmsAutoSendCmd; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortIn; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; +import app.module.mms.ports.MMSPortIn; +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import java.time.LocalDate; import java.util.List; - -import app.module.mms.ports.MMSPortIn; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - import java.util.Optional; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @Service @RequiredArgsConstructor +@Slf4j class AutoSchedulesService implements AutoSchedulesPortIn { private final AutoSchedulesPortOut portOut; private final MMSPortIn mmsPortIn; private final GetSmsAutoStatusPortIn getSmsAutoStatusPortIn; private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn; + private final BatchLogRunner batchLogRunner; @Override public Optional operate() { - return portOut.operate(); + batchLogRunner.run(BatchLogType.MONTHLY_STATUS, portOut::operate); + return Optional.of(true); } @Override @@ -40,63 +44,40 @@ class AutoSchedulesService implements AutoSchedulesPortIn { public Optional sendAutoSms() { GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); - // 문자 자동 발송 활성화 상태 체크 if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) { - System.out.println("문자 발송 비활성화 상태"); + log.info("문자 발송 비활성화 상태"); return Optional.of(false); } LocalDate today = LocalDate.now(); int day = today.getDayOfMonth(); - // 발송일 조건: 8일, 15일, 22일, 1일(다음 달 대상자) if (day == 8 || day == 15 || day == 22 || day == 1) { - // 발송 대상 날짜 범위 구하기 DayRange dayRange = DateUiUtil.getDayRange(today).orElse(null); - if (dayRange == null) return Optional.of(false); + if (dayRange == null) { + log.error("잘못된 날짜({})에 문자 자동 발송 로직이 실행됨 - 발송 대상일이 아님", today); + return Optional.of(false); + } - // 대상 월 계산 (1일 이면 이전 달 / 1일이 아니면 현재 달 yyyyMM 을 가져온다.) LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today; String targetMonth = DateUiUtil.getMonthValue(baseDate); - // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) ); - // 미등록 임가가 있을 경우에만 실행 - if(!CollectionUtils.isEmpty(incompleteHouseholds)) { - portOut.sendAutoSms(new CreateSmsAutoSendCmd( - incompleteHouseholds, - getSmsAutoStatus.getSendPhone(), - getSmsAutoStatus.getMessage() - )); + if (!CollectionUtils.isEmpty(incompleteHouseholds)) { + batchLogRunner.run(BatchLogType.AUTO_SMS, () -> { + mmsPortIn.sendAutoSms(new CreateSmsAutoSendCmd( + incompleteHouseholds, + getSmsAutoStatus.getSendPhone(), + getSmsAutoStatus.getMessage() + )); + }); } - } - - return Optional.of(true); - } - - @Override - public Optional sendAutoSmsTest() { - String targetMonth = "202507"; - DayRange dayRange = new DayRange(1, 7); - GetSmsAutoStatus getSmsAutoStatus = new GetSmsAutoStatus(true, "테스트", "01012345678", null, null); - - // dayRange 날짜 범위의 일계부 미등록한 임가 목록 조회 - List incompleteHouseholds = getIncompleteHouseholdsPortIn.operate( - new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay()) - ); - - System.out.println(incompleteHouseholds); - - // 미등록 임가가 있을 경우에만 실행 - if(!CollectionUtils.isEmpty(incompleteHouseholds)) { - mmsPortIn.sendAutoSms(new app.module.mms.ports.application.domain.CreateSmsAutoSendCmd( - incompleteHouseholds, - getSmsAutoStatus.getSendPhone(), - getSmsAutoStatus.getMessage() - )); + } else { + log.info("문자 발송 날짜 아님."); + return Optional.of(false); } return Optional.of(true); @@ -104,6 +85,7 @@ class AutoSchedulesService implements AutoSchedulesPortIn { @Override public Optional monthlyCarryOver() { - return portOut.monthlyCarryOver(); + batchLogRunner.run(BatchLogType.CARRYOVER, portOut::monthlyCarryOver); + return Optional.of(true); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java deleted file mode 100644 index 4fc03a07..00000000 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/domain/CreateSmsAutoSendCmd.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.admin.usecase.schedule.autoSchedules.ports.application.domain; - -import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateSmsAutoSendCmd { - private List sendHouseholds; - private String sendPhone; - private String message; -} diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java index 7dbc2379..25a9b065 100644 --- a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java @@ -19,16 +19,13 @@ public class MMSDao implements MMSPortOut { @Transactional public Optional sendAutoSms(CreateSmsAutoSendCmd cmd) { try { - log.debug("@@@ sendAutoSmsTest"); - mapper.createSmsAutoSend(cmd); return Optional.of(true); } catch (Exception e) { - log.info(e.getMessage()); + log.error(e.getMessage()); - // 예외 발생 시 false 반환 - return Optional.of(false); + throw new RuntimeException("문자 자동 발송 생성 중 오류: " + e.getMessage(), e); } } } diff --git a/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml new file mode 100644 index 00000000..cf760fd7 --- /dev/null +++ b/admin/src/main/resources/mappers/batchLog/BatchLogMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + SELECT nextval('batch_log_seq') + + + INSERT INTO batch_log (id, type, status, start_at, created_at) + VALUES (#{id}, #{type}, #{status}, #{startAt}, now()) + + + + + UPDATE batch_log + SET status = #{status}, + error_message = #{errorMessage}, + end_at = now() + WHERE id = #{id} + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 2df460ba..c09e4ffe 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -32,7 +32,7 @@ and a.region_main_code = #{searchArea} - and a.account_disabled = #{searchAccountDisabled} + and a.account_disabled = #{searchAccountDisabled}::boolean group by a.seq @@ -62,7 +62,7 @@ and a.region_main_code = #{searchArea} - and a.account_disabled = #{searchAccountDisabled} + and a.account_disabled = #{searchAccountDisabled}::boolean diff --git a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml index 5c862315..cfda9212 100644 --- a/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml +++ b/admin/src/main/resources/mappers/schedule/AutoSchedulesMapper.xml @@ -3,38 +3,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - select fn_monthly_input_status() - - /* createSmsAutoSend : 문자 발송 insert */ - INSERT INTO biz_msg - ( - MSG_TYPE, - CMID, - REQUEST_TIME, - SEND_TIME, - DEST_PHONE, - SEND_PHONE, - MSG_BODY - ) - VALUES - - ( - 5, - TO_CHAR(NOW(), 'YYYYMMDDHH24MISS') || '_' || #{item.householdNum}, - NOW(), - NOW(), - #{item.phone}, - #{sendPhone}, - #{message} - ) - - - - select fn_monthly_carry_over(null) - - + \ No newline at end of file diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index d3d8ffdf..0eeccb8a 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -7,7 +7,7 @@
-
+ @@ -20,7 +20,7 @@

권한

- @@ -33,7 +33,7 @@
- @@ -53,7 +53,7 @@

실사

- @@ -65,7 +65,7 @@

계정사용여부

- @@ -113,7 +113,7 @@ type="checkbox"/> 아이디 - 이름 + 이름 @@ -128,15 +128,17 @@
- - +
+ +
@@ -161,6 +163,8 @@ f.searchRole.value = ''; f.searchArea.value = ''; f.searchDisabled.value = ''; + + goSearch(); } function goUpdate(adminId) { @@ -202,20 +206,20 @@ } } - function goExcel() { - const f = document.adminParamForm; - f.action = '/settings/admins/excel'; - f.sort.value = convertToPageableSortValue(f.sort.value); - f.method = 'post'; - f.submit(); - } - + // function goExcel() { + // const f = document.adminParamForm; + // f.action = '/settings/admins/excel'; + // f.sort.value = convertToPageableSortValue(f.sort.value); + // f.method = 'post'; + // f.submit(); + // } function showAdminExcelUploadModal() { const modal = document.querySelector(".modal02"); modal.ui.open(); } + const uploadAdminExcel = () => { event.preventDefault(); @@ -256,7 +260,6 @@ const closeModal = () => { document.querySelector(".modal02").ui.close(); }; - diff --git a/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html b/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html index 8d17589a..dff7f615 100644 --- a/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html +++ b/admin/src/main/resources/templates/admin/modal/modal-admin-excel.html @@ -33,10 +33,10 @@
-
- -
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/common/list-components.html b/admin/src/main/resources/templates/common/list-components.html index a9ef7c4b..0c486e49 100644 --- a/admin/src/main/resources/templates/common/list-components.html +++ b/admin/src/main/resources/templates/common/list-components.html @@ -12,19 +12,43 @@
diff --git a/admin/src/main/resources/templates/communication/notice/create.html b/admin/src/main/resources/templates/communication/notice/create.html index 024b86a1..8b0b5e87 100644 --- a/admin/src/main/resources/templates/communication/notice/create.html +++ b/admin/src/main/resources/templates/communication/notice/create.html @@ -29,15 +29,17 @@ 첨부파일* -
- +
+ +

첨부 가능 파일 형식: 문서(pdf, docx, xlsx, pptx, hwp), 이미지(jpg, jpeg, png, gif), 기타(zip, + csv, txt) / 파일당 최대 5MB까지 등록 가능합니다.

+
    + +
- - - - @@ -74,8 +76,6 @@ - - @@ -164,7 +164,8 @@ }, // validation fail 422: function (res) { - alert("error"); + debugger + alert(res.responseJSON[0].defaultMessage); // $(res.responseJSON).each((idx, oj) => { // let target = $(f).find('[name=' + oj.field + ']'); // target.addClass('is-invalid'); diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html index 9f248ec7..59487c1a 100644 --- a/admin/src/main/resources/templates/communication/notice/{id}.html +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -220,7 +220,7 @@ }, // validation fail 422: function (res) { - alert('error'); + alert(res.responseJSON[0].defaultMessage); // $(res.responseJSON).each((idx, oj) => { // let target = $(f).find('[name=' + oj.field + ']'); // target.addClass('is-invalid'); diff --git a/admin/src/main/resources/templates/home.html b/admin/src/main/resources/templates/home.html index 8855b4da..fb321878 100644 --- a/admin/src/main/resources/templates/home.html +++ b/admin/src/main/resources/templates/home.html @@ -4,7 +4,7 @@ xmlns:sec="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"> -
+

@@ -402,10 +402,12 @@ null ); } + const activeProfile = '[[${activeProfile}]]'; // 페이지 로드 시 호출 $(document).ready(function() { - getTotalPercentage(); - + if(activeProfile === 'local'){ + getTotalPercentage(); + } $('#usageType').change(function() { getTotalPercentage(); }); diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index fd5b5b5c..fb8b9667 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -137,47 +137,46 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+
+

+ 당일 1차 방문 +

+
+ +
+
+
+

+ 당월 2차 방문 +

+
+ +
+
+
+

+ 답례품 방문 +

+
+ +
+
+
@@ -253,10 +252,9 @@ 업종(대분류) 업종(중분류) 당월 일계부 현황 - - - - + 당월 1차 임가방문 + 당월 2차 임가방문 + 답례품 전달 조사원 조사원 휴대전화 @@ -270,12 +268,12 @@
-
+
- - @@ -366,6 +364,9 @@ ${ct.regionDetailName} ${ifNullHyphen(ct.industryLargeName)} ${ifNullHyphen(ct.industryMiddleName)} + ${ifNullHyphen(ct.firstVisitDate)} + ${ifNullHyphen(ct.secondVisitDate)} + ${ct.isGiftSent ? "전달" : "미전달"} ${ct.progressPercent}% ${ifNullHyphen(ct.researcherName)} ${ifNullHyphen(ct.researcherPhone)} @@ -374,37 +375,10 @@ ); }); - - // ` - // - // - //
- // - //
- // - // ${ct.householdNum} - // ${ct.householdName} - // ${ct.householdPhone} - // ${ct.regionMainName} - // ${ct.regionSubName} - // ${ct.regionDetailName} - // ${ifNullHyphen(ct.industryLargeName)} - // ${ifNullHyphen(ct.industryMiddleName)} - // ${ct.progressPercent}% - // ${ifNullHyphen(ct.firstVisitDate)} - // ${ifNullHyphen(ct.secondVisitDate)} - // ${ct.isGiftSent ? "전달" : "미전달"} - // ${ifNullHyphen(ct.researcherName)} - // ${ifNullHyphen(ct.researcherPhone)} - // - // ` // 현재 로그인한 유저의 역할 const isResearcher = f.userRole.value === 'ROLE_RESEARCHER'; - // const colspanLength = isResearcher ? 13 : 15; - const colspanLength = isResearcher ? 10 : 12; + const colspanLength = isResearcher ? 13 : 15; // 조사원일 경우 조사원이름, 번호 칼럼 hide $('.hide-role-researcher').toggle(!isResearcher); diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 61ac3b8a..55d9e3c7 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -42,9 +42,11 @@
- + + +
@@ -56,7 +58,7 @@
- +