From d60bb1e7c7e4a6f1a50527fdd95bf207c70f959e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 17 Jun 2025 14:29:58 +0900 Subject: [PATCH] =?UTF-8?q?api=EB=A1=9C=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/ResearchersHouseholdVisitDto.java | 3 +- .../service/ResearcherServiceImpl.java | 3 -- .../web/ResearcherApiController.java | 49 +++++++++++++++++++ .../researcher/web/ResearcherController.java | 38 +------------- .../common/modal-household-mapping.html | 4 +- .../templates/researcher/detail.html | 6 +-- .../templates/researcher/researchers.html | 4 +- 7 files changed, 60 insertions(+), 47 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherApiController.java 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/persistence/model/ResearchersHouseholdVisitDto.java index 85a45761..2032d861 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/persistence/model/ResearchersHouseholdVisitDto.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.researcher.persistence.model; +import app.module.admin.config.application.enums.ManagementType; import lombok.Data; import java.time.LocalDateTime; @@ -13,7 +14,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/service/ResearcherServiceImpl.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java index 9f0ab65f..ed3d5868 100644 --- 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 @@ -73,7 +73,6 @@ public class ResearcherServiceImpl implements ResearcherService { @Override public Page searchMappingHousehold(HouseholdSearchReqVO reqVO) { Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); - List households = getPopupHouseholdsMapper.getPopupHouseholds(pageable, new GetPopupHouseholdsCmd( reqVO.getOwnerField(), @@ -84,7 +83,6 @@ public class ResearcherServiceImpl implements ResearcherService { reqVO.getIsPanel(), reqVO.getIsMapping() )); - return new PageImpl<>(households, pageable, households.isEmpty() ? 0 : households.get(0).getTotal()); } @@ -97,7 +95,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/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherApiController.java new file mode 100644 index 00000000..385dc947 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherApiController.java @@ -0,0 +1,49 @@ +package app.module.admin.usecase.researcher.web; + +import app.module.admin.usecase.researcher.service.ResearcherService; +import app.module.admin.usecase.researcher.web.model.*; +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 ResearcherService researcherService; + + @GetMapping(path = "/list") + ResponseEntity operate( @ModelAttribute("reqVO") ResearchersListReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherService.list(reqVO)); + } + + @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/java/app/module/admin/usecase/researcher/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java index 1af34d21..c54ae362 100644 --- 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 @@ -6,13 +6,10 @@ 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 @@ -29,48 +26,17 @@ class ResearcherController { 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/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 },