code 테스트 지역 보이기 수정

This commit is contained in:
주수현
2025-07-18 13:59:00 +09:00
parent a2898eedad
commit 54e09b0b5e
11 changed files with 64 additions and 12 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;
@@ -21,8 +24,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

@@ -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 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>