From 07e9df31d0ca3c6d8cac812a3f24671dc9324fef Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 22 Sep 2026 16:58:48 +0900 Subject: [PATCH] =?UTF-8?q?260922=5F01=5FENH:=20=EA=B3=B5=EC=A7=80,=20?= =?UTF-8?q?=EB=AC=B8=EC=9D=98,=20=EB=AC=B8=EC=9D=98=20=EB=8B=B5=EB=B3=80,?= =?UTF-8?q?=20=ED=8C=9D=EC=97=85=20=EB=AA=A9=EB=A1=9D=20=EB=B0=8F=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=EC=97=90=20=EC=9E=91=EC=84=B1=EC=9E=90=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=B6=94=EA=B0=80=20=EC=A0=9C=EA=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/dto/notice/NoticeResponseDto.java | 2 +- .../back/dto/popup/PopupResponseDto.java | 2 +- .../back/dto/qna/QnaAnswerResponseDto.java | 2 +- .../back/dto/qna/QnaQuestionResponseDto.java | 2 +- .../manage/back/service/NoticeService.java | 7 +++++- .../manage/back/service/PopupService.java | 9 +++++++- .../ksif/manage/back/service/QnaService.java | 22 +++++++++++++++---- .../ksif/manage/back/service/UserService.java | 15 +++++++++++++ 8 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/kri/ksif/manage/back/dto/notice/NoticeResponseDto.java b/src/main/java/com/kri/ksif/manage/back/dto/notice/NoticeResponseDto.java index 88c32e0..4ae0a5b 100644 --- a/src/main/java/com/kri/ksif/manage/back/dto/notice/NoticeResponseDto.java +++ b/src/main/java/com/kri/ksif/manage/back/dto/notice/NoticeResponseDto.java @@ -6,7 +6,7 @@ import java.util.List; public record NoticeResponseDto( Integer noticeId, String title, String contentHtml, List centerCds, - List files, String regUser, LocalDateTime regDt, + List files, String regUser, String regUserName, LocalDateTime regDt, String modUser, LocalDateTime modDt, boolean viewed ) { } diff --git a/src/main/java/com/kri/ksif/manage/back/dto/popup/PopupResponseDto.java b/src/main/java/com/kri/ksif/manage/back/dto/popup/PopupResponseDto.java index 07bb413..12eca50 100644 --- a/src/main/java/com/kri/ksif/manage/back/dto/popup/PopupResponseDto.java +++ b/src/main/java/com/kri/ksif/manage/back/dto/popup/PopupResponseDto.java @@ -5,7 +5,7 @@ import java.util.List; public record PopupResponseDto( Integer popupId, String title, String contentHtml, LocalDateTime startDt, - LocalDateTime endDt, List centerCds, String regUser, + LocalDateTime endDt, List centerCds, String regUser, String regUserName, LocalDateTime regDt, String modUser, LocalDateTime modDt, boolean viewed ) { } diff --git a/src/main/java/com/kri/ksif/manage/back/dto/qna/QnaAnswerResponseDto.java b/src/main/java/com/kri/ksif/manage/back/dto/qna/QnaAnswerResponseDto.java index e6c833e..7a6e33d 100644 --- a/src/main/java/com/kri/ksif/manage/back/dto/qna/QnaAnswerResponseDto.java +++ b/src/main/java/com/kri/ksif/manage/back/dto/qna/QnaAnswerResponseDto.java @@ -7,6 +7,6 @@ import java.util.List; public record QnaAnswerResponseDto( Integer answerId, String contentHtml, List files, boolean viewed, String viewUser, LocalDateTime viewDt, - String regUser, LocalDateTime regDt, String modUser, LocalDateTime modDt + String regUser, String regUserName, LocalDateTime regDt, String modUser, LocalDateTime modDt ) { } diff --git a/src/main/java/com/kri/ksif/manage/back/dto/qna/QnaQuestionResponseDto.java b/src/main/java/com/kri/ksif/manage/back/dto/qna/QnaQuestionResponseDto.java index 7af361f..987b703 100644 --- a/src/main/java/com/kri/ksif/manage/back/dto/qna/QnaQuestionResponseDto.java +++ b/src/main/java/com/kri/ksif/manage/back/dto/qna/QnaQuestionResponseDto.java @@ -7,6 +7,6 @@ import java.util.List; public record QnaQuestionResponseDto( Integer questionId, Integer centerCd, String centerName, String title, String contentHtml, List files, QnaAnswerResponseDto answer, - String regUser, LocalDateTime regDt, String modUser, LocalDateTime modDt + String regUser, String regUserName, LocalDateTime regDt, String modUser, LocalDateTime modDt ) { } diff --git a/src/main/java/com/kri/ksif/manage/back/service/NoticeService.java b/src/main/java/com/kri/ksif/manage/back/service/NoticeService.java index 44333bf..199792d 100644 --- a/src/main/java/com/kri/ksif/manage/back/service/NoticeService.java +++ b/src/main/java/com/kri/ksif/manage/back/service/NoticeService.java @@ -46,6 +46,7 @@ public class NoticeService { private final NoticeCenterMapRepository mapRepository; private final NoticeFileRepository fileRepository; private final NoticeViewRepository viewRepository; + private final UserService userService; @Transactional(readOnly = true) public PageResponseDto list( @@ -65,6 +66,8 @@ public class NoticeService { criteria.targetCenterCds(), pageable); List noticeIds = result.getContent().stream().map(TNoticeEntity::getId).toList(); + Map userNames = userService.findNames(result.getContent().stream() + .map(TNoticeEntity::getRegUser).toList()); Map> filesByNotice = fileRepository .findByNoticeIdxInOrderByNoticeIdxAscFileOrderAsc(noticeIds).stream() @@ -91,6 +94,7 @@ public class NoticeService { targetsByNotice.getOrDefault(entity.getId(), List.of()), filesByNotice.getOrDefault(entity.getId(), List.of()), entity.getRegUser(), + userNames.get(entity.getRegUser()), entity.getRegDt(), entity.getModUser(), entity.getModDt(), @@ -260,7 +264,8 @@ public class NoticeService { viewed = viewRepository.existsById(id); } return new NoticeResponseDto(entity.getId(), entity.getNoticeTitle(), entity.getNoticeContent(), - targets(entity.getId()), files, entity.getRegUser(), entity.getRegDt(), entity.getModUser(), entity.getModDt(), viewed); + targets(entity.getId()), files, entity.getRegUser(), userService.findName(entity.getRegUser()), + entity.getRegDt(), entity.getModUser(), entity.getModDt(), viewed); } private FileResponseDto toFileDto(TNoticeFileEntity file) { diff --git a/src/main/java/com/kri/ksif/manage/back/service/PopupService.java b/src/main/java/com/kri/ksif/manage/back/service/PopupService.java index d5c3705..15210e0 100644 --- a/src/main/java/com/kri/ksif/manage/back/service/PopupService.java +++ b/src/main/java/com/kri/ksif/manage/back/service/PopupService.java @@ -30,6 +30,7 @@ public class PopupService { private final PopupRepository popupRepository; private final PopupCenterMapRepository mapRepository; private final PopupViewRepository viewRepository; + private final UserService userService; @Transactional(readOnly = true) public PageResponseDto list( @@ -45,6 +46,8 @@ public class PopupService { criteria.targetCenterCds(), pageable); List popupIds = result.getContent().stream().map(TPopupEntity::getId).toList(); + Map userNames = userService.findNames(result.getContent().stream() + .map(TPopupEntity::getRegUser).toList()); Map> targetsByPopup = mapRepository.findByIdPopupIdxIn(popupIds).stream() .collect(Collectors.groupingBy( value -> value.getId().getPopupIdx(), @@ -58,6 +61,7 @@ public class PopupService { popup.getEndDt(), targetsByPopup.getOrDefault(popup.getId(), List.of()), popup.getRegUser(), + userNames.get(popup.getRegUser()), popup.getRegDt(), popup.getModUser(), popup.getModDt(), @@ -72,6 +76,8 @@ public class PopupService { List popups = popupRepository.findActiveVisible( center.getCenterCd(), now, now.minusMinutes(1)); List popupIds = popups.stream().map(TPopupEntity::getId).toList(); + Map userNames = userService.findNames(popups.stream() + .map(TPopupEntity::getRegUser).toList()); Map> targetsByPopup = mapRepository.findByIdPopupIdxIn(popupIds).stream() .collect(Collectors.groupingBy( value -> value.getId().getPopupIdx(), @@ -95,6 +101,7 @@ public class PopupService { popup.getEndDt(), targetsByPopup.getOrDefault(popup.getId(), List.of()), popup.getRegUser(), + userNames.get(popup.getRegUser()), popup.getRegDt(), popup.getModUser(), popup.getModDt(), @@ -175,6 +182,6 @@ public class PopupService { private PopupResponseDto toDto(TPopupEntity p, TUserEntity user) { boolean viewed=false; if (accessControlService.isCenter(user.getUserRole())) { TPopupViewEntityId id=new TPopupViewEntityId(); id.setPopupIdx(p.getId()); id.setCenterCd(user.getCenterCd()); viewed=viewRepository.existsById(id); } - return new PopupResponseDto(p.getId(),p.getPopupTitle(),p.getPopupContent(),p.getStartDt(),p.getEndDt(),targets(p.getId()),p.getRegUser(),p.getRegDt(),p.getModUser(),p.getModDt(),viewed); + return new PopupResponseDto(p.getId(),p.getPopupTitle(),p.getPopupContent(),p.getStartDt(),p.getEndDt(),targets(p.getId()),p.getRegUser(),userService.findName(p.getRegUser()),p.getRegDt(),p.getModUser(),p.getModDt(),viewed); } } diff --git a/src/main/java/com/kri/ksif/manage/back/service/QnaService.java b/src/main/java/com/kri/ksif/manage/back/service/QnaService.java index e5d376b..a897930 100644 --- a/src/main/java/com/kri/ksif/manage/back/service/QnaService.java +++ b/src/main/java/com/kri/ksif/manage/back/service/QnaService.java @@ -40,6 +40,7 @@ public class QnaService { private final QnaQuestionFileRepository questionFileRepository; private final QnaAnswerFileRepository answerFileRepository; private final CenterRepository centerRepository; + private final UserService userService; @Transactional(readOnly = true) public PageResponseDto list( @@ -92,6 +93,10 @@ public class QnaService { Function.identity(), (first, second) -> second )); + Set regUsers = result.getContent().stream() + .map(TQnaQuestionEntity::getRegUser).collect(Collectors.toSet()); + answerByQuestion.values().stream().map(TQnaAnswerEntity::getRegUser).forEach(regUsers::add); + Map userNames = userService.findNames(regUsers); return PageResponseDto.from(result.map(question -> new QnaQuestionResponseDto( question.getId(), @@ -101,8 +106,9 @@ public class QnaService { question.getQuestionContent(), filesByQuestion.getOrDefault(question.getId(), List.of()), answerByQuestion.containsKey(question.getId()) - ? toAnswerSummary(answerByQuestion.get(question.getId())) : null, + ? toAnswerSummary(answerByQuestion.get(question.getId()), userNames) : null, question.getRegUser(), + userNames.get(question.getRegUser()), question.getRegDt(), question.getModUser(), question.getModDt() @@ -267,17 +273,25 @@ public class QnaService { QnaAnswerResponseDto answer = answerRepository.findByQnaQuestionIdxAndIsDelFalse(q.getId()) .map(value -> includeDetail ? toAnswerDto(value) : toAnswerSummary(value)).orElse(null); return new QnaQuestionResponseDto(q.getId(), q.getCenterCd(), centerName, q.getQuestionTitle(), - q.getQuestionContent(), files, answer, q.getRegUser(), q.getRegDt(), q.getModUser(), q.getModDt()); + q.getQuestionContent(), files, answer, q.getRegUser(), userService.findName(q.getRegUser()), + q.getRegDt(), q.getModUser(), q.getModDt()); } private QnaAnswerResponseDto toAnswerDto(TQnaAnswerEntity a) { var files = answerFileRepository.findByQnaAnswerIdxOrderByFileOrderAsc(a.getId()).stream() .map(v -> new FileResponseDto(v.getId(), v.getFileOrder(), v.getFileName(), v.getFileType())).toList(); return new QnaAnswerResponseDto(a.getId(), a.getAnswerContent(), files, a.getIsViewAnswer(), - a.getViewUser(), a.getViewDt(), a.getRegUser(), a.getRegDt(), a.getModUser(), a.getModDt()); + a.getViewUser(), a.getViewDt(), a.getRegUser(), userService.findName(a.getRegUser()), + a.getRegDt(), a.getModUser(), a.getModDt()); } private QnaAnswerResponseDto toAnswerSummary(TQnaAnswerEntity a) { return new QnaAnswerResponseDto(a.getId(), null, List.of(), a.getIsViewAnswer(), - a.getViewUser(), a.getViewDt(), a.getRegUser(), a.getRegDt(), a.getModUser(), a.getModDt()); + a.getViewUser(), a.getViewDt(), a.getRegUser(), userService.findName(a.getRegUser()), + a.getRegDt(), a.getModUser(), a.getModDt()); + } + private QnaAnswerResponseDto toAnswerSummary(TQnaAnswerEntity a, Map userNames) { + return new QnaAnswerResponseDto(a.getId(), null, List.of(), a.getIsViewAnswer(), + a.getViewUser(), a.getViewDt(), a.getRegUser(), userNames.get(a.getRegUser()), + a.getRegDt(), a.getModUser(), a.getModDt()); } private FileResponseDto toQuestionFileDto(TQnaQuestionFileEntity file) { return new FileResponseDto( diff --git a/src/main/java/com/kri/ksif/manage/back/service/UserService.java b/src/main/java/com/kri/ksif/manage/back/service/UserService.java index a032f16..7bee45d 100644 --- a/src/main/java/com/kri/ksif/manage/back/service/UserService.java +++ b/src/main/java/com/kri/ksif/manage/back/service/UserService.java @@ -5,6 +5,10 @@ import com.kri.ksif.manage.back.dto.auth.LoginRequestDto; import com.kri.ksif.manage.back.dto.user.UserDto; import com.kri.ksif.manage.back.persistence.entity.TUserEntity; import com.kri.ksif.manage.back.persistence.repository.UserRepository; +import java.util.Collection; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,4 +27,15 @@ public class UserService { return UserDto.from(userEntity); } + + public String findName(String userId) { + if (userId == null) return null; + return userRepository.findById(userId).map(TUserEntity::getUserName).orElse(null); + } + + public Map findNames(Collection userIds) { + var ids = userIds.stream().filter(Objects::nonNull).collect(Collectors.toSet()); + return userRepository.findAllById(ids).stream() + .collect(Collectors.toMap(TUserEntity::getUserId, TUserEntity::getUserName)); + } }