Merge branch 'kangsun' into 'dev'
[BO] 임가현황 리스트, 상세 작업 중 (2) See merge request korea-research/korea-research!5
This commit is contained in:
@@ -43,6 +43,7 @@ public class AdminDetailsService implements UserDetailsService {
|
||||
return new AdminUser(
|
||||
adminUser.getId(),
|
||||
adminUser.getPassword(),
|
||||
adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null),
|
||||
!accountDisabled,
|
||||
true,
|
||||
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),
|
||||
|
||||
@@ -7,12 +7,13 @@ import org.springframework.security.core.userdetails.User;
|
||||
|
||||
@Getter
|
||||
public class AdminUser extends User {
|
||||
|
||||
private String roleId;
|
||||
private long remainPasswordDays;
|
||||
|
||||
public AdminUser(
|
||||
String username,
|
||||
String password,
|
||||
String roleId,
|
||||
boolean enabled,
|
||||
boolean accountNonExpired,
|
||||
boolean credentialsNonExpired,
|
||||
@@ -27,6 +28,7 @@ public class AdminUser extends User {
|
||||
credentialsNonExpired,
|
||||
accountNonLocked,
|
||||
authorities);
|
||||
this.roleId = roleId;
|
||||
this.remainPasswordDays = remainPasswordDays;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
package app.module.admin.config.application.util;
|
||||
|
||||
import app.module.admin.config.application.security.AdminUser;
|
||||
import app.module.core.config.adapters.web.interceptor.model.URITopTierVO;
|
||||
import java.util.List;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@@ -19,4 +23,14 @@ public class AdminUtil {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static String getLoginUserRole() {
|
||||
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
||||
if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
AdminUser user = (AdminUser) authentication.getPrincipal();
|
||||
return user.getRoleId().isEmpty() ? null : user.getRoleId();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsCountDao implements GetDailyRecordsCountPortOut {
|
||||
private final GetDailyRecordsCountMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd) {
|
||||
return mapper.getDailyRecordsCount(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetDailyRecordsCountMapper {
|
||||
Optional<GetDailyRecordsCount> getDailyRecordsCount(GetDailyRecordsCountCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
|
||||
public interface GetDailyRecordsCountPortIn {
|
||||
Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
|
||||
public interface GetDailyRecordsCountPortOut {
|
||||
Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsCountService implements GetDailyRecordsCountPortIn {
|
||||
private final GetDailyRecordsCountPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetDailyRecordsCount> operate(GetDailyRecordsCountCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsCount {
|
||||
private Integer doneCount;
|
||||
private Integer emptyCount;
|
||||
private Integer incompleteCount;
|
||||
private Integer waitingCount;
|
||||
private Double progressPercent;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsCountCmd {
|
||||
private Long householdSeq;
|
||||
private String recordMonth;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsStatusDao implements GetDailyRecordsStatusPortOut {
|
||||
private final GetDailyRecordsStatusMapper mapper;
|
||||
|
||||
@Override
|
||||
public List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd) {
|
||||
return mapper.getDailyRecordsStatus(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetDailyRecordsStatusMapper {
|
||||
List<GetDailyRecordsStatus> getDailyRecordsStatus(GetDailyRecordsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
|
||||
public interface GetDailyRecordsStatusPortIn {
|
||||
List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import java.util.List;
|
||||
|
||||
public interface GetDailyRecordsStatusPortOut {
|
||||
List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut;
|
||||
import java.util.List;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetDailyRecordsStatusService implements GetDailyRecordsStatusPortIn {
|
||||
private final GetDailyRecordsStatusPortOut portOut;
|
||||
|
||||
@Override
|
||||
public List<GetDailyRecordsStatus> operate(GetDailyRecordsStatusCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsStatus {
|
||||
private String dayGroup;
|
||||
private RecordStatusType allStatusType;
|
||||
private String incomeStatus;
|
||||
private String workStatus;
|
||||
private String expenseStatus;
|
||||
private String powerStatus;
|
||||
private String forestryStatus;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetDailyRecordsStatusCmd {
|
||||
private Long householdSeq;
|
||||
private String recordMonth;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum RecordStatusType {
|
||||
WAITING("대기"),
|
||||
DONE("작성완료"),
|
||||
INCOMPLETE("미완료"),
|
||||
NONE("등록없음"),
|
||||
EMPTY("미작성");
|
||||
|
||||
private final String desc;
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper;
|
||||
import java.util.Optional;
|
||||
@@ -15,7 +16,7 @@ class GetHouseholdStatusDao implements GetHouseholdStatusPortOut {
|
||||
private final GetHouseholdStatusMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd) {
|
||||
public Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd) {
|
||||
return mapper.getHouseholdStatusById(cmd);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import java.util.Optional;
|
||||
@@ -7,6 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetHouseholdStatusMapper {
|
||||
Optional<GetHouseholdsStatus> getHouseholdStatusById(GetHouseholdStatusCmd cmd);
|
||||
Optional<GetHouseholdStatus> getHouseholdStatusById(GetHouseholdStatusCmd cmd);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface GetHouseholdStatusPortIn {
|
||||
Optional<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd);
|
||||
Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd);
|
||||
}
|
||||
@@ -1,9 +1,10 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.ports;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface GetHouseholdStatusPortOut {
|
||||
Optional<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd);
|
||||
Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd);
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatus.ports.application;
|
||||
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -14,7 +15,7 @@ class GetHouseholdStatusService implements GetHouseholdStatusPortIn {
|
||||
private final GetHouseholdStatusPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdsStatus> operate(GetHouseholdStatusCmd cmd) {
|
||||
public Optional<GetHouseholdStatus> operate(GetHouseholdStatusCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -10,5 +10,5 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdStatusCmd {
|
||||
private Integer seq;
|
||||
private Long seq;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
package app.module.admin.usecase.household.getHouseholdStatusUI;
|
||||
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn;
|
||||
import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -14,18 +18,31 @@ import app.module.admin.usecase.household.getHouseholdStatusUI.model.GetHousehol
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn portIn;
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
private final GetDailyRecordsStatusPortIn getDailyRecordsStatusPortIn;
|
||||
private final GetDailyRecordsCountPortIn getDailyRecordsCountPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/{seq}")
|
||||
String operate(
|
||||
@PathVariable Integer seq,
|
||||
@PathVariable Long seq,
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) {
|
||||
|
||||
model.addAttribute("householdInfo", portIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
model.addAttribute("seq", seq);
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
|
||||
// 임가 상세 정보
|
||||
model.addAttribute("householdInfo",
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
|
||||
// TODO : 비동기호출로 변경하기
|
||||
// model.addAttribute("dailyRecords",
|
||||
// getDailyRecordsStatusPortIn.operate(new GetDailyRecordsStatusCmd(seq, "202506")));
|
||||
// model.addAttribute("dailyRecordsCount",
|
||||
// getDailyRecordsCountPortIn.operate(new GetDailyRecordsCountCmd(seq, "202506"))
|
||||
// .orElse(null));
|
||||
|
||||
return "household/households/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,9 @@ class GetHouseholdsStatusController {
|
||||
reqVO.getIsGiftSent(),
|
||||
reqVO.getResearcherField(),
|
||||
reqVO.getResearcherValue(),
|
||||
reqVO.getIsPanel()
|
||||
reqVO.getIsPanel(),
|
||||
reqVO.getUserRole(),
|
||||
reqVO.getUserRegionMainCode()
|
||||
))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -41,4 +41,8 @@ public class GetHouseholdsStatusReqVO {
|
||||
private String researcherValue;
|
||||
// 패널 유지 여부
|
||||
private Boolean isPanel;
|
||||
// 로그인한 유저 역할
|
||||
private String userRole;
|
||||
// 로그인한 유저 실사 지역
|
||||
private String userRegionMainCode;
|
||||
}
|
||||
|
||||
@@ -40,4 +40,9 @@ public class GetHouseholdsStatusCmd {
|
||||
private String researcherValue;
|
||||
// 패널 유지 여부
|
||||
private Boolean isPanel;
|
||||
// 로그인한 유저 역할
|
||||
private String userRole;
|
||||
// 로그인한 유저 실사 지역
|
||||
private String userRegionMainCode;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
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;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Controller;
|
||||
@@ -14,16 +18,32 @@ import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdsStatusUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households")
|
||||
String operate(
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) {
|
||||
|
||||
AdminView admin =
|
||||
adminViewPortIn.connect(CommonUtil.getLoginUsername()).orElse(null);
|
||||
|
||||
// 로그인한 관리자 역할
|
||||
model.addAttribute("userRole", CommonUtil.getLoginUserRole());
|
||||
// 실사
|
||||
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
|
||||
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
|
||||
model.addAttribute("userRegionMainCode", admin.getRegionMainCode());
|
||||
|
||||
// 실사 코드 목록
|
||||
// 지방실사와 조사원은 담당실사 지역만 조회
|
||||
if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole()) && admin.getRegionMainCode() != null) {
|
||||
model.addAttribute("regionMainList",
|
||||
uiCodeListPortIn.connect("code.region.main").stream()
|
||||
.filter(code -> admin.getRegionMainCode().equals(code.getId()))
|
||||
.toList());
|
||||
} else {
|
||||
// 관리자면 전체
|
||||
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
|
||||
}
|
||||
|
||||
// 지역
|
||||
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
|
||||
// 세부지역
|
||||
|
||||
Reference in New Issue
Block a user