diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java similarity index 75% rename from admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index 9f0ab65f..ec0be769 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -1,20 +1,17 @@ -package app.module.admin.usecase.researcher.service; +package app.module.admin.usecase.researcher.adpaters.persistence; -import app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence.GetHouseholdsStatusMapper; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; 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.persistence.ResearcherMapper; -import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; -import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; -import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; -import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO; -import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +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.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO; import app.module.core.config.application.util.CommonUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -29,7 +26,7 @@ import java.util.List; @Slf4j @Service @RequiredArgsConstructor -public class ResearcherServiceImpl implements ResearcherService { +public class ResearcherDao implements ResearcherPortOut { private final ResearcherMapper researcherMapper; private final GetPopupHouseholdsMapper getPopupHouseholdsMapper; @@ -73,8 +70,7 @@ public class ResearcherServiceImpl implements ResearcherService { @Override public Page searchMappingHousehold(HouseholdSearchReqVO reqVO) { Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); - - List households = getPopupHouseholdsMapper.getPopupHouseholds(pageable, + List households = researcherMapper.getPopupHouseholds(pageable, new GetPopupHouseholdsCmd( reqVO.getOwnerField(), reqVO.getOwnerValue(), @@ -84,7 +80,6 @@ public class ResearcherServiceImpl implements ResearcherService { reqVO.getIsPanel(), reqVO.getIsMapping() )); - return new PageImpl<>(households, pageable, households.isEmpty() ? 0 : households.get(0).getTotal()); } @@ -97,7 +92,6 @@ public class ResearcherServiceImpl implements ResearcherService { researcherMapper.deleteHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy); i += researcherMapper.insertHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy); } - return i; } } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java similarity index 54% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java index 30a63b6b..db557054 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java @@ -1,12 +1,15 @@ -package app.module.admin.usecase.researcher.persistence; +package app.module.admin.usecase.researcher.adpaters.persistence; -import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; -import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; -import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; -import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +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.web.model.ResearchersDetailReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO; +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; import java.util.List; @@ -21,9 +24,7 @@ public interface ResearcherMapper { List visitHouseholdList(ResearchersDetailReqVO reqVO); Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(@Param("selectIds") List selectIds,@Param("deletedBy") String deletedBy); - void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy); Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy); - - + List getPopupHouseholds(@Param("pageable") Pageable pageable, @Param("cmd") GetPopupHouseholdsCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersDto.java similarity index 80% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersDto.java index 6034eed0..11b215fd 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersDto.java @@ -1,8 +1,7 @@ -package app.module.admin.usecase.researcher.persistence.model; +package app.module.admin.usecase.researcher.adpaters.persistence.model; import lombok.Data; - @Data public class ResearchersDto { private Long seq; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java similarity index 68% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java index 85a45761..cf12ec9b 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java @@ -1,10 +1,9 @@ -package app.module.admin.usecase.researcher.persistence.model; +package app.module.admin.usecase.researcher.adpaters.persistence.model; +import app.module.admin.config.application.enums.ManagementType; import lombok.Data; - import java.time.LocalDateTime; - @Data public class ResearchersHouseholdVisitDto { private String id; @@ -13,7 +12,7 @@ public class ResearchersHouseholdVisitDto { private String householdNum; private String ownerName; private String visitDate; - private String managementType; + private ManagementType managementType; private String content; private String isGiftSentFlag; private LocalDateTime createdAt; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersMappingHouseholdDto.java similarity index 85% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersMappingHouseholdDto.java index 8df195ac..76b4c09c 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersMappingHouseholdDto.java @@ -1,8 +1,7 @@ -package app.module.admin.usecase.researcher.persistence.model; +package app.module.admin.usecase.researcher.adpaters.persistence.model; import lombok.Data; - @Data public class ResearchersMappingHouseholdDto { private String seq; 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 new file mode 100644 index 00000000..cdac49cb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -0,0 +1,52 @@ +package app.module.admin.usecase.researcher.adpaters.web; + +import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO; +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.ports.ResearcherPortIn; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping(path = "/api/researcher") +class ResearcherApiController { + private final ResearcherPortIn researcherPortIn; + + @GetMapping(path = "/list") + ResponseEntity operate( @ModelAttribute("reqVO") ResearchersListReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.list(reqVO)); + } + + @GetMapping(path = "/mappingHouseholdList") + ResponseEntity mappingHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO)); + } + + @GetMapping(path = "/visitHouseholdList") + ResponseEntity visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO)); + } + + @DeleteMapping(path = "/visitHousehold/remove") + ResponseEntity visitHouseholdDelete( @RequestBody List selectIds) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDelete(selectIds)); + } + + @GetMapping("/mappingHousehold/search") + ResponseEntity searchMappingHousehold(HouseholdSearchReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.searchMappingHousehold(reqVO)); + } + + @PostMapping("/mappingHousehold/update") + ResponseEntity updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.updateMappingHousehold(reqVO)); + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..6d62b867 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java @@ -0,0 +1,43 @@ +package app.module.admin.usecase.researcher.adpaters.web; + +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 lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + + +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/researcher") +class ResearcherController { + private final UICodeListPortIn uiCodeListPortIn; + private final ResearcherPortIn researcherPortIn; + + @GetMapping(path = "/researchers") + public String operate(Model model, @ModelAttribute("reqVO") GetResearchersUIReqVO reqVO) { + model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows")); + model.addAttribute("inspectionArea", uiCodeListPortIn.connect("code.region.main")); + return "researcher/researchers"; + } + + @GetMapping(path = "/{adminSeq}") + public String operateDetail(Model model, @PathVariable Integer adminSeq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) { + model.addAttribute("researcherDto", researcherPortIn.detail(adminSeq)); + model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); + model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); + // 모달용 지역 + model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); + // 모달용 세부지역 + model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); + + return "researcher/detail"; + } + +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/GetResearchersUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/GetResearchersUIReqVO.java similarity index 93% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/GetResearchersUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/GetResearchersUIReqVO.java index b960b119..9caa21a1 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/GetResearchersUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/GetResearchersUIReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.web.model; +package app.module.admin.usecase.researcher.adpaters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java similarity index 91% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java index 6043c4a8..dcdf7caa 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.web.model; +package app.module.admin.usecase.researcher.adpaters.web.model; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/MappingHouseholdListReqVO.java similarity index 76% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/MappingHouseholdListReqVO.java index a78b0687..45c8a35e 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/MappingHouseholdListReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.web.model; +package app.module.admin.usecase.researcher.adpaters.web.model; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailReqVO.java similarity index 88% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailReqVO.java index aa125d49..f5337e74 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.web.model; +package app.module.admin.usecase.researcher.adpaters.web.model; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java similarity index 90% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java index 795dfaf0..b2da51d3 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.web.model; +package app.module.admin.usecase.researcher.adpaters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersListReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java similarity index 91% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersListReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java index 4dddadd9..35e0850b 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersListReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.web.model; +package app.module.admin.usecase.researcher.adpaters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java deleted file mode 100644 index d57de63a..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package app.module.admin.usecase.researcher.persistence.model; - -import lombok.Data; - - -@Data -public class HouseholdDto { - private Long seq; - private String id; - private String name; - private String phone; - private String regionMainCodeName; - private Integer householdCount; - private String accountDisabledFlag; -} 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 new file mode 100644 index 00000000..ce675d33 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -0,0 +1,23 @@ +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.ResearchersMappingHouseholdDto; +import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO; +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.getPopupHouseholds.ports.application.domain.GetPopupHouseholds; +import org.springframework.data.domain.Page; + +import java.util.List; + +public interface ResearcherPortIn { + Page list(ResearchersListReqVO reqVO); + ResearchersDto detail(Integer adminSeq); + Page mappingHouseholdList(ResearchersDetailReqVO reqVO); + Page visitHouseholdList(ResearchersDetailReqVO reqVO); + Integer visitHouseholdDelete(List selectIds); + 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/ResearcherPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java new file mode 100644 index 00000000..339ebb63 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java @@ -0,0 +1,23 @@ +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.ResearchersMappingHouseholdDto; +import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO; +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.getPopupHouseholds.ports.application.domain.GetPopupHouseholds; +import org.springframework.data.domain.Page; + +import java.util.List; + +public interface ResearcherPortOut { + Page list(ResearchersListReqVO reqVO); + ResearchersDto detail(Integer adminSeq); + Page mappingHouseholdList(ResearchersDetailReqVO reqVO); + Page visitHouseholdList(ResearchersDetailReqVO reqVO); + Integer visitHouseholdDelete(List selectIds); + 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 new file mode 100644 index 00000000..55849eeb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java @@ -0,0 +1,53 @@ +package app.module.admin.usecase.researcher.ports.application; + +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.adpaters.web.model.HouseholdSearchReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO; +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.ports.ResearcherPortIn; +import app.module.admin.usecase.researcher.ports.ResearcherPortOut; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +class ResearcherService implements ResearcherPortIn { + private final ResearcherPortOut portOut; + + @Override + public Page list(ResearchersListReqVO reqVO){ + return portOut.list(reqVO); + } + @Override + public ResearchersDto detail(Integer adminSeq){ + return portOut.detail(adminSeq); + } + @Override + public Page mappingHouseholdList(ResearchersDetailReqVO reqVO){ + return portOut.mappingHouseholdList(reqVO); + } + @Override + public Page visitHouseholdList(ResearchersDetailReqVO reqVO){ + return portOut.visitHouseholdList(reqVO); + } + @Override + public Integer visitHouseholdDelete(List selectIds){ + return portOut.visitHouseholdDelete(selectIds); + } + @Override + public Page searchMappingHousehold(HouseholdSearchReqVO reqVO){ + return portOut.searchMappingHousehold(reqVO); + } + @Override + public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO){ + return portOut.updateMappingHousehold(reqVO); + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java deleted file mode 100644 index e558a688..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java +++ /dev/null @@ -1,26 +0,0 @@ -package app.module.admin.usecase.researcher.service; - -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; -import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds; -import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; -import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto; -import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; -import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO; -import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO; -import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; -import org.springframework.data.domain.Page; - -import java.util.List; - - -public interface ResearcherService { - Page list(ResearchersListReqVO reqVO); - ResearchersDto detail(Integer adminSeq); - Page mappingHouseholdList(ResearchersDetailReqVO reqVO); - Page visitHouseholdList(ResearchersDetailReqVO reqVO); - Integer visitHouseholdDelete(List selectIds); - Page searchMappingHousehold(HouseholdSearchReqVO reqVO); - Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); - -} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java deleted file mode 100644 index 1af34d21..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java +++ /dev/null @@ -1,76 +0,0 @@ -package app.module.admin.usecase.researcher.web; - -import app.module.admin.config.application.util.DateUiUtil; -import app.module.admin.usecase.researcher.service.ResearcherService; -import app.module.admin.usecase.researcher.web.model.*; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@Slf4j -@Controller -@RequiredArgsConstructor -@RequestMapping(path = "/researcher") -class ResearcherController { - private final UICodeListPortIn uiCodeListPortIn; - private final ResearcherService researcherService; - - @GetMapping(path = "/researchers") - public String operate(Model model, @ModelAttribute("reqVO") GetResearchersUIReqVO reqVO) { - model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows")); - model.addAttribute("inspectionArea", uiCodeListPortIn.connect("code.region.main")); - return "researcher/researchers"; - } - - @GetMapping(path = "/list") - ResponseEntity operate( @ModelAttribute("reqVO") ResearchersListReqVO reqVO) { - return ResponseEntity.status(HttpStatus.OK).body(researcherService.list(reqVO)); - } - - @GetMapping(path = "/{adminSeq}") - public String operateDetail(Model model, @PathVariable Integer adminSeq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) { - model.addAttribute("researcherDto", researcherService.detail(adminSeq)); - model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); - model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); - - //모달용 - // 지역 - model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); - // 세부지역 - model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); - - return "researcher/detail"; - } - - @GetMapping(path = "/mappingHouseholdList") - ResponseEntity mappingHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { - return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO)); - } - - @GetMapping(path = "/visitHouseholdList") - ResponseEntity visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { - return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO)); - } - - @DeleteMapping(path = "/visitHousehold/remove") - ResponseEntity visitHouseholdDelete( @RequestBody List selectIds) { - return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdDelete(selectIds)); - } - - @GetMapping("/mappingHousehold/search") - ResponseEntity searchMappingHousehold(HouseholdSearchReqVO reqVO) { - return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO)); - } - - @PostMapping("/mappingHousehold/update") - ResponseEntity updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) { - return ResponseEntity.status(HttpStatus.OK).body(researcherService.updateMappingHousehold(reqVO)); - } -} \ No newline at end of file diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index b08ac843..4f998561 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -1,9 +1,9 @@ - + - select a.seq, a.id, @@ -35,7 +35,7 @@ LIMIT #{size} OFFSET #{page}*#{size} - select COUNT(a.seq) from admin a join admin_has_role ahr ON a.seq = ahr.admin_seq @@ -186,4 +186,83 @@ #{createdBy} ) + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/common/modal-household-mapping.html b/admin/src/main/resources/templates/common/modal-household-mapping.html index 692f52b7..ad6f2862 100644 --- a/admin/src/main/resources/templates/common/modal-household-mapping.html +++ b/admin/src/main/resources/templates/common/modal-household-mapping.html @@ -176,7 +176,7 @@ f.regionMainCode.value = regionMainCode; let dataOj = $(f).serializeObject(); ajaxUtil._ajaxMethod( - '/researcher/mappingHousehold/search', + '/api/researcher/mappingHousehold/search', dataOj, function (response) { $('#mappingHouseholdTotalElements').text(response.totalElements); @@ -242,7 +242,7 @@ }; ajaxUtil._ajaxMethod( - '/researcher/mappingHousehold/update', + '/api/researcher/mappingHousehold/update', JSON.stringify(data), function (response) { if (response === selectedIds.length) { diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 4cf4e946..3e512ee7 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -178,7 +178,7 @@ f.page.value = pageNo; let dataOj = $(f).serializeObject(); ajaxUtil._ajaxMethod( - '/researcher/mappingHouseholdList', + '/api/researcher/mappingHouseholdList', dataOj, function (response) { $('#household-totalElements').text(response.totalElements); @@ -248,7 +248,7 @@ }; ajaxUtil._ajaxMethod( - '/researcher/visitHouseholdList', + '/api/researcher/visitHouseholdList', dataObj, function (response) { $('#household-totalElements').text(response.totalElements); @@ -337,7 +337,7 @@ const data = $(f).serializeObject(); ajaxUtil._ajaxMethod( - '/researcher/visitHousehold/remove', + '/api/researcher/visitHousehold/remove', JSON.stringify(selectIds), function (response) { if(response > 0){ diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 16967ea2..237e38f2 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -113,7 +113,7 @@ let dataOj = $(f).serializeObject(); ajaxUtil._ajaxMethod( - '/researcher/list', + '/api/researcher/list', dataOj, function (response) { $('#totalElements').text(response.totalElements); @@ -215,7 +215,7 @@ $.ajax({ 'method': 'DELETE', - 'url': '/researchers/remove', + 'url': '/api/researchers/remove', 'data': { 'selectIds': data.selectIds },