xzc 1 day ago
parent
commit
306c89724f

+ 6 - 0
tz-module-infra/tz-module-infra-biz/src/main/java/cn/start/tz/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java

@@ -36,4 +36,10 @@ public class ApiErrorLogPageReqVO extends PageParam {
     @Schema(description = "处理状态", example = "0")
     private Integer processStatus;
 
+    @Schema(description = "排序字段", example = "exceptionTime")
+    private String sort;
+
+    @Schema(description = "排序类型", example = "ascending")
+    private String order;
+
 }

+ 13 - 4
tz-module-infra/tz-module-infra-biz/src/main/java/cn/start/tz/module/infra/dal/mysql/logger/ApiErrorLogMapper.java

@@ -20,15 +20,24 @@ import java.time.LocalDateTime;
 public interface ApiErrorLogMapper extends BaseMapperX<ApiErrorLogDO> {
 
     default PageResult<ApiErrorLogDO> selectPage(ApiErrorLogPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ApiErrorLogDO>()
+        LambdaQueryWrapperX<ApiErrorLogDO> wrapper = new LambdaQueryWrapperX<ApiErrorLogDO>()
                 .eqIfPresent(ApiErrorLogDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(ApiErrorLogDO::getUserType, reqVO.getUserType())
                 .eqIfPresent(ApiErrorLogDO::getApplicationName, reqVO.getApplicationName())
                 .likeIfPresent(ApiErrorLogDO::getRequestUrl, reqVO.getRequestUrl())
                 .betweenIfPresent(ApiErrorLogDO::getExceptionTime, reqVO.getExceptionTime())
-                .eqIfPresent(ApiErrorLogDO::getProcessStatus, reqVO.getProcessStatus())
-                .orderByDesc(ApiErrorLogDO::getId)
-        );
+                .eqIfPresent(ApiErrorLogDO::getProcessStatus, reqVO.getProcessStatus());
+        // 排序:指定按异常发生时间排序时使用前端传入的排序方向,否则默认按 id 倒序
+        if ("exceptionTime".equals(reqVO.getSort()) && reqVO.getOrder() != null) {
+            if ("ascending".equals(reqVO.getOrder())) {
+                wrapper.orderByAsc(ApiErrorLogDO::getExceptionTime);
+            } else {
+                wrapper.orderByDesc(ApiErrorLogDO::getExceptionTime);
+            }
+        } else {
+            wrapper.orderByDesc(ApiErrorLogDO::getId);
+        }
+        return selectPage(reqVO, wrapper);
     }
 
     /**

+ 1 - 1
tz-module-member/tz-module-member-biz/src/main/java/cn/start/tz/module/member/service/membermessage/MemberMessageRemoteServiceImpl.java

@@ -82,7 +82,7 @@ public class MemberMessageRemoteServiceImpl implements MemberMessageRemoteServic
                     response.getBody(), RESULT_TYPE);
             if (result != null && result.isSuccess()) {
                 log.info("[sendMpMessage][推送完成][memberId={}, result={}, 耗时={}ms]",
-                        reqVO.getMemberId(), result.getData(), elapsed);
+                        reqVO.getMemberId(), result, elapsed);
                 return result.getData();
             }
             log.warn("[sendMpMessage][响应失败][memberId={}, code={}, msg={}, 耗时={}ms]",