Merge branch 'susu' into dev
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.config.application.util.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class EnumDto {
|
||||
private String id;
|
||||
private String codeText;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package app.module.admin.usecase.admin.checkAdminId.adapters.web;
|
||||
|
||||
import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class AdminIdDuplicateCheckPostController {
|
||||
|
||||
private final CheckAdminIdPortIn checkAdminIdPortIn;
|
||||
|
||||
@GetMapping("/api/settings/admin/idCheck")
|
||||
ResponseEntity<?> updateMappingHousehold(@RequestParam String id ) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(checkAdminIdPortIn.connect(id));
|
||||
}
|
||||
}
|
||||
@@ -45,7 +45,9 @@ class AdminExcelController {
|
||||
new GetAdminsCmd(
|
||||
adminListFilterVO.getSearchField(),
|
||||
adminListFilterVO.getSearchValue(),
|
||||
adminListFilterVO.getSearchRole()));
|
||||
adminListFilterVO.getSearchRole(),
|
||||
adminListFilterVO.getSearchArea(),
|
||||
adminListFilterVO.getSearchDisabled()));
|
||||
|
||||
if (CollectionUtils.isNotEmpty(listOutput.getContent())) {
|
||||
// Header
|
||||
|
||||
@@ -37,11 +37,14 @@ class AdminListController {
|
||||
new GetAdminsCmd(
|
||||
adminListFilterVO.getSearchField(),
|
||||
adminListFilterVO.getSearchValue(),
|
||||
adminListFilterVO.getSearchRole()));
|
||||
adminListFilterVO.getSearchRole(),
|
||||
adminListFilterVO.getSearchArea(),
|
||||
adminListFilterVO.getSearchDisabled()));
|
||||
|
||||
model.addAttribute("listOutput", listOutput);
|
||||
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
|
||||
model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows"));
|
||||
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
|
||||
|
||||
return "admin/adminList";
|
||||
}
|
||||
|
||||
@@ -12,4 +12,6 @@ public class AdminListFilterVO {
|
||||
private String searchField;
|
||||
private String searchValue;
|
||||
private String searchRole;
|
||||
private String searchArea;
|
||||
private String searchDisabled;
|
||||
}
|
||||
|
||||
@@ -18,8 +18,10 @@ public class AdminCreateGetController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/settings/admins/create")
|
||||
String operate(Model model, @ModelAttribute("bindingVO") AdminCreateBindingVO bindingVO) {
|
||||
String operate(Model model) {
|
||||
|
||||
AdminCreateBindingVO bindingVO = new AdminCreateBindingVO();
|
||||
model.addAttribute("bindingVO", bindingVO);
|
||||
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
|
||||
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
|
||||
|
||||
|
||||
@@ -9,49 +9,42 @@ import app.module.core.usecase.role.list.ports.RoleListPortIn;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import jakarta.validation.Valid;
|
||||
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.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.validation.ObjectError;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
@Controller
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
public class AdminCreatePostController {
|
||||
|
||||
private final RoleListPortIn roleListPortIn;
|
||||
private final MessageUtil messageUtil;
|
||||
private final SaveAdminPortIn savePortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final AdminCreateValidator adminCreateValidator;
|
||||
|
||||
@PostMapping(path = "/settings/admins/create")
|
||||
String operate(
|
||||
RedirectAttributes redirectAttributes,
|
||||
Model model,
|
||||
@Valid @ModelAttribute("bindingVO") AdminCreateBindingVO bindingVO,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
@PostMapping(path = "/api/settings/admin/create")
|
||||
ResponseEntity<?> operate(@RequestBody AdminCreateBindingVO bindingVO, BindingResult bindingResult ) {
|
||||
adminCreateValidator.validate(bindingVO, bindingResult);
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN));
|
||||
model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main"));
|
||||
return "admin/adminCreateForm";
|
||||
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult.getAllErrors().get(0).getDefaultMessage());
|
||||
}
|
||||
|
||||
savePortIn.connect(
|
||||
bindingVO.getSeq(),
|
||||
bindingVO.getId(),
|
||||
bindingVO.getPassword(),
|
||||
bindingVO.getRegionMainCode(),
|
||||
bindingVO.getAccountDisabled(),
|
||||
bindingVO.getRoleIds());
|
||||
|
||||
redirectAttributes.addFlashAttribute(
|
||||
"operationMessage",
|
||||
messageUtil.getMessage("operation.settings.admin.created", bindingVO.getId()));
|
||||
|
||||
return "redirect:/settings/admins";
|
||||
return ResponseEntity.status(HttpStatus.OK).body(
|
||||
savePortIn.apiConnect(bindingVO.getSeq(),
|
||||
bindingVO.getId(),
|
||||
bindingVO.getPassword(),
|
||||
bindingVO.getName(),
|
||||
"010"+bindingVO.getPhone1()+bindingVO.getPhone2(),
|
||||
bindingVO.getRegionMainCode(),
|
||||
bindingVO.getAccountDisabled(),
|
||||
bindingVO.getRoleId()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,6 +53,8 @@ class AdminUpdateGetController {
|
||||
output.getSeq(),
|
||||
output.getId(),
|
||||
null,
|
||||
output.getName(),
|
||||
output.getPhone(),
|
||||
output.getRegionMainCode(),
|
||||
output.getPasswordUpdatedAt(),
|
||||
output.getAccountDisabled(),
|
||||
|
||||
@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class AdminUpdatePostController {
|
||||
@@ -40,13 +42,15 @@ class AdminUpdatePostController {
|
||||
return "admin/adminUpdateForm";
|
||||
}
|
||||
|
||||
saveAdminPortIn.connect(
|
||||
saveAdminPortIn.apiConnect(
|
||||
bindingVO.getSeq(),
|
||||
bindingVO.getId(),
|
||||
bindingVO.getUpdatePassword(),
|
||||
bindingVO.getName(),
|
||||
bindingVO.getPhone(),
|
||||
bindingVO.getRegionMainCode(),
|
||||
bindingVO.getAccountDisabled(),
|
||||
bindingVO.getRoleIds());
|
||||
bindingVO.getRoleIds().stream().collect(Collectors.joining()));
|
||||
|
||||
redirectAttributes.addFlashAttribute(
|
||||
"operationMessage",
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
package app.module.admin.usecase.admin.saveAdmin.adapters.web.model;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class AdminCreateBindingVO {
|
||||
private Long seq;
|
||||
private String id;
|
||||
private String password;
|
||||
|
||||
private String name;
|
||||
private String phone1;
|
||||
private String phone2;
|
||||
private String regionMainCode;
|
||||
/* @NotBlank(message = "{valid.common.required}")
|
||||
@Pattern(
|
||||
regexp =
|
||||
@@ -24,6 +27,5 @@ public class AdminCreateBindingVO {
|
||||
|
||||
private Boolean accountDisabled;
|
||||
/* private Boolean accountLocked;*/
|
||||
private List<String> roleIds;
|
||||
private String regionMainCode;
|
||||
private String roleId;
|
||||
}
|
||||
|
||||
@@ -32,6 +32,8 @@ public class AdminUpdateBindingVO implements AuditOutput {
|
||||
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
|
||||
message = "{valid.common.email.wrong}")
|
||||
private String email;*/
|
||||
private String name;
|
||||
private String phone;
|
||||
private String regionMainCode;
|
||||
|
||||
private LocalDateTime passwordUpdatedAt;
|
||||
|
||||
@@ -10,7 +10,10 @@ import org.springframework.validation.Validator;
|
||||
@Component
|
||||
public class AdminCreateValidator implements Validator {
|
||||
|
||||
private final String PASSWORD_REGEX = "^((?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%_\\-])\\S{6,15})$";
|
||||
// 아이디: 4~15자, 영문/숫자/한글/특수문자(_,-) 허용
|
||||
private final String ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$";
|
||||
// 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상
|
||||
private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$";
|
||||
|
||||
@Override
|
||||
public boolean supports(Class<?> clazz) {
|
||||
@@ -21,25 +24,50 @@ public class AdminCreateValidator implements Validator {
|
||||
public void validate(Object target, Errors errors) {
|
||||
AdminCreateBindingVO vo = (AdminCreateBindingVO) target;
|
||||
|
||||
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "valid.common.required");
|
||||
if (vo.getRoleId() == null || vo.getRoleId().isEmpty()) {
|
||||
errors.rejectValue("roleId", "error.roleId", "권한을 선택해주세요.");
|
||||
}
|
||||
|
||||
if (vo.getAccountDisabled() == null ) {
|
||||
errors.rejectValue("accountDisabled", "error.accountDisabled", "사용여부를 선택해주세요.");
|
||||
}
|
||||
|
||||
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "id", "valid.common.required","아이디는 필수입력값입니다.");
|
||||
Optional.ofNullable(vo.getId())
|
||||
.filter(id -> !id.matches(ID_REGEX))
|
||||
.ifPresent(id -> errors.rejectValue("id", "valid.common.id.wrong","아이디를 4~15자, 영문/숫자/한글/특수문자(_,-) 입니다."));
|
||||
|
||||
// 비밀번호 유효성 검사
|
||||
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "valid.common.required","비밀번호는 필수입력값입니다.");
|
||||
|
||||
Optional.ofNullable(vo.getPassword())
|
||||
.filter(password -> !password.matches(PASSWORD_REGEX))
|
||||
.ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong"));
|
||||
|
||||
Optional.ofNullable(vo.getRoleIds())
|
||||
.filter(ids -> ids.size() < 1)
|
||||
.ifPresent(
|
||||
ids ->
|
||||
errors.rejectValue(
|
||||
"roleIds", "valid.common.required.size.min", new Object[]{1}, ""));
|
||||
.ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong","비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."));
|
||||
|
||||
if (vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) {
|
||||
if (vo.getName() == null || vo.getName().isBlank()) {
|
||||
errors.rejectValue("name", "error.name", "이름을 입력해주세요.");
|
||||
}
|
||||
if (vo.getName().length() > 4) {
|
||||
errors.rejectValue("name", "error.name", "이름은 4자리까지 입력가능합니다.");
|
||||
}
|
||||
if (vo.getPhone1() == null || vo.getPhone1().isBlank()) {
|
||||
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요.");
|
||||
} else if (!vo.getPhone1().matches("^\\d{4}$")) {
|
||||
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다.");
|
||||
}
|
||||
if (vo.getPhone2() == null || vo.getPhone2().isBlank()) {
|
||||
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리를 입력해주세요.");
|
||||
} else if (!vo.getPhone2().matches("^\\d{4}$")) {
|
||||
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다.");
|
||||
}
|
||||
}
|
||||
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
|
||||
Optional.ofNullable(vo.getRoleIds())
|
||||
.filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN")))
|
||||
Optional.ofNullable(vo.getRoleId())
|
||||
.filter(id -> !id.equals("ROLE_ADMIN"))
|
||||
.ifPresent(nonAdmins -> {
|
||||
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
|
||||
errors.rejectValue("regionMainCode", "valid.common.required");
|
||||
errors.rejectValue("regionMainCode", "valid.common.required","실사지역은 필수입력값입니다.");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.persistence;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
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.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;
|
||||
@@ -8,10 +12,7 @@ import app.module.admin.usecase.researcher.adpaters.persistence.model.Researcher
|
||||
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.annotation.UpdateCommand;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -21,6 +22,7 @@ import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@@ -28,7 +30,6 @@ import java.util.List;
|
||||
@RequiredArgsConstructor
|
||||
public class ResearcherDao implements ResearcherPortOut {
|
||||
private final ResearcherMapper researcherMapper;
|
||||
private final GetPopupHouseholdsMapper getPopupHouseholdsMapper;
|
||||
|
||||
@Override
|
||||
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
|
||||
@@ -61,6 +62,21 @@ public class ResearcherDao implements ResearcherPortOut {
|
||||
return new PageImpl<>(result, pageable, total);
|
||||
}
|
||||
|
||||
@Override
|
||||
@UpdateCommand
|
||||
public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) {
|
||||
return researcherMapper.updateVisitHousehold(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id) {
|
||||
ResearchersHouseholdVisitDto result = researcherMapper.visitHouseholdDetail(id);
|
||||
List<EnumDto> managementTypeList = Arrays.stream(ManagementType.values())
|
||||
.map(type -> new EnumDto(type.name(), type.getDesc()))
|
||||
.toList();
|
||||
return new ResearchersHouseholdVisitPopUpDto(result, managementTypeList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer visitHouseholdDelete(List<Integer> selectIds) {
|
||||
String deletedBy = CommonUtil.getLoginUsername();
|
||||
|
||||
@@ -5,6 +5,7 @@ import app.module.admin.usecase.researcher.adpaters.persistence.model.Researcher
|
||||
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.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;
|
||||
@@ -22,9 +23,12 @@ public interface ResearcherMapper {
|
||||
List<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id);
|
||||
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> 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> getPopupHouseholds(@Param("pageable") Pageable pageable, @Param("cmd") GetPopupHouseholdsCmd cmd);
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.persistence.model;
|
||||
|
||||
import app.module.admin.config.application.util.model.EnumDto;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class ResearchersHouseholdVisitPopUpDto {
|
||||
private ResearchersHouseholdVisitDto researchersHouseholdVisitDto;
|
||||
private List<EnumDto> managementTypeList;
|
||||
}
|
||||
@@ -1,9 +1,6 @@
|
||||
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.adpaters.web.model.*;
|
||||
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -30,11 +27,21 @@ class ResearcherApiController {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/visitHouseholdList")
|
||||
@GetMapping(path = "/visitHousehold/list")
|
||||
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO));
|
||||
}
|
||||
|
||||
@PostMapping(path = "/visitHousehold")
|
||||
ResponseEntity<?> updateVisitHousehold(@RequestBody ResearchersVisitDetailReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.updateVisitHousehold(reqVO));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/visitHousehold/{id}")
|
||||
ResponseEntity<?> visitHouseholdDetail( @PathVariable Integer id) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDetail(id));
|
||||
}
|
||||
|
||||
@DeleteMapping(path = "/visitHousehold/remove")
|
||||
ResponseEntity<?> visitHouseholdDelete( @RequestBody List<Integer> selectIds) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDelete(selectIds));
|
||||
|
||||
@@ -40,4 +40,6 @@ class ResearcherController {
|
||||
return "researcher/detail";
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.web.model;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class ResearchersVisitDetailReqVO {
|
||||
private String id;
|
||||
private String visitDate;
|
||||
private ManagementType managementType;
|
||||
private String content;
|
||||
private String isGiftSentFlag;
|
||||
}
|
||||
@@ -2,11 +2,9 @@ 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.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.adpaters.web.model.*;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||
import org.springframework.data.domain.Page;
|
||||
|
||||
@@ -17,6 +15,8 @@ public interface ResearcherPortIn {
|
||||
ResearchersDto detail(Integer adminSeq);
|
||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
||||
|
||||
@@ -2,11 +2,9 @@ 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.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.adpaters.web.model.*;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||
import org.springframework.data.domain.Page;
|
||||
|
||||
@@ -17,6 +15,8 @@ public interface ResearcherPortOut {
|
||||
ResearchersDto detail(Integer adminSeq);
|
||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
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.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.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;
|
||||
@@ -25,26 +23,42 @@ class ResearcherService implements ResearcherPortIn {
|
||||
public Page<ResearchersDto> list(ResearchersListReqVO reqVO){
|
||||
return portOut.list(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResearchersDto detail(Integer adminSeq){
|
||||
return portOut.detail(adminSeq);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO){
|
||||
return portOut.mappingHouseholdList(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO){
|
||||
return portOut.visitHouseholdList(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) {
|
||||
return portOut.updateVisitHousehold(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id) {
|
||||
return portOut.visitHouseholdDetail(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer visitHouseholdDelete(List<Integer> selectIds){
|
||||
return portOut.visitHouseholdDelete(selectIds);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO){
|
||||
return portOut.searchMappingHousehold(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO){
|
||||
return portOut.updateMappingHousehold(reqVO);
|
||||
|
||||
Reference in New Issue
Block a user