Merge branch 'susu' into dev
This commit is contained in:
@@ -44,10 +44,8 @@ public class AdminCreatePostController {
|
||||
bindingVO.getSeq(),
|
||||
bindingVO.getId(),
|
||||
bindingVO.getPassword(),
|
||||
bindingVO.getEmail(),
|
||||
bindingVO.getRegionMainCode(),
|
||||
bindingVO.getAccountDisabled(),
|
||||
bindingVO.getAccountLocked(),
|
||||
bindingVO.getRoleIds());
|
||||
|
||||
redirectAttributes.addFlashAttribute(
|
||||
|
||||
@@ -53,12 +53,9 @@ class AdminUpdateGetController {
|
||||
output.getSeq(),
|
||||
output.getId(),
|
||||
null,
|
||||
output.getEmail(),
|
||||
output.getRegionMainCode(),
|
||||
output.getPasswordUpdatedAt(),
|
||||
output.getAccountDisabled(),
|
||||
output.getLoginFailCnt(),
|
||||
output.getAccountLocked(),
|
||||
output.getRoles().stream().map(CoreRole::getId).collect(Collectors.toList()));
|
||||
|
||||
model.addAttribute("bindingVO", bindingVO);
|
||||
|
||||
@@ -44,10 +44,8 @@ class AdminUpdatePostController {
|
||||
bindingVO.getSeq(),
|
||||
bindingVO.getId(),
|
||||
bindingVO.getUpdatePassword(),
|
||||
bindingVO.getEmail(),
|
||||
bindingVO.getRegionMainCode(),
|
||||
bindingVO.getAccountDisabled(),
|
||||
bindingVO.getAccountLocked(),
|
||||
bindingVO.getRoleIds());
|
||||
|
||||
redirectAttributes.addFlashAttribute(
|
||||
|
||||
@@ -15,15 +15,15 @@ public class AdminCreateBindingVO {
|
||||
private String id;
|
||||
private String password;
|
||||
|
||||
@NotBlank(message = "{valid.common.required}")
|
||||
/* @NotBlank(message = "{valid.common.required}")
|
||||
@Pattern(
|
||||
regexp =
|
||||
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
|
||||
message = "{valid.common.email.wrong}")
|
||||
private String email;
|
||||
private String email;*/
|
||||
|
||||
private Boolean accountDisabled;
|
||||
private Boolean accountLocked;
|
||||
/* private Boolean accountLocked;*/
|
||||
private List<String> roleIds;
|
||||
private String regionMainCode;
|
||||
}
|
||||
|
||||
@@ -26,17 +26,17 @@ public class AdminUpdateBindingVO implements AuditOutput {
|
||||
private String id;
|
||||
private String updatePassword;
|
||||
|
||||
@NotBlank(message = "{valid.common.required}")
|
||||
/* @NotBlank(message = "{valid.common.required}")
|
||||
@Pattern(
|
||||
regexp =
|
||||
"^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$",
|
||||
message = "{valid.common.email.wrong}")
|
||||
private String email;
|
||||
private String email;*/
|
||||
private String regionMainCode;
|
||||
|
||||
private LocalDateTime passwordUpdatedAt;
|
||||
private Boolean accountDisabled;
|
||||
private Integer loginFailCnt;
|
||||
private Boolean accountLocked;
|
||||
/* private Integer loginFailCnt;
|
||||
private Boolean accountLocked;*/
|
||||
private List<String> roleIds;
|
||||
}
|
||||
|
||||
@@ -45,4 +45,8 @@ public class GetHouseholdsStatusCmd {
|
||||
// 로그인한 유저 실사 지역
|
||||
private String userRegionMainCode;
|
||||
|
||||
public GetHouseholdsStatusCmd(String searchRegionMainCode) {
|
||||
this.regionMainCode = searchRegionMainCode;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
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;
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
package app.module.admin.usecase.researcher.service;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
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.MappingHouseholdListUIReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
||||
import org.springframework.data.domain.Page;
|
||||
@@ -16,4 +18,5 @@ public interface ResearcherService {
|
||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||
Page<GetHouseholdsStatus> reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
package app.module.admin.usecase.researcher.service;
|
||||
|
||||
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.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.MappingHouseholdListUIReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
@@ -23,6 +27,7 @@ import java.util.List;
|
||||
@RequiredArgsConstructor
|
||||
public class ResearcherServiceImpl implements ResearcherService {
|
||||
private final ResearcherMapper researcherMapper;
|
||||
private final GetHouseholdsStatusMapper householdsStatusMapper;
|
||||
|
||||
@Override
|
||||
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
|
||||
@@ -60,4 +65,15 @@ public class ResearcherServiceImpl implements ResearcherService {
|
||||
String deletedBy = CommonUtil.getLoginUsername();
|
||||
return researcherMapper.visitHouseholdDelete(selectIds,deletedBy);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<GetHouseholdsStatus> reginMainCodeHouseholdList(MappingHouseholdListUIReqVO reqVO) {
|
||||
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
|
||||
|
||||
List<GetHouseholdsStatus> householdsStatus = householdsStatusMapper.getHouseholdsStatus(pageable,
|
||||
new GetHouseholdsStatusCmd(reqVO.getSearchRegionMainCode()));
|
||||
|
||||
return new PageImpl<>(householdsStatus, pageable,
|
||||
householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,7 @@ 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.ResearchersDetailReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersDetailUIReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
|
||||
import app.module.admin.usecase.researcher.web.model.*;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
@@ -12,7 +10,6 @@ import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import app.module.admin.usecase.researcher.web.model.GetResearchersUIReqVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -48,6 +45,13 @@ class ResearcherController {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO));
|
||||
}
|
||||
|
||||
@GetMapping(path = "/mappingHousehold/list")
|
||||
String mappingHouseholdResearcherList(Model model, @ModelAttribute("reqVO") MappingHouseholdListUIReqVO reqVO) {
|
||||
model.addAttribute("householdDto", researcherService.reginMainCodeHouseholdList(reqVO));
|
||||
return "researcher/mappingHouserhold";
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(path = "/visitHouseholdList")
|
||||
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO));
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.admin.usecase.researcher.web.model;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class MappingHouseholdListUIReqVO {
|
||||
private Integer page;
|
||||
private Integer size;
|
||||
private String searchRegionMainCode;
|
||||
|
||||
public Integer getPage() {
|
||||
// 요청 페이지 넘버 - 초기값 `0`
|
||||
return page != null ? page : 0;
|
||||
}
|
||||
|
||||
public Integer getSize() {
|
||||
// 페이지 당 아이템 수 - 초기값 `10`
|
||||
return size != null ? size : 10;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user