diff --git a/src/main/front/index.html b/src/main/front/index.html index 245a894..6ed1a19 100644 --- a/src/main/front/index.html +++ b/src/main/front/index.html @@ -4,7 +4,7 @@ - Vite App + DFXConsole
diff --git a/src/main/front/src/components/Pagination.vue b/src/main/front/src/components/Pagination.vue new file mode 100644 index 0000000..9337290 --- /dev/null +++ b/src/main/front/src/components/Pagination.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/main/front/src/views/MessageHistoryView.vue b/src/main/front/src/views/MessageHistoryView.vue index 3e1eda2..272a7e0 100644 --- a/src/main/front/src/views/MessageHistoryView.vue +++ b/src/main/front/src/views/MessageHistoryView.vue @@ -3,6 +3,7 @@ import '@/assets/main.css' import { useApiClient } from '@/main' import { onMounted, ref } from 'vue' import SearchParameterDto from '@/components/SearchParameterDto' +import Pagination from '@/components/Pagination.vue' const apiClient = useApiClient() @@ -84,19 +85,7 @@ onMounted(async () => { - + diff --git a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/DfxAgentInfoController.java b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/DfxAgentInfoController.java index 1366f09..a7a2b97 100644 --- a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/DfxAgentInfoController.java +++ b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/DfxAgentInfoController.java @@ -3,6 +3,7 @@ package com.bsmlab.dfx.dfxconsole.app.agent; import com.bsmlab.dfx.agent.config.AgentConfigDto; import com.bsmlab.dfx.agent.listener.dto.ReceiveMessageDto; import com.bsmlab.dfx.dfxconsole.app.agent.service.*; +import com.bsmlab.dfx.dfxconsole.framework.dto.SearchParameterDto; import com.bsmlab.dfx.dfxconsole.framework.support.ResponseUtils; import com.fasterxml.jackson.core.JsonProcessingException; import lombok.RequiredArgsConstructor; @@ -54,8 +55,8 @@ public class DfxAgentInfoController { } @PostMapping("/app-api/agent/getAgentMessageDtoList") - public ResponseEntity> getAgentMessageDtoList() { - List dfxAgentMessageDtoList = dfxAgentMessageHistoryService.selectDfxAgentMessageDtoList(); + public ResponseEntity> getAgentMessageDtoList(@RequestBody SearchParameterDto searchParameterDto) { + List dfxAgentMessageDtoList = dfxAgentMessageHistoryService.selectDfxAgentMessageDtoList(searchParameterDto); return ResponseEntity.ok().body(dfxAgentMessageDtoList); } diff --git a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryMapper.java b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryMapper.java index 5e643eb..88017b3 100644 --- a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryMapper.java +++ b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryMapper.java @@ -1,12 +1,13 @@ package com.bsmlab.dfx.dfxconsole.app.agent.service; +import com.bsmlab.dfx.dfxconsole.framework.dto.SearchParameterDto; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper public interface DfxAgentMessageHistoryMapper { - List selectDfxAgentMessageList(); + List selectDfxAgentMessageList(SearchParameterDto searchParameterDto); int selectDfxAgentMessageListTotalCount(); DfxAgentMessageDto selectDfxAgentMessageBySenderAgentIdAndMessageUuid(DfxAgentMessageDto dfxAgentMessageDto); void insertDfxAgentMessage(DfxAgentMessageDto dfxAgentMessageDto); diff --git a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryService.java b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryService.java index 9a185ef..a73319f 100644 --- a/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryService.java +++ b/src/main/java/com/bsmlab/dfx/dfxconsole/app/agent/service/DfxAgentMessageHistoryService.java @@ -1,5 +1,6 @@ package com.bsmlab.dfx.dfxconsole.app.agent.service; +import com.bsmlab.dfx.dfxconsole.framework.dto.SearchParameterDto; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -18,8 +19,8 @@ import java.util.Map; public class DfxAgentMessageHistoryService { private final DfxAgentMessageHistoryMapper dfxAgentMessageHistoryMapper; - public List selectDfxAgentMessageDtoList() { - List dfxAgentMessageDtoList = dfxAgentMessageHistoryMapper.selectDfxAgentMessageList(); + public List selectDfxAgentMessageDtoList(SearchParameterDto searchParameterDto) { + List dfxAgentMessageDtoList = dfxAgentMessageHistoryMapper.selectDfxAgentMessageList(searchParameterDto); return dfxAgentMessageDtoList; } diff --git a/src/main/resources/mapper/app/dfx-agent-message-history.xml b/src/main/resources/mapper/app/dfx-agent-message-history.xml index b807ac8..4b4c937 100644 --- a/src/main/resources/mapper/app/dfx-agent-message-history.xml +++ b/src/main/resources/mapper/app/dfx-agent-message-history.xml @@ -18,8 +18,8 @@ FROM TB_DFX_AGENT_MESSAGE WHERE 1 = 1 ORDER BY CONSOLE_RECEIVE_TS - LIMIT 20 - OFFSET (1 - 1) * 20 + LIMIT #{itemCountPerPage} + OFFSET (#{page} - 1) * #{itemCountPerPage} ) A JOIN TB_DFX_AGENT_INFO B ON (A.SENDER_AGENT_ID = B.AGENT_ID) JOIN TB_DFX_AGENT_INFO C ON (A.RECIPIENT_AGENT_ID = C.AGENT_ID)