Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-06-23 08:48:57 +09:00
19 changed files with 54 additions and 119 deletions

View File

@@ -45,6 +45,7 @@ public class AdminDetailsService implements UserDetailsService {
adminUser.getId(),
adminUser.getPassword(),
adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null),
adminUser.getRegionMainCode(),
!accountDisabled,
true,
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),

View File

@@ -9,6 +9,7 @@ import org.springframework.security.core.userdetails.User;
public class AdminUser extends User {
private Long seq;
private String roleId;
private String regionMainCode;
private long remainPasswordDays;
public AdminUser(
@@ -16,6 +17,7 @@ public class AdminUser extends User {
String username,
String password,
String roleId,
String regionMainCode,
boolean enabled,
boolean accountNonExpired,
boolean credentialsNonExpired,
@@ -32,6 +34,7 @@ public class AdminUser extends User {
authorities);
this.seq = seq;
this.roleId = roleId;
this.regionMainCode = regionMainCode;
this.remainPasswordDays = remainPasswordDays;
}
}

View File

@@ -43,4 +43,14 @@ public class AdminUtil {
AdminUser user = (AdminUser) authentication.getPrincipal();
return user.getSeq();
}
public static String getLoginUserRegionMainCode() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) {
return null;
}
AdminUser user = (AdminUser) authentication.getPrincipal();
return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode();
}
}

View File

@@ -1,16 +1,11 @@
package app.module.admin.usecase.researcher.adpaters.persistence;
import app.module.admin.config.application.enums.ManagementType;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.config.application.util.model.EnumDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitPopUpDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.*;
import app.module.admin.usecase.researcher.adpaters.web.model.*;
import app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence.GetPopupHouseholdsMapper;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
import app.module.core.config.application.annotation.UpdateCommand;
import app.module.core.config.application.util.CommonUtil;
@@ -33,8 +28,13 @@ public class ResearcherDao implements ResearcherPortOut {
@Override
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
List<ResearchersDto> result = researcherMapper.list(reqVO);
// 지방 실사 권한 일경우 실사 지역으로만
if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
reqVO.setSearchArea(AdminUtil.getLoginUserRegionMainCode());
}
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
List<ResearchersDto> result = researcherMapper.list(reqVO);
long total = researcherMapper.countAll(reqVO);
return new PageImpl<>(result, pageable, total);

View File

@@ -1,13 +1,9 @@
package app.module.admin.usecase.researcher.adpaters.persistence;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.*;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersVisitDetailReqVO;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;

View File

@@ -1,9 +1,8 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain;
package app.module.admin.usecase.researcher.adpaters.persistence.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain;
package app.module.admin.usecase.researcher.adpaters.persistence.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.researcher.adpaters.web;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.researcher.adpaters.web.model.*;
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
import lombok.RequiredArgsConstructor;
@@ -9,6 +10,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
@Slf4j
@RestController

View File

@@ -1,16 +1,20 @@
package app.module.admin.usecase.researcher.adpaters.web;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.usecase.researcher.adpaters.web.model.GetResearchersUIReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailUIReqVO;
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import java.util.Objects;
@Slf4j
@Controller
@@ -22,8 +26,18 @@ class ResearcherController {
@GetMapping(path = "/researchers")
public String operate(Model model, @ModelAttribute("reqVO") GetResearchersUIReqVO reqVO) {
String roleId = AdminUtil.getLoginUserRole();
log.info("####################AdminUtil.getLoginUserRegionMainCode()={}",AdminUtil.getLoginUserRegionMainCode());
if("ROLE_LOCAL_INSPECTOR".equals(roleId)) {
model.addAttribute("inspectionArea",
uiCodeListPortIn.connect("code.region.main").stream()
.filter(code -> Objects.equals(AdminUtil.getLoginUserRegionMainCode(), code.getId()))
.toList());
}else{
model.addAttribute("inspectionArea", uiCodeListPortIn.connect("code.region.main"));
}
model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows"));
model.addAttribute("inspectionArea", uiCodeListPortIn.connect("code.region.main"));
return "researcher/researchers";
}

View File

@@ -1,25 +0,0 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortOut;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetPopupHouseholdsDao implements GetPopupHouseholdsPortOut {
private final GetPopupHouseholdsMapper mapper;
@Override
public Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd) {
List<GetPopupHouseholds> result = mapper.getPopupHouseholds(pageable, cmd);
return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getHouseholdSeq());
}
}

View File

@@ -1,14 +0,0 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
@Mapper
public interface GetPopupHouseholdsMapper {
List<GetPopupHouseholds> getPopupHouseholds(@Param("pageable") Pageable pageable,
@Param("cmd") GetPopupHouseholdsCmd cmd);
}

View File

@@ -1,10 +0,0 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface GetPopupHouseholdsPortIn {
Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd);
}

View File

@@ -1,10 +0,0 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface GetPopupHouseholdsPortOut {
Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd);
}

View File

@@ -1,21 +0,0 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortIn;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortOut;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetPopupHouseholdsService implements GetPopupHouseholdsPortIn {
private final GetPopupHouseholdsPortOut portOut;
@Override
public Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd) {
return portOut.operate(pageable, cmd);
}
}

View File

@@ -1,11 +1,7 @@
package app.module.admin.usecase.researcher.ports;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitPopUpDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.*;
import app.module.admin.usecase.researcher.adpaters.web.model.*;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import org.springframework.data.domain.Page;
import java.util.List;

View File

@@ -1,11 +1,7 @@
package app.module.admin.usecase.researcher.ports;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitPopUpDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.*;
import app.module.admin.usecase.researcher.adpaters.web.model.*;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import org.springframework.data.domain.Page;
import java.util.List;
@@ -18,6 +14,6 @@ public interface ResearcherPortOut {
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
Integer visitHouseholdDelete(List<Integer> selectIds);
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
Page<app.module.admin.usecase.researcher.adpaters.persistence.model.GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
}

View File

@@ -1,11 +1,7 @@
package app.module.admin.usecase.researcher.ports.application;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitPopUpDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.*;
import app.module.admin.usecase.researcher.adpaters.web.model.*;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
import lombok.RequiredArgsConstructor;

View File

@@ -211,7 +211,7 @@
</update>
<select id="getPopupHouseholds"
resultType="app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds">
resultType="app.module.admin.usecase.researcher.adpaters.persistence.model.GetPopupHouseholds">
SELECT
hvr.*,
COUNT(*) OVER () AS total

View File

@@ -164,11 +164,13 @@
<hgroup class="page-tit-group" th:fragment="pageHeading">
<h2 class="page-tit" th:text="${#messages.msg(currentURI.id)}"></h2>
<div class="location" >
<a th:href="${item.uri}" th:if="${item.id != currentURI.id}" th:each="item, status : ${menuHierarchy}">
<span th:if="${status.first}" th:remove="tag">홈</span>
<span th:if="${!status.first}" th:remove="tag"
th:text="${@coreUtil.getUriTitle(item)}"></span>
</a>
<th:block th:each="item, status : ${menuHierarchy}">
<a th:if="${status.first}" th:href="${item.uri}" >홈</a>
<a th:if="${!status.first and item.id != currentURI.id}"
th:href="${item.uri}"
th:text="${@coreUtil.getUriTitle(item)}"></a>
<span th:if="${!status.first and item.id == currentURI.id}" th:text="${@coreUtil.getUriTitle(item)}" ></span>
</th:block>
</div>
</hgroup>