From b0ea50dd24a7ed5ada38dc6c8209f78fc09f0441 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 六月 2024 17:45:33 +0800
Subject: [PATCH] 修复bug

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
index 91667f8..9f11835 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
@@ -106,6 +106,13 @@
             queryWrapper.lambda().ge(InterfaceLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
             queryWrapper.lambda().le(InterfaceLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
         }
+
+        if (pageWrap.getModel().getStartDate() != null) {
+            queryWrapper.lambda().ge(InterfaceLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
+        }
+        if (pageWrap.getModel().getEndDate() != null) {
+            queryWrapper.lambda().le(InterfaceLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
+        }
         if (pageWrap.getModel().getIsdeleted() != null) {
             queryWrapper.lambda().eq(InterfaceLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
         }
@@ -116,17 +123,16 @@
             queryWrapper.lambda().eq(InterfaceLog::getType, pageWrap.getModel().getType());
         }
         if (pageWrap.getModel().getName() != null) {
-            queryWrapper.lambda().eq(InterfaceLog::getName, pageWrap.getModel().getName());
+            queryWrapper.lambda().like(InterfaceLog::getName, pageWrap.getModel().getName());
         }
         if (pageWrap.getModel().getUrl() != null) {
-            queryWrapper.lambda().ge(InterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl()));
-            queryWrapper.lambda().le(InterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl()));
+            queryWrapper.lambda().like(InterfaceLog::getUrl, pageWrap.getModel().getUrl());
         }
         if (pageWrap.getModel().getRequest() != null) {
-            queryWrapper.lambda().eq(InterfaceLog::getRequest, pageWrap.getModel().getRequest());
+            queryWrapper.lambda().like(InterfaceLog::getRequest, pageWrap.getModel().getRequest());
         }
         if (pageWrap.getModel().getRepose() != null) {
-            queryWrapper.lambda().eq(InterfaceLog::getRepose, pageWrap.getModel().getRepose());
+            queryWrapper.lambda().like(InterfaceLog::getRepose, pageWrap.getModel().getRepose());
         }
         if (pageWrap.getModel().getSuccess() != null) {
             queryWrapper.lambda().eq(InterfaceLog::getSuccess, pageWrap.getModel().getSuccess());
@@ -140,13 +146,7 @@
         if (pageWrap.getModel().getObjId() != null) {
             queryWrapper.lambda().eq(InterfaceLog::getObjId, pageWrap.getModel().getObjId());
         }
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
-            }
-        }
+        queryWrapper.lambda().orderByDesc(InterfaceLog::getCreateDate);
         return PageData.from(interfaceLogMapper.selectPage(page, queryWrapper));
     }
 
@@ -155,4 +155,10 @@
         QueryWrapper<InterfaceLog> wrapper = new QueryWrapper<>(interfaceLog);
         return interfaceLogMapper.selectCount(wrapper);
     }
+    @Override
+    public void clearThreeMonthLog() {
+          interfaceLogMapper.delete(new UpdateWrapper<InterfaceLog>().lambda()
+                  .apply("to_days(create_date)+15 < to_days(now())")
+                  .like(InterfaceLog::getUrl,"/artemis/api/"));
+    }
 }

--
Gitblit v1.9.3