From a386b3eabe7735453a7c4c80b3c9566034ad81a7 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Sun, 2 Jan 2022 12:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A1=E3=80=81=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8Dapi=E6=AF=8F=E5=A4=A9=E8=AE=B0=E5=BD=95=E6=95=B0?=
=?UTF-8?q?=E4=B8=8D=E4=BC=9A=E9=87=8D=E7=BD=AE=20=20=20=20=20=202?=
=?UTF-8?q?=E3=80=81=E5=85=B6=E4=BB=96=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/business/warning/apiwarning/index.vue | 6 +-----
.../src/test/java/com/xjs/utils/ChineseUtilTest.java | 3 ++-
.../src/main/java/com/xjs/common/aop/ApiLogAspect.java | 6 +++++-
.../java/com/xjs/service/impl/ApiWarningServiceImpl.java | 2 --
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/views/business/warning/apiwarning/index.vue b/ruoyi-ui/src/views/business/warning/apiwarning/index.vue
index ed21c04d..dc403f99 100644
--- a/ruoyi-ui/src/views/business/warning/apiwarning/index.vue
+++ b/ruoyi-ui/src/views/business/warning/apiwarning/index.vue
@@ -56,11 +56,7 @@
-
-
- {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-
-
+
{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
diff --git a/xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilTest.java b/xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilTest.java
index 3bd7d29c..4d89667f 100644
--- a/xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilTest.java
+++ b/xjs-business/xjs-business-common/src/test/java/com/xjs/utils/ChineseUtilTest.java
@@ -22,8 +22,9 @@ class ChineseUtilTest {
@Test
public void test2() {
+ Date date = DateUtil.parse("2022-01-01 23:59:59").toJdkDate();
long between = DateUtil
- .between(new Date(), DateUtil.parseDate("2021-12-31 23:59:59").toJdkDate(), DateUnit.DAY);
+ .between(new Date(), date, DateUnit.DAY);
System.out.println(between);
}
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java
index 2855a345..ac2d7ad8 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java
@@ -154,11 +154,15 @@ public class ApiLogAspect {
//统计当前的请求次数，隔天清零
haveApiRecord.setDayCount(haveApiRecord.getDayCount()+1L);
Date updateTime = haveApiRecord.getUpdateTime();
+ String dateTime = DateUtil.formatDateTime(updateTime);
+ Date date = DateUtil.parseDate(dateTime).toJdkDate();
//当前时间和最后一次修改时间间隔天数（超过1 就清零）
- long compareTime = DateUtil.between(new Date(), updateTime, DateUnit.DAY);
+ long compareTime = DateUtil.between(date, new Date(), DateUnit.DAY);
if (compareTime > 0) {
haveApiRecord.setDayCount(0L);
}
+ //置为空让mp自动填充
+ haveApiRecord.setUpdateTime(null);
remoteWarningCRUDFeign.updateApiRecordForRPC(haveApiRecord);
//判断接口请求是否超过阈值
if (haveApiRecord.getDayCount() > haveApiRecord.getLimitCount()) {
diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java
index 59e997b3..1f4bce82 100644
--- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java
+++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/service/impl/ApiWarningServiceImpl.java
@@ -1,7 +1,6 @@
package com.xjs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.common.core.utils.DateUtils;
import com.xjs.domain.ApiRecord;
import com.xjs.exception.BusinessException;
import com.xjs.mapper.ApiRecordMapper;
@@ -83,7 +82,6 @@ public class ApiWarningServiceImpl implements ApiWarningService {
*/
@Override
public int updateApiRecord(ApiRecord apiRecord) {
- apiRecord.setUpdateTime(DateUtils.getNowDate());
return apiRecordMapper.updateApiRecord(apiRecord);
}