Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-07-18 14:00:16 +09:00
15 changed files with 76 additions and 14 deletions

View File

@@ -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,11 @@ public class AdminUpdateValidator implements Validator {
errors.rejectValue("regionMainCode", "valid.common.required","필수입력항목을 확인해주세요.");
}
});
// [3] 비밀번호 형식 검사
if (!vo.getUpdatePassword().matches(CommonConstants.ADMIN_PASSWORD_REGEX)) {
errors.rejectValue("password", "valid.common.password.wrong",
CommonConstants.ADMIN_PASSWORD_MSG);
}
}
}

View File

@@ -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())) {
// 지방 실사 일경우 실사 지역으로만

View File

@@ -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<>();

View File

@@ -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);
}
}
}

View File

@@ -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));
}
}

View File

@@ -58,7 +58,7 @@
<div class="chart-group type-orange">
<dl>
<dt>
<strong>일계부 진행률</strong>
<strong>답례품 전달률</strong>
<span>(전체 임가 기준)</span>
</dt>
<dd>

View File

@@ -89,6 +89,25 @@ public class CommonUtil {
return username;
}
public static String getLoginUserRole() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) {
return null;
}
Object principal = authentication.getPrincipal();
if (principal instanceof UserDetails) {
UserDetails userDetails = (UserDetails) principal;
if (!userDetails.getAuthorities().isEmpty()) {
return userDetails.getAuthorities().stream()
.map(auth -> auth.getAuthority())
.filter(authority -> authority != null && authority.startsWith("ROLE_"))
.findFirst()
.orElse(null);
}
}
return null;
}
public static HttpServletRequest getRequest() {
HttpServletRequest request = null;
if (RequestContextHolder.getRequestAttributes() != null) {

View File

@@ -30,7 +30,7 @@ public final class CommonConstants {
* 관리자 비밀번호 생성 규칙
* [정책] 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상
*/
public static final String ADMIN_PASSWORD_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$";
public static final String ADMIN_PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_-])[a-zA-Z0-9가-힣!@#$%_-]{5,15}$";
/**
* 관리자 비밀번호 유효성 실패 메시지

View File

@@ -1,6 +1,7 @@
package app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence;
import app.module.core.config.application.util.AuditUtil;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.admin.checkAdminId.persistence.CheckAdminIdMapper;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelAdminCreateVO;
import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO;
@@ -12,6 +13,7 @@ import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +26,8 @@ import java.util.List;
@Component
@RequiredArgsConstructor
class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
@Value("${spring.profiles.active}")
private String activeProfiles;
private final CheckAdminIdMapper checkAdminIdMapper;
private final SaveAdminMapper saveAdminMapper;
@@ -37,7 +41,7 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
Workbook workbook = WorkbookFactory.create(file.getInputStream());
Sheet sheet = workbook.getSheetAt(0);
Integer success = 0;
List<UICodeElement> uiCodeElementList = uiCodeListMapper.findByParentId("code.region.main");
List<UICodeElement> uiCodeElementList = uiCodeListMapper.findByParentId("code.region.main", CommonUtil.getLoginUserRole(),activeProfiles);
// 첫 번째 행은 헤더로 간주하고 스킵
for (int i = 1; i <= sheet.getLastRowNum(); i++) {
Row row = sheet.getRow(i);

View File

@@ -1,20 +1,27 @@
package app.module.core.usecase.uicode.list.adapters.persistence;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.uicode.list.ports.UICodeListPortOut;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
import java.util.List;
@Slf4j
@Repository
@RequiredArgsConstructor
class UICodeListDao implements UICodeListPortOut {
@Value("${spring.profiles.active}")
private String activeProfiles;
private final UICodeListMapper uiCodeListMapper;
@Override
public List<UICodeElement> connect(String parentId) {
return uiCodeListMapper.findByParentId(parentId);
return uiCodeListMapper.findByParentId(parentId,CommonUtil.getLoginUserRole(),activeProfiles);
}
}

View File

@@ -8,6 +8,6 @@ import java.util.List;
@Mapper
public interface UICodeListMapper {
List<UICodeElement> findByParentId(@Param("parentId") String parentId);
List<UICodeElement> findByParentId(@Param("parentId") String parentId,@Param("role")String role,@Param("activeProfiles")String activeProfiles);
List<UICodeElement> findByLikeId(@Param("id") String id);
}

View File

@@ -16,7 +16,9 @@
FROM uicode
WHERE parent_id = #{parentId}
AND is_deleted = false
AND in_use = true
<if test="( activeProfiles == 'prod' and role != 'ROLE_ADMIN' ) or (role != 'ROLE_ADMIN')">
AND in_use = true
</if>
ORDER BY order_no ASC
</select>

View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2ZM12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4ZM12.1025 10.6299C12.6067 10.6812 13 11.1073 13 11.625V15.5322C13.4312 15.6433 13.75 16.0341 13.75 16.5C13.75 17.0523 13.3023 17.5 12.75 17.5H12C11.4477 17.5 11 17.0523 11 16.5V12.5918C10.5689 12.4806 10.25 12.0908 10.25 11.625C10.25 11.0727 10.6977 10.625 11.25 10.625H12L12.1025 10.6299ZM11.8125 6.375C12.6409 6.375 13.3125 7.04657 13.3125 7.875C13.3125 8.70343 12.6409 9.375 11.8125 9.375C10.9841 9.375 10.3125 8.70343 10.3125 7.875C10.3125 7.04657 10.9841 6.375 11.8125 6.375Z" fill="#4BBC43"/>
</svg>

After

Width:  |  Height:  |  Size: 834 B

File diff suppressed because one or more lines are too long

View File

@@ -17,7 +17,7 @@
th:with="accoClass=${#strings.containsIgnoreCase(menu.uri, '/record') ? 'acco': ''}
, infoClass=${#strings.containsIgnoreCase(menu.uri, '/info') ? 'info': ''}
, statusClass=${#strings.containsIgnoreCase(menu.uri, '/status') ? 'regi': ''}
, guideClass=${#strings.containsIgnoreCase(menu.uri, '/guide') ? 'use': ''}"
, guideClass=${#strings.containsIgnoreCase(menu.uri, '/guide') ? 'guid': ''}"
th:class="|${accoClass}${infoClass}${statusClass}${guideClass}|"
th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, menu.id)}? 'active'">
<!--/* 자식 nodes 가 없는 경우 */-->