From d8379654bbc102b03aab712ce2bfac95997f45b3 Mon Sep 17 00:00:00 2001 From: diaobisong Date: Fri, 22 Mar 2024 14:21:01 +0800 Subject: [PATCH] modify trace dara --- .../service/api/impl/service/TraceServiceImpl.java | 6 +++++- .../java3y/austin/web/service/impl/DataServiceImpl.java | 9 +++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/TraceServiceImpl.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/TraceServiceImpl.java index daceec2..5b0d484 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/TraceServiceImpl.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/TraceServiceImpl.java @@ -42,7 +42,11 @@ public class TraceServiceImpl implements TraceService { } // 0. 按时间排序 - List sortAnchorList = messageList.stream().map(s -> JSON.parseObject(s, SimpleAnchorInfo.class)).sorted((o1, o2) -> Math.toIntExact(o1.getTimestamp() - o2.getTimestamp())).collect(Collectors.toList()); + List sortAnchorList = messageList.stream().map(s -> { + SimpleAnchorInfo simpleAnchorInfo = JSON.parseObject(s, SimpleAnchorInfo.class); + simpleAnchorInfo.setMessageId(messageId); + return simpleAnchorInfo; + }).sorted((o1, o2) -> Math.toIntExact(o1.getTimestamp() - o2.getTimestamp())).collect(Collectors.toList()); return new TraceResponse(RespStatusEnum.SUCCESS.getCode(), RespStatusEnum.SUCCESS.getMsg(), sortAnchorList); } diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java index f438be1..a2bf8c8 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java @@ -65,7 +65,7 @@ public class DataServiceImpl implements DataService { @Override public UserTimeLineVo getTraceUserInfo(String receiver) { - List userInfoList = redisUtils.lRange(receiver, 0, -1); + List userInfoList = redisUtils.lRange(receiver, 0, redisUtils.lLen(receiver) > 1000 ? 1000 : -1); if (CollUtil.isEmpty(userInfoList)) { return UserTimeLineVo.builder().items(new ArrayList<>()).build(); } @@ -148,13 +148,14 @@ public class DataServiceImpl implements DataService { StringBuilder sb = new StringBuilder(); for (SimpleAnchorInfo simpleAnchorInfo : entry.getValue()) { - if (AnchorState.RECEIVE.getCode().equals(simpleAnchorInfo.getState())) { - sb.append(StrPool.CRLF); - } + // if (AnchorState.RECEIVE.getCode().equals(simpleAnchorInfo.getState())) { + // sb.append(StrPool.CRLF); + // } String startTime = DateUtil.format(new Date(simpleAnchorInfo.getTimestamp()), DatePattern.NORM_DATETIME_PATTERN); String stateDescription = AnchorStateUtils.getDescriptionByState(messageTemplate.getSendChannel(), simpleAnchorInfo.getState(), simpleAnchorInfo.getMessageId()); sb.append(startTime).append(StrPool.C_COLON).append(stateDescription).append("==>"); + sb.append(StrPool.CRLF); } for (String detail : sb.toString().split(StrPool.CRLF)) {