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/persistence/ResearcherMapper.java new file mode 100644 index 00000000..59d297db --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.researcher.persistence; + +import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; +import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto; +import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ResearcherMapper { + + List list(ResearchersListReqVO reqVO); + Long countAll(ResearchersListReqVO reqVO); + ResearchersDto detail(Integer adminSeq); + List mappingHouseholdList(Integer adminSeq); + ResearchersDto mappingHouseholdVisitInfoList(Integer adminSeq); + +} 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/persistence/model/ResearchersDto.java new file mode 100644 index 00000000..61d67849 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.researcher.persistence.model; + +import lombok.Data; + + +@Data +public class ResearchersDto { + 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/persistence/model/ResearchersMappingHouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java new file mode 100644 index 00000000..92579305 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.researcher.persistence.model; + +import lombok.Data; + + +@Data +public class ResearchersMappingHouseholdDto { + private String seq; + private String householdNum; + private String name; + private String phone; + private String regionMainCodeName; + private String regionSubCodeName; + private String regionDetailCodeName; + private String industryLargeCodeName; + private String industryMiddleCodeName; + private String panelFlag; +} 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 new file mode 100644 index 00000000..24a9c65e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.researcher.service; + +import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; +import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +import org.springframework.data.domain.Page; + + +public interface ResearcherService { + Page list(ResearchersListReqVO reqVO); + ResearchersDto detail(Integer adminSeq); + +} 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/service/ResearcherServiceImpl.java new file mode 100644 index 00000000..90f93fe1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java @@ -0,0 +1,37 @@ +package app.module.admin.usecase.researcher.service; + +import app.module.admin.usecase.researcher.persistence.ResearcherMapper; + +import app.module.admin.usecase.researcher.persistence.model.ResearchersDto; +import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor +public class ResearcherServiceImpl implements ResearcherService { + private final ResearcherMapper researcherMapper; + + @Override + public Page list(ResearchersListReqVO reqVO) { + List result = researcherMapper.list(reqVO); + Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); + long total = researcherMapper.countAll(reqVO); + + return new PageImpl<>(result, pageable, total); + } + + @Override + public ResearchersDto detail(Integer adminSeq) { + return researcherMapper.detail(adminSeq); + } + +} 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 new file mode 100644 index 00000000..86735b80 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java @@ -0,0 +1,43 @@ +package app.module.admin.usecase.researcher.web; + +import app.module.admin.usecase.researcher.service.ResearcherService; +import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +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.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import app.module.admin.usecase.researcher.web.model.GetResearchersUIReqVO; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/researcher") +class ResearchersController { + 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 = "/detail/{seq}") + public String operateDetail(Model model, @PathVariable Integer seq) { + model.addAttribute("researcherDto", researcherService.detail(seq));; + return "researcher/researchers/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/web/model/GetResearchersUIReqVO.java new file mode 100644 index 00000000..b960b119 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/GetResearchersUIReqVO.java @@ -0,0 +1,36 @@ +package app.module.admin.usecase.researcher.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.thymeleaf.util.StringUtils; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetResearchersUIReqVO { + private Integer page; + private String sort; + private Integer size; + private String searchField; + private String searchValue; + private String searchArea; + private String searchAccountDisabled; + + public Integer getPage() { + // 요청 페이지 넘버 - 초기값 `0` + return page != null ? page : 0; + } + + public String getSort() { + // 정렬 값 - 초기값 `orderNo 내림차순` + return StringUtils.isEmpty(sort) ? "orderNo,DESC" : sort; + } + + public Integer getSize() { + // 페이지 당 아이템 수 - 초기값 `10` + return size != null ? size : 10; + } +} 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/web/model/ResearchersListReqVO.java new file mode 100644 index 00000000..4dddadd9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersListReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.researcher.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.thymeleaf.util.StringUtils; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class ResearchersListReqVO { + private Integer page; + private Integer size; + private String searchField; + private String searchValue; + private String searchArea; + private String searchAccountDisabled; + + public Integer getPage() { + // 요청 페이지 넘버 - 초기값 `0` + return page != null ? page : 0; + } + + public Integer getSize() { + // 페이지 당 아이템 수 - 초기값 `10` + return size != null ? size : 10; + } +}