From 1891ce554158ad0179b2ec4fcfb8f5159d6e5619 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 13 Jun 2025 19:15:58 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8,=20=EC=83=81=EC=84=B8=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EC=A4=91=20(2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/AdminDetailsService.java | 1 + .../application/security/AdminUser.java | 4 +- .../config/application/util/AdminUtil.java | 14 +++ .../persistence/GetDailyRecordsCountDao.java | 19 +++ .../GetDailyRecordsCountMapper.java | 11 ++ .../ports/GetDailyRecordsCountPortIn.java | 9 ++ .../ports/GetDailyRecordsCountPortOut.java | 9 ++ .../GetDailyRecordsCountService.java | 20 +++ .../domain/GetDailyRecordsCount.java | 18 +++ .../domain/GetDailyRecordsCountCmd.java | 15 +++ .../persistence/GetDailyRecordsStatusDao.java | 19 +++ .../GetDailyRecordsStatusMapper.java | 11 ++ .../ports/GetDailyRecordsStatusPortIn.java | 9 ++ .../ports/GetDailyRecordsStatusPortOut.java | 9 ++ .../GetDailyRecordsStatusService.java | 20 +++ .../domain/GetDailyRecordsStatus.java | 20 +++ .../domain/GetDailyRecordsStatusCmd.java | 15 +++ .../application/domain/RecordStatusType.java | 16 +++ .../persistence/GetHouseholdStatusDao.java | 3 +- .../persistence/GetHouseholdStatusMapper.java | 3 +- .../ports/GetHouseholdStatusPortIn.java | 3 +- .../ports/GetHouseholdStatusPortOut.java | 3 +- .../GetHouseholdStatusService.java | 3 +- .../domain/GetHouseholdStatusCmd.java | 2 +- .../GetHouseholdStatusUIController.java | 23 +++- .../web/GetHouseholdsStatusController.java | 4 +- .../web/model/GetHouseholdsStatusReqVO.java | 4 + .../domain/GetHouseholdsStatusCmd.java | 5 + .../GetHouseholdsStatusUIController.java | 26 +++- .../household/GetDailyRecordsCountMapper.xml | 58 +++++++++ .../household/GetDailyRecordsStatusMapper.xml | 52 ++++++++ .../household/GetHouseholdStatusMapper.xml | 3 +- .../household/GetHouseholdsStatusMapper.xml | 19 ++- .../templates/household/households.html | 35 ++++-- .../templates/household/households/{seq}.html | 116 +++++++++++++++++- .../persistence/initData/InitAdminData.java | 10 +- .../persistence/initData/InitRoleData.java | 4 +- .../initData/InitUriAdminData.java | 34 ++--- .../config/application/util/CommonUtil.java | 11 -- .../main/resources/sql/data/01_init-data.sql | 34 ++--- core/src/main/resources/sql/data/03_admin.sql | 4 +- .../sql/schema/05_create-funtion.sql | 32 +++++ 42 files changed, 644 insertions(+), 86 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java create mode 100644 admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml create mode 100644 admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml create mode 100644 core/src/main/resources/sql/schema/05_create-funtion.sql diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index e735f923..81b5e6a4 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -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()), diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java index d7d58d51..4ed17db2 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java @@ -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; } } diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index 8116b710..bace4659 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -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(); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java new file mode 100644 index 00000000..aa3a6a36 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java @@ -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 operate(GetDailyRecordsCountCmd cmd) { + return mapper.getDailyRecordsCount(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java new file mode 100644 index 00000000..108bad32 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java @@ -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(GetDailyRecordsCountCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java new file mode 100644 index 00000000..2652da4b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java @@ -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 operate(GetDailyRecordsCountCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java new file mode 100644 index 00000000..fc8b7a53 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java @@ -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 operate(GetDailyRecordsCountCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java new file mode 100644 index 00000000..23c963bd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java @@ -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 operate(GetDailyRecordsCountCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java new file mode 100644 index 00000000..56ecc94e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java new file mode 100644 index 00000000..d3a55163 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java new file mode 100644 index 00000000..70b9d972 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java @@ -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 operate(GetDailyRecordsStatusCmd cmd) { + return mapper.getDailyRecordsStatus(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java new file mode 100644 index 00000000..10a0401e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java @@ -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(GetDailyRecordsStatusCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java new file mode 100644 index 00000000..a50bc45b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java @@ -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 operate(GetDailyRecordsStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java new file mode 100644 index 00000000..1cd05ace --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java @@ -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 operate(GetDailyRecordsStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java new file mode 100644 index 00000000..a885484f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java @@ -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 operate(GetDailyRecordsStatusCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java new file mode 100644 index 00000000..9cca9bcb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java new file mode 100644 index 00000000..07720a87 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java @@ -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; +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java new file mode 100644 index 00000000..ea0b8de5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java index ba8c3165..dd8ccd30 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java @@ -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 operate(GetHouseholdStatusCmd cmd) { + public Optional operate(GetHouseholdStatusCmd cmd) { return mapper.getHouseholdStatusById(cmd); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java index 3264b45b..27e91457 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java @@ -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 getHouseholdStatusById(GetHouseholdStatusCmd cmd); + Optional getHouseholdStatusById(GetHouseholdStatusCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java index ed77c45b..88006b15 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java @@ -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 operate(GetHouseholdStatusCmd cmd); + Optional operate(GetHouseholdStatusCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java index 89318648..5768c1b7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java @@ -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 operate(GetHouseholdStatusCmd cmd); + Optional operate(GetHouseholdStatusCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java index a5b12148..9106d8bd 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java @@ -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 operate(GetHouseholdStatusCmd cmd) { + public Optional operate(GetHouseholdStatusCmd cmd) { return portOut.operate(cmd); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatusCmd.java index 5ae2ad4c..4980c628 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatusCmd.java @@ -10,5 +10,5 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class GetHouseholdStatusCmd { - private Integer seq; + private Long seq; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java index 17b03cdf..c3ed2d46 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java @@ -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}"; } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index 9e2d4ad1..d4ea1c3c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -41,7 +41,9 @@ class GetHouseholdsStatusController { reqVO.getIsGiftSent(), reqVO.getResearcherField(), reqVO.getResearcherValue(), - reqVO.getIsPanel() + reqVO.getIsPanel(), + reqVO.getUserRole(), + reqVO.getUserRegionMainCode() )) ); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java index 213907a1..93d29d73 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java @@ -41,4 +41,8 @@ public class GetHouseholdsStatusReqVO { private String researcherValue; // 패널 유지 여부 private Boolean isPanel; + // 로그인한 유저 역할 + private String userRole; + // 로그인한 유저 실사 지역 + private String userRegionMainCode; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java index 2494426a..6a9f935e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java @@ -40,4 +40,9 @@ public class GetHouseholdsStatusCmd { private String researcherValue; // 패널 유지 여부 private Boolean isPanel; + // 로그인한 유저 역할 + private String userRole; + // 로그인한 유저 실사 지역 + private String userRegionMainCode; + } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java index 3debfb4a..bbbfe387 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java @@ -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")); // 세부지역 diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml new file mode 100644 index 00000000..271ee38b --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml new file mode 100644 index 00000000..74e1d493 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml @@ -0,0 +1,52 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml index 0405e53c..1caedaca 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml @@ -4,10 +4,11 @@ + + +
- - - + + + + +