diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/ApiLogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/ApiLogAspect.java
index 7f87244a6..87b80906a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/ApiLogAspect.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/ApiLogAspect.java
@@ -1,6 +1,8 @@
package org.nl.modules.logging.aspect;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
@@ -69,12 +71,29 @@ public class ApiLogAspect {
Object result = joinPoint.proceed();
+
+ JSONObject jsonObject = JSONObject.parseObject(JSONUtil.toJsonStr(result));
+ JSONObject jsonObject1 = jsonObject.getJSONObject("body");
+ if(null == jsonObject1){
+ logEntity.setResponseStatus(400);
+ logEntity.setStatus("FAIL");
+ logEntity.setErrorMsg("返回信息为空,请确认!");
+ logEntity.setResponseBody("返回信息为空,请确认!");
+ }else{
+ String rtype = jsonObject1.getString("RTYPE");
+ if(rtype.equalsIgnoreCase("E")){
+ logEntity.setResponseStatus(400);
+ logEntity.setStatus("FAIL");
+ logEntity.setErrorMsg(JSONUtil.toJsonStr(result));
+ logEntity.setResponseBody(JSONUtil.toJsonStr(result));
+ }else{
+ logEntity.setResponseStatus(200);
+ logEntity.setStatus("SUCCESS");
+ logEntity.setResponseBody(JSONUtil.toJsonStr(result));
+ }
+ }
long costTime = System.currentTimeMillis() - startTime;
logEntity.setCostTime(costTime);
- logEntity.setResponseStatus(200);
- logEntity.setStatus("SUCCESS");
- logEntity.setResponseBody(JSONUtil.toJsonStr(result));
-
return result;
} catch (Throwable throwable) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/sysapi/SysApiLogController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/sysapi/SysApiLogController.java
index c696c25bf..ca0ffa55e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/controller/sysapi/SysApiLogController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/sysapi/SysApiLogController.java
@@ -71,12 +71,14 @@ public class SysApiLogController {
wrapper.eq(SysApiLog::getStatus, query.getStatus());
}
- if (query.getBeginTime() != null && !query.getBeginTime().isEmpty()) {
- wrapper.ge(SysApiLog::getCreateTime, query.getBeginTime());
+ if (query.getBegin_time() != null && !query.getBegin_time().isEmpty()) {
+ String beginTime = query.getBegin_time() + " 00:00:00";
+ wrapper.ge(SysApiLog::getCreateTime, beginTime);
}
- if (query.getEndTime() != null && !query.getEndTime().isEmpty()) {
- wrapper.le(SysApiLog::getCreateTime, query.getEndTime());
+ if (query.getEnd_time() != null && !query.getEnd_time().isEmpty()) {
+ String endTime = query.getEnd_time() + " 23:59:59";
+ wrapper.le(SysApiLog::getCreateTime, endTime);
}
if (query.getKeyword() != null && !query.getKeyword().isEmpty()) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/dto/ApiLogQuery.java b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/dto/ApiLogQuery.java
index 2716887fc..228b7673b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/dto/ApiLogQuery.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/sysapi/entity/dto/ApiLogQuery.java
@@ -24,9 +24,9 @@ public class ApiLogQuery extends PageQuery {
private String status;
- private String beginTime;
+ private String begin_time;
- private String endTime;
+ private String end_time;
private String keyword;
diff --git a/lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue b/lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue
index fe9f85cc1..34c40c445 100644
--- a/lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue
+++ b/lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue
@@ -17,7 +17,6 @@
placeholder="请输入关键字查询"
class="filter-item"
style="width: 200px;"
- @keyup.enter.native="crud.toQuery"
/>
@@ -27,7 +26,6 @@
size="mini"
placeholder="请选择"
class="filter-item"
- @change="crud.toQuery"
>
@@ -56,7 +54,6 @@
size="mini"
placeholder="请选择"
class="filter-item"
- @change="crud.toQuery"
>
@@ -83,11 +79,10 @@
@@ -212,11 +207,16 @@ export default {
name: 'SysApiLog',
components: { rrOperation, crudOperation, pagination },
cruds() {
+ const today = new Date()
+ const year = today.getFullYear()
+ const month = String(today.getMonth() + 1).padStart(2, '0')
+ const day = String(today.getDate()).padStart(2, '0')
+ const dateStr = `${year}-${month}-${day}`
return CRUD({
title: '接口日志',
url: 'api/sysApiLog',
query: {
- createTime: [new Date(), new Date()]
+ createTime: [dateStr, dateStr]
}
})
},