Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator;
|
||||
|
||||
import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO;
|
||||
import app.module.core.config.constants.CommonConstants;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.validation.Errors;
|
||||
import org.springframework.validation.Validator;
|
||||
@@ -63,5 +64,10 @@ public class AdminUpdateValidator implements Validator {
|
||||
errors.rejectValue("regionMainCode", "valid.common.required","필수입력항목을 확인해주세요.");
|
||||
}
|
||||
});
|
||||
|
||||
// [3] 비밀번호 형식 검사
|
||||
if ((vo.getUpdatePassword() != "" && vo.getUpdatePassword() != null )&& !vo.getUpdatePassword().matches(CommonConstants.ADMIN_PASSWORD_REGEX)){
|
||||
errors.rejectValue("updatePassword", "valid.common.password.wrong", CommonConstants.ADMIN_PASSWORD_MSG);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import app.module.core.config.application.exception.NoMatchingURIException;
|
||||
import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -20,8 +21,12 @@ import java.util.List;
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class ChartDao implements ChartPortOut {
|
||||
|
||||
@Value("${spring.profiles.active}")
|
||||
private String activeProfiles;
|
||||
private final ChartMapper chartMapper;
|
||||
private final UICodeListMapper uiCodeListMapper;
|
||||
|
||||
@Override
|
||||
public ChartDto selectTotalPercentage(String usageType) {
|
||||
TotalPercentageReqVO reqVO = new TotalPercentageReqVO();
|
||||
@@ -41,7 +46,7 @@ public class ChartDao implements ChartPortOut {
|
||||
chartMapper.selectTotalPercentage(reqVO),
|
||||
chartMapper.selectLocalRegionPercentage(reqVO),
|
||||
chartMapper.selectLocalRegionResearcherPercentage(reqVO),
|
||||
uiCodeListMapper.findByParentId("code.region.main"));
|
||||
uiCodeListMapper.findByParentId("code.region.main",AdminUtil.getLoginUserRole(),activeProfiles));
|
||||
|
||||
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
|
||||
// 지방 실사 일경우 실사 지역으로만
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.persistence;
|
||||
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence.CheckHouseholdNumMapper;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
|
||||
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
|
||||
@@ -19,6 +20,7 @@ import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElemen
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -33,6 +35,9 @@ import java.util.List;
|
||||
class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut {
|
||||
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(ExcelUploadCreateHouseholdDao.class));
|
||||
|
||||
@Value("${spring.profiles.active}")
|
||||
private String activeProfiles;
|
||||
|
||||
private final CreateHouseholdMapper createHouseholdMapper;
|
||||
private final CheckHouseholdNumMapper checkHouseholdNumMapper;
|
||||
private final UICodeListMapper uiCodeListMapper;
|
||||
@@ -48,10 +53,10 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
Sheet sheet = workbook.getSheetAt(0);
|
||||
int success = 0;
|
||||
|
||||
List<UICodeElement> RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main");
|
||||
List<UICodeElement> RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub");
|
||||
List<UICodeElement> RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main", AdminUtil.getLoginUserRole(), activeProfiles);
|
||||
List<UICodeElement> RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub", AdminUtil.getLoginUserRole(), activeProfiles);
|
||||
List<UICodeElement> RegionDetailCodeList = uiCodeListMapper.findByLikeId("code.region.detail");
|
||||
List<UICodeElement> IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large");
|
||||
List<UICodeElement> IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large", AdminUtil.getLoginUserRole(), activeProfiles);
|
||||
List<UICodeElement> IndustryMiddleCodeList = uiCodeListMapper.findByLikeId("code.industry.middle");
|
||||
|
||||
List<String> errorList = new ArrayList<>();
|
||||
|
||||
@@ -15,6 +15,7 @@ import app.module.mms.ports.MMSPortIn;
|
||||
import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
@@ -34,6 +35,10 @@ class AutoSchedulesService implements AutoSchedulesPortIn {
|
||||
private final GetIncompleteHouseholdsPortIn getIncompleteHouseholdsPortIn;
|
||||
private final BatchLogRunner batchLogRunner;
|
||||
|
||||
// TODO(ks) : 문자발송 테스트
|
||||
@Value("${spring.profiles.active}")
|
||||
private String activeProfiles;
|
||||
|
||||
@Override
|
||||
public Optional<Boolean> operate() {
|
||||
batchLogRunner.run(BatchLogType.MONTHLY_STATUS, portOut::operate);
|
||||
@@ -43,42 +48,44 @@ class AutoSchedulesService implements AutoSchedulesPortIn {
|
||||
@Override
|
||||
@Transactional
|
||||
public Optional<Boolean> sendAutoSms() {
|
||||
GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null);
|
||||
if ("dev".equals(activeProfiles)) { // TODO(ks) : 문자발송 테스트
|
||||
GetSmsAutoStatus getSmsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null);
|
||||
|
||||
if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) {
|
||||
log.info("문자 발송 비활성화 상태");
|
||||
return Optional.of(false);
|
||||
}
|
||||
|
||||
LocalDate today = LocalDate.now();
|
||||
int day = today.getDayOfMonth();
|
||||
|
||||
if (day == 8 || day == 15 || day == 22 || day == 1) {
|
||||
DayRange dayRange = DateUiUtil.getDayRange(today).orElse(null);
|
||||
if (dayRange == null) {
|
||||
log.error("잘못된 날짜({})에 문자 자동 발송 로직이 실행됨 - 발송 대상일이 아님", today);
|
||||
if (getSmsAutoStatus == null || Boolean.FALSE.equals(getSmsAutoStatus.getActive())) {
|
||||
log.info("문자 발송 비활성화 상태");
|
||||
return Optional.of(false);
|
||||
}
|
||||
|
||||
LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today;
|
||||
String targetMonth = DateUiUtil.getMonthValue(baseDate);
|
||||
LocalDate today = LocalDate.now();
|
||||
int day = today.getDayOfMonth();
|
||||
|
||||
List<GetIncompleteHouseholds> incompleteHouseholds = getIncompleteHouseholdsPortIn.operate(
|
||||
new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay())
|
||||
);
|
||||
if (day == 8 || day == 15 || day == 22 || day == 1) {
|
||||
DayRange dayRange = DateUiUtil.getDayRange(today).orElse(null);
|
||||
if (dayRange == null) {
|
||||
log.error("잘못된 날짜({})에 문자 자동 발송 로직이 실행됨 - 발송 대상일이 아님", today);
|
||||
return Optional.of(false);
|
||||
}
|
||||
|
||||
if (!CollectionUtils.isEmpty(incompleteHouseholds)) {
|
||||
batchLogRunner.run(BatchLogType.AUTO_SMS, () -> {
|
||||
mmsPortIn.sendAutoSms(new CreateSmsAutoSendCmd(
|
||||
incompleteHouseholds,
|
||||
getSmsAutoStatus.getSendPhone(),
|
||||
getSmsAutoStatus.getMessage()
|
||||
));
|
||||
});
|
||||
LocalDate baseDate = (day == 1) ? today.minusMonths(1) : today;
|
||||
String targetMonth = DateUiUtil.getMonthValue(baseDate);
|
||||
|
||||
List<GetIncompleteHouseholds> incompleteHouseholds = getIncompleteHouseholdsPortIn.operate(
|
||||
new GetIncompleteHouseholdsCmd(targetMonth, dayRange.getFromDay(), dayRange.getToDay())
|
||||
);
|
||||
|
||||
if (!CollectionUtils.isEmpty(incompleteHouseholds)) {
|
||||
batchLogRunner.run(BatchLogType.AUTO_SMS, () -> {
|
||||
mmsPortIn.sendAutoSms(new CreateSmsAutoSendCmd(
|
||||
incompleteHouseholds,
|
||||
getSmsAutoStatus.getSendPhone(),
|
||||
getSmsAutoStatus.getMessage()
|
||||
));
|
||||
});
|
||||
}
|
||||
} else {
|
||||
log.info("문자 발송 날짜 아님.");
|
||||
return Optional.of(false);
|
||||
}
|
||||
} else {
|
||||
log.info("문자 발송 날짜 아님.");
|
||||
return Optional.of(false);
|
||||
}
|
||||
|
||||
return Optional.of(true);
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package app.module.mms.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.logging.SafeLogger;
|
||||
import app.module.mms.ports.MMSPortOut;
|
||||
import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -11,6 +13,7 @@ import java.util.Optional;
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
public class MMSDao implements MMSPortOut {
|
||||
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(MMSDao.class));
|
||||
|
||||
private final MMSMapper mapper;
|
||||
|
||||
@@ -22,8 +25,8 @@ public class MMSDao implements MMSPortOut {
|
||||
|
||||
return Optional.of(true);
|
||||
} catch (Exception e) {
|
||||
|
||||
throw new RuntimeException("문자 자동 발송 생성 중 오류: " + e.getMessage(), e);
|
||||
safeLogger.error("문자 자동 발송 생성 중 오류가 발생했습니다.",e);
|
||||
throw new RuntimeException("문자 자동 발송 생성 중 오류: " + e, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,8 @@ import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@@ -16,4 +18,9 @@ public class CreateSmsAutoSendCmd {
|
||||
private List<GetIncompleteHouseholds> sendHouseholds;
|
||||
private String sendPhone;
|
||||
private String message;
|
||||
|
||||
public void setSendHouseholds(List<GetIncompleteHouseholds> sendHouseholds) {
|
||||
this.sendHouseholds = Collections.unmodifiableList(new ArrayList<>(sendHouseholds));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -24,5 +24,7 @@
|
||||
)
|
||||
AND dr.all_status NOT IN ('DONE', 'TODAY_NONE')
|
||||
)
|
||||
AND region_main_code = 'code.region.main.99' /* TODO(ks) : 문자발송 테스트 */
|
||||
AND phone != '010-1111-1111' /* TODO(ks) : 문자발송 테스트 */
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -58,7 +58,7 @@
|
||||
<div class="chart-group type-orange">
|
||||
<dl>
|
||||
<dt>
|
||||
<strong>일계부 진행률</strong>
|
||||
<strong>답례품 전달률</strong>
|
||||
<span>(전체 임가 기준)</span>
|
||||
</dt>
|
||||
<dd>
|
||||
|
||||
Reference in New Issue
Block a user