Merge remote-tracking branch 'origin/dev' into daily
This commit is contained in:
@@ -45,6 +45,7 @@ public class AdminDetailsService implements UserDetailsService {
|
||||
adminUser.getId(),
|
||||
adminUser.getPassword(),
|
||||
adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null),
|
||||
adminUser.getRegionMainCode(),
|
||||
!accountDisabled,
|
||||
true,
|
||||
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),
|
||||
|
||||
@@ -9,6 +9,7 @@ import org.springframework.security.core.userdetails.User;
|
||||
public class AdminUser extends User {
|
||||
private Long seq;
|
||||
private String roleId;
|
||||
private String regionMainCode;
|
||||
private long remainPasswordDays;
|
||||
|
||||
public AdminUser(
|
||||
@@ -16,6 +17,7 @@ public class AdminUser extends User {
|
||||
String username,
|
||||
String password,
|
||||
String roleId,
|
||||
String regionMainCode,
|
||||
boolean enabled,
|
||||
boolean accountNonExpired,
|
||||
boolean credentialsNonExpired,
|
||||
@@ -32,6 +34,7 @@ public class AdminUser extends User {
|
||||
authorities);
|
||||
this.seq = seq;
|
||||
this.roleId = roleId;
|
||||
this.regionMainCode = regionMainCode;
|
||||
this.remainPasswordDays = remainPasswordDays;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,4 +43,14 @@ public class AdminUtil {
|
||||
AdminUser user = (AdminUser) authentication.getPrincipal();
|
||||
return user.getSeq();
|
||||
}
|
||||
|
||||
public static String getLoginUserRegionMainCode() {
|
||||
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
||||
if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
AdminUser user = (AdminUser) authentication.getPrincipal();
|
||||
return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
class CheckHouseholdNumController {
|
||||
private final CheckHouseholdNumPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/households/check")
|
||||
@GetMapping(path = "/api/households/check")
|
||||
ResponseEntity<CheckHouseholdNum> operate(
|
||||
@Valid CheckHouseholdNumReqVO reqVO) {
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ class CreateHouseholdController {
|
||||
private final CreateHouseholdValidator validator;
|
||||
private final CreateHouseholdPortIn createHouseholdPortIn;
|
||||
|
||||
@PostMapping(path = "/api/household/households/create")
|
||||
@PostMapping(path = "/api/households/create")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody CreateHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
@@ -16,14 +16,14 @@ class CreateHouseholdUIController {
|
||||
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/create")
|
||||
@GetMapping(path = "/households/create")
|
||||
String operate(Model model, @ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
|
||||
// 임가 등록 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/household/households";
|
||||
return "redirect:/households";
|
||||
}
|
||||
|
||||
// 실사
|
||||
@@ -37,6 +37,6 @@ class CreateHouseholdUIController {
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
|
||||
return "household/households/create";
|
||||
return "households/create";
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||
class GetHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/{seq}")
|
||||
@GetMapping(path = "/households/{seq}")
|
||||
String operate(
|
||||
@PathVariable Long seq,
|
||||
@RequestParam(required = false) String recordMonth,
|
||||
@@ -34,6 +34,6 @@ class GetHouseholdStatusUIController {
|
||||
model.addAttribute("householdInfo",
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
|
||||
return "household/households/{seq}";
|
||||
return "households/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,7 @@ import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model
|
||||
class GetHouseholdsStatusController {
|
||||
private final GetHouseholdsStatusPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/households")
|
||||
@GetMapping(path = "/api/households")
|
||||
ResponseEntity<Page<GetHouseholdsStatus>> operate(
|
||||
@PageableDefault(size = 10) Pageable pageable,
|
||||
GetHouseholdsStatusReqVO reqVO) {
|
||||
|
||||
@@ -3,7 +3,6 @@ package app.module.admin.usecase.household.getHouseholdsStatusUI;
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatusUI.model.GetHouseholdsUIReqVO;
|
||||
import app.module.core.config.adapters.persistence.entity.Admin;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
||||
@@ -20,7 +19,7 @@ class GetHouseholdsStatusUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households")
|
||||
@GetMapping(path = "/households")
|
||||
String operate(
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) {
|
||||
@@ -56,6 +55,6 @@ class GetHouseholdsStatusUIController {
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
|
||||
return "household/households";
|
||||
return "households/households";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoDao implements GetHouseholdVisitInfoPortOut {
|
||||
private final GetHouseholdVisitInfoMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd) {
|
||||
return mapper.getHouseholdVisitInfo(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetHouseholdVisitInfoMapper {
|
||||
Optional<GetHouseholdVisitInfo> getHouseholdVisitInfo(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoReqVO;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoController {
|
||||
private final GetHouseholdVisitInfoPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/visitInfo/{id}")
|
||||
ResponseEntity<?> operate(
|
||||
@PathVariable Long id,
|
||||
GetHouseholdVisitInfoReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(portIn.operate(new GetHouseholdVisitInfoCmd(id)).orElse(null));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoReqVO {
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoResVO {
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
|
||||
public interface GetHouseholdVisitInfoPortIn {
|
||||
Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
|
||||
public interface GetHouseholdVisitInfoPortOut {
|
||||
Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoService implements GetHouseholdVisitInfoPortIn {
|
||||
private final GetHouseholdVisitInfoPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfo {
|
||||
private Long id;
|
||||
private Long householdSeq;
|
||||
private Date visitDate;
|
||||
private ManagementType managementType;
|
||||
private String content;
|
||||
private Boolean isGiftSent;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoCmd {
|
||||
private Long id;
|
||||
}
|
||||
@@ -20,7 +20,7 @@ class UpdateHouseholdController {
|
||||
private final UpdateHouseholdValidator validator;
|
||||
private final UpdateHouseholdPortIn updateHouseholdPortIn;
|
||||
|
||||
@PutMapping(path = "/api/household/households/update")
|
||||
@PutMapping(path = "/api/households/update")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody UpdateHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
@@ -23,7 +23,7 @@ class UpdateHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/update/{seq}")
|
||||
@GetMapping(path = "/households/update/{seq}")
|
||||
String operate(@PathVariable Long seq, Model model,
|
||||
@ModelAttribute("reqVO") UpdateHouseholdStatusUIReqVO reqVO,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
@@ -31,7 +31,7 @@ class UpdateHouseholdStatusUIController {
|
||||
// 임가 수정 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/household/households";
|
||||
return "redirect:/households";
|
||||
}
|
||||
|
||||
model.addAttribute("seq", seq);
|
||||
@@ -80,6 +80,6 @@ class UpdateHouseholdStatusUIController {
|
||||
result.getResearcherPhone()
|
||||
));
|
||||
|
||||
return "household/households/update/{seq}";
|
||||
return "households/update/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,11 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.persistence;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
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.persistence.model.*;
|
||||
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;
|
||||
|
||||
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.core.config.application.annotation.UpdateCommand;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
@@ -33,8 +28,13 @@ public class ResearcherDao implements ResearcherPortOut {
|
||||
|
||||
@Override
|
||||
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
|
||||
List<ResearchersDto> result = researcherMapper.list(reqVO);
|
||||
// 지방 실사 권한 일경우 실사 지역으로만
|
||||
if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
|
||||
reqVO.setSearchArea(AdminUtil.getLoginUserRegionMainCode());
|
||||
}
|
||||
|
||||
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
|
||||
List<ResearchersDto> result = researcherMapper.list(reqVO);
|
||||
long total = researcherMapper.countAll(reqVO);
|
||||
|
||||
return new PageImpl<>(result, pageable, total);
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.persistence;
|
||||
|
||||
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.persistence.model.*;
|
||||
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;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain;
|
||||
package app.module.admin.usecase.researcher.adpaters.persistence.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@@ -1,4 +1,4 @@
|
||||
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain;
|
||||
package app.module.admin.usecase.researcher.adpaters.persistence.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.web;
|
||||
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.admin.usecase.researcher.adpaters.web.model.*;
|
||||
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -9,6 +10,7 @@ import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
package app.module.admin.usecase.researcher.adpaters.web;
|
||||
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
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 app.module.core.usecase.uicode.view.ports.UICodeViewPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
|
||||
@Slf4j
|
||||
@Controller
|
||||
@@ -22,8 +26,17 @@ class ResearcherController {
|
||||
|
||||
@GetMapping(path = "/researchers")
|
||||
public String operate(Model model, @ModelAttribute("reqVO") GetResearchersUIReqVO reqVO) {
|
||||
String roleId = AdminUtil.getLoginUserRole();
|
||||
|
||||
if("ROLE_LOCAL_INSPECTOR".equals(roleId)) {
|
||||
model.addAttribute("inspectionArea",
|
||||
uiCodeListPortIn.connect("code.region.main").stream()
|
||||
.filter(code -> Objects.equals(AdminUtil.getLoginUserRegionMainCode(), code.getId()))
|
||||
.toList());
|
||||
}else{
|
||||
model.addAttribute("inspectionArea", uiCodeListPortIn.connect("code.region.main"));
|
||||
}
|
||||
model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows"));
|
||||
model.addAttribute("inspectionArea", uiCodeListPortIn.connect("code.region.main"));
|
||||
return "researcher/researchers";
|
||||
}
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
package app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortOut;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageImpl;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetPopupHouseholdsDao implements GetPopupHouseholdsPortOut {
|
||||
private final GetPopupHouseholdsMapper mapper;
|
||||
|
||||
@Override
|
||||
public Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd) {
|
||||
|
||||
List<GetPopupHouseholds> result = mapper.getPopupHouseholds(pageable, cmd);
|
||||
|
||||
return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getHouseholdSeq());
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
@Mapper
|
||||
public interface GetPopupHouseholdsMapper {
|
||||
List<GetPopupHouseholds> getPopupHouseholds(@Param("pageable") Pageable pageable,
|
||||
@Param("cmd") GetPopupHouseholdsCmd cmd);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.admin.usecase.researcher.getPopupHouseholds.ports;
|
||||
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
public interface GetPopupHouseholdsPortIn {
|
||||
Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.admin.usecase.researcher.getPopupHouseholds.ports;
|
||||
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
public interface GetPopupHouseholdsPortOut {
|
||||
Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd);
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
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.getPopupHouseholds.ports.GetPopupHouseholdsPortIn;
|
||||
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortOut;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetPopupHouseholdsService implements GetPopupHouseholdsPortIn {
|
||||
private final GetPopupHouseholdsPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd) {
|
||||
return portOut.operate(pageable, cmd);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,7 @@
|
||||
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.persistence.model.*;
|
||||
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;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
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.persistence.model.*;
|
||||
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;
|
||||
|
||||
import java.util.List;
|
||||
@@ -18,6 +14,6 @@ public interface ResearcherPortOut {
|
||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||
Page<app.module.admin.usecase.researcher.adpaters.persistence.model.GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
|
||||
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
|
||||
}
|
||||
@@ -1,11 +1,7 @@
|
||||
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.persistence.model.*;
|
||||
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.ports.ResearcherPortIn;
|
||||
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper
|
||||
namespace="app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence.GetHouseholdVisitInfoMapper">
|
||||
<select id="getHouseholdVisitInfo"
|
||||
resultType="app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo">
|
||||
/* getHouseholdVisitInfo : 임가방문정보 상세 조회 */
|
||||
SELECT id,
|
||||
household_seq,
|
||||
visit_date,
|
||||
management_type,
|
||||
content,
|
||||
is_gift_sent
|
||||
FROM household_visit
|
||||
WHERE id = #{id}
|
||||
AND is_deleted = false
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -1,90 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper
|
||||
namespace="app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence.GetPopupHouseholdsMapper">
|
||||
<select id="getPopupHouseholds"
|
||||
resultType="app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds">
|
||||
SELECT
|
||||
hvr.*,
|
||||
COUNT(*) OVER () AS total
|
||||
FROM (
|
||||
SELECT
|
||||
h.seq AS householdSeq,
|
||||
h.household_num AS householdNum,
|
||||
h.owner_name AS householdName,
|
||||
h.phone AS householdPhone,
|
||||
h.region_main_code AS regionMainCode,
|
||||
h.region_main_name AS regionMainName,
|
||||
h.region_sub_code AS regionSubCode,
|
||||
h.region_sub_name AS regionSubName,
|
||||
h.region_detail_code AS regionDetailCode,
|
||||
h.region_detail_name AS regionDetailName,
|
||||
h.industry_large_code as industryLargeCode,
|
||||
h.industry_large_name AS industryLargeName,
|
||||
h.industry_middle_code as industryMiddleCode,
|
||||
h.industry_middle_name AS industryMiddleName,
|
||||
h.is_panel AS isPanel,
|
||||
r.researcher_name AS researcherName
|
||||
FROM v_household_with_code h
|
||||
LEFT JOIN v_household_visit v ON h.seq = v.household_seq
|
||||
LEFT JOIN v_household_researcher r ON h.seq = r.household_seq
|
||||
) AS hvr
|
||||
|
||||
<where>
|
||||
1=1
|
||||
|
||||
<if test="cmd.ownerField != null and cmd.ownerField != ''">
|
||||
/* 경영주 검색 */
|
||||
<choose>
|
||||
<when test="cmd.ownerField eq 'name'">
|
||||
AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
|
||||
</when>
|
||||
<when test="cmd.ownerField eq 'phone'">
|
||||
AND hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%'
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
|
||||
<if test="cmd.regionMainCode != null and cmd.regionMainCode != ''">
|
||||
/* 실사 검색 */
|
||||
AND hvr.regionMainCode = #{cmd.regionMainCode}
|
||||
</if>
|
||||
<if test="cmd.regionSubCode != null and cmd.regionSubCode != ''">
|
||||
/* 지역 검색 */
|
||||
AND hvr.regionSubCode = #{cmd.regionSubCode}
|
||||
</if>
|
||||
<if test="cmd.regionDetailCode != null and cmd.regionDetailCode != ''">
|
||||
/* 세부지역 검색 */
|
||||
AND hvr.regionDetailCode = #{cmd.regionDetailCode}
|
||||
</if>
|
||||
|
||||
<if test="cmd.isPanel != null">
|
||||
/* 패널 유지 여부 */
|
||||
<choose>
|
||||
<when test="cmd.isPanel">
|
||||
AND hvr.isPanel = true
|
||||
</when>
|
||||
<when test="!cmd.isPanel">
|
||||
AND hvr.isPanel = false
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
|
||||
<if test="cmd.isMapping != null">
|
||||
/* 패널 유지 여부 */
|
||||
<choose>
|
||||
<when test="cmd.isMapping">
|
||||
AND r.researcher_name is not null
|
||||
</when>
|
||||
<when test="!cmd.isMapping">
|
||||
AND r.researcher_name is null
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
</where>
|
||||
|
||||
ORDER BY hvr.householdNum ASC
|
||||
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -211,7 +211,7 @@
|
||||
</update>
|
||||
|
||||
<select id="getPopupHouseholds"
|
||||
resultType="app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds">
|
||||
resultType="app.module.admin.usecase.researcher.adpaters.persistence.model.GetPopupHouseholds">
|
||||
SELECT
|
||||
hvr.*,
|
||||
COUNT(*) OVER () AS total
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user