diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index aa2f1b77..a883cca1 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -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()), 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 67b1291a..4fabf639 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 @@ -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; } } diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index e4cc9778..0bb07840 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -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(); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index cbb109e5..a746c5ad 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -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 list(ResearchersListReqVO reqVO) { - List result = researcherMapper.list(reqVO); + // 지방 실사 권한 일경우 실사 지역으로만 + if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { + reqVO.setSearchArea(AdminUtil.getLoginUserRegionMainCode()); + } + Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); + List result = researcherMapper.list(reqVO); long total = researcherMapper.countAll(reqVO); return new PageImpl<>(result, pageable, total); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java index 96b89a2d..da23f937 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholds.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/GetPopupHouseholds.java similarity index 86% rename from admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholds.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/GetPopupHouseholds.java index a693efd4..04a45d5e 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholds.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/GetPopupHouseholds.java @@ -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 diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholdsCmd.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/GetPopupHouseholdsCmd.java similarity index 83% rename from admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholdsCmd.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/GetPopupHouseholdsCmd.java index 84fe7e59..52f13db8 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholdsCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/GetPopupHouseholdsCmd.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index d38df218..d9a4ea86 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -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 diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java index 28a086e5..dd9b9349 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java @@ -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"; } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsDao.java deleted file mode 100644 index ec15f7a3..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsDao.java +++ /dev/null @@ -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 operate(Pageable pageable, GetPopupHouseholdsCmd cmd) { - - List result = mapper.getPopupHouseholds(pageable, cmd); - - return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getHouseholdSeq()); - } -} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsMapper.java deleted file mode 100644 index c767d3f7..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsMapper.java +++ /dev/null @@ -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(@Param("pageable") Pageable pageable, - @Param("cmd") GetPopupHouseholdsCmd cmd); -} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortIn.java deleted file mode 100644 index 4baf0dea..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortIn.java +++ /dev/null @@ -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 operate(Pageable pageable, GetPopupHouseholdsCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortOut.java deleted file mode 100644 index b173a073..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortOut.java +++ /dev/null @@ -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 operate(Pageable pageable, GetPopupHouseholdsCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/GetPopupHouseholdsService.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/GetPopupHouseholdsService.java deleted file mode 100644 index 7e644605..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/GetPopupHouseholdsService.java +++ /dev/null @@ -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 operate(Pageable pageable, GetPopupHouseholdsCmd cmd) { - return portOut.operate(pageable, cmd); - } -} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java index ee7a2c8c..e5e2652f 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java index 047dac65..caf95b57 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java @@ -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 selectIds); - Page searchMappingHousehold(HouseholdSearchReqVO reqVO); + Page searchMappingHousehold(HouseholdSearchReqVO reqVO); Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java index 43fc3ed1..c590aab5 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java @@ -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; diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 73785ead..f5c8a24e 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -211,7 +211,7 @@