From b65171017a7b83620669cf9226397269c249a351 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 15:11:34 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 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..45091d7 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
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.InterfaceLogMapper;
import com.doumee.dao.business.model.InterfaceLog;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.yaml.snakeyaml.scanner.Constant;
import java.util.List;
@@ -106,6 +108,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 +125,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 +148,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 +157,21 @@
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/"));
+ }
+ @Override
+ public void remainLastLogs(){
+ InterfaceLog log = interfaceLogMapper.selectOne(new QueryWrapper<InterfaceLog>()
+ .select("max(id) as id").last("limit 1"));
+ //鍙繚鐣欒繘10w鏉℃暟鎹�
+ if(log!=null) {
+ interfaceLogMapper.delete(new UpdateWrapper<InterfaceLog>().lambda()
+ .lt(InterfaceLog::getId, Constants.formatIntegerNum(log.getId()) - 100000));
+ }
+
+ }
}
--
Gitblit v1.9.3