From a4f07b2a0ddb6c210e05afbbb491feeb466203e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:15:50 +0800
Subject: [PATCH] #V3重大更新，升级JDK17，升级SpirngBoot3.5.1
---
src/main/java/com/zy/asrs/controller/NotifyReportController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NotifyReportController.java b/src/main/java/com/zy/asrs/controller/NotifyReportController.java
index 017c759..b4ebe24 100644
--- a/src/main/java/com/zy/asrs/controller/NotifyReportController.java
+++ b/src/main/java/com/zy/asrs/controller/NotifyReportController.java
@@ -1,8 +1,8 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -62,7 +62,7 @@
result.put("notifyEndpoint", endpoint);
result.put("queueCount", loadQueueRecords(null, null).size());
if (!Cools.isEmpty(endpoint)) {
- result.put("logCount", httpRequestLogService.selectCount(new EntityWrapper<HttpRequestLog>().eq("name", endpoint)));
+ result.put("logCount", httpRequestLogService.count(new QueryWrapper<HttpRequestLog>().eq("name", endpoint)));
} else {
result.put("logCount", 0);
}
@@ -103,7 +103,7 @@
@RequestParam(required = false) Integer result,
@RequestParam(required = false) String condition) {
String endpoint = buildNotifyEndpoint(getConfigValue("notifyUri"), getConfigValue("notifyUriPath"));
- EntityWrapper<HttpRequestLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<HttpRequestLog> wrapper = new QueryWrapper<>();
if (!Cools.isEmpty(endpoint)) {
wrapper.eq("name", endpoint);
} else {
@@ -125,14 +125,14 @@
wrapper.like("request", "\"device\":" + device);
}
if (!Cools.isEmpty(condition)) {
- wrapper.andNew().like("request", condition).or().like("response", condition);
+ wrapper.and(q -> q.like("request", condition).or().like("response", condition));
}
if (result != null) {
wrapper.eq("result", result);
}
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy(true, false, "create_time");
- Page<HttpRequestLog> logPage = httpRequestLogService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<HttpRequestLog> logPage = httpRequestLogService.page(new Page<>(curr, limit), wrapper);
Page<NotifyReportVo> resultPage = new Page<>(curr, limit);
resultPage.setTotal(logPage.getTotal());
@@ -366,7 +366,7 @@
detail.put("sourceType", "log");
detail.put("logId", logId);
- HttpRequestLog log = httpRequestLogService.selectById(logId);
+ HttpRequestLog log = httpRequestLogService.getById(logId);
if (log == null) {
detail.put("success", false);
detail.put("message", "閫氱煡鏃ュ織涓嶅瓨鍦�");
@@ -401,7 +401,7 @@
}
private String getConfigValue(String code) {
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", code));
+ Config config = configService.getOne(new QueryWrapper<Config>().eq("code", code));
return config == null ? null : config.getValue();
}
--
Gitblit v1.9.1