modify trace dara

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<SimpleAnchorInfo> sortAnchorList = messageList.stream().map(s -> JSON.parseObject(s, SimpleAnchorInfo.class)).sorted((o1, o2) -> Math.toIntExact(o1.getTimestamp() - o2.getTimestamp())).collect(Collectors.toList());
+        List<SimpleAnchorInfo> 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);
     }

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<String> userInfoList = redisUtils.lRange(receiver, 0, -1);
+        List<String> 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())) {
+                // if (AnchorState.RECEIVE.getCode().equals(simpleAnchorInfo.getState())) {
-                    sb.append(StrPool.CRLF);
+                //     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)) {