From ec1ed49593be295c7c770cb2e4359e7869e6c954 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 20 九月 2021 19:01:04 +0800
Subject: [PATCH] 防重提交注解支持配置间隔时间/提示消息
---
src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java | 6 +++---
src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java | 23 ++++++-----------------
src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java | 8 ++++++++
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
index 7b7be9e..f51bd9b 100644
--- a/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
@@ -29,9 +29,9 @@
RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
if (annotation != null)
{
- if (this.isRepeatSubmit(request))
+ if (this.isRepeatSubmit(request, annotation))
{
- AjaxResult ajaxResult = AjaxResult.error("涓嶅厑璁搁噸澶嶆彁浜わ紝璇风◢鍚庡啀璇�");
+ AjaxResult ajaxResult = AjaxResult.error(annotation.message());
ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
return false;
}
@@ -51,5 +51,5 @@
* @return
* @throws Exception
*/
- public abstract boolean isRepeatSubmit(HttpServletRequest request);
+ public abstract boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation);
}
diff --git a/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java b/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java
index 9b98809..2084bfb 100644
--- a/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java
+++ b/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java
@@ -19,5 +19,13 @@
@Documented
public @interface RepeatSubmit
{
+ /**
+ * 闂撮殧鏃堕棿(ms)锛屽皬浜庢鏃堕棿瑙嗕负閲嶅鎻愪氦
+ */
+ public int interval() default 5000;
+ /**
+ * 鎻愮ず娑堟伅
+ */
+ public String message() default "涓嶅厑璁搁噸澶嶆彁浜わ紝璇风◢鍚庡啀璇�";
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
index 1b6ee2d..a7b3b34 100644
--- a/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
+++ b/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
@@ -13,6 +13,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpHelper;
import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
import com.ruoyi.framework.redis.RedisCache;
/**
@@ -35,21 +36,9 @@
@Autowired
private RedisCache redisCache;
- /**
- * 闂撮殧鏃堕棿锛屽崟浣�:绉� 榛樿10绉�
- *
- * 涓ゆ鐩稿悓鍙傛暟鐨勮姹傦紝濡傛灉闂撮殧鏃堕棿澶т簬璇ュ弬鏁帮紝绯荤粺涓嶄細璁ゅ畾涓洪噸澶嶆彁浜ょ殑鏁版嵁
- */
- private int intervalTime = 10;
-
- public void setIntervalTime(int intervalTime)
- {
- this.intervalTime = intervalTime;
- }
-
@SuppressWarnings("unchecked")
@Override
- public boolean isRepeatSubmit(HttpServletRequest request)
+ public boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation)
{
String nowParams = "";
if (request instanceof RepeatedlyRequestWrapper)
@@ -87,7 +76,7 @@
if (sessionMap.containsKey(url))
{
Map<String, Object> preDataMap = (Map<String, Object>) sessionMap.get(url);
- if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap))
+ if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap, annotation.interval()))
{
return true;
}
@@ -95,7 +84,7 @@
}
Map<String, Object> cacheMap = new HashMap<String, Object>();
cacheMap.put(url, nowDataMap);
- redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS);
+ redisCache.setCacheObject(cacheRepeatKey, cacheMap, annotation.interval(), TimeUnit.MILLISECONDS);
return false;
}
@@ -112,11 +101,11 @@
/**
* 鍒ゆ柇涓ゆ闂撮殧鏃堕棿
*/
- private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap)
+ private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap, int interval)
{
long time1 = (Long) nowMap.get(REPEAT_TIME);
long time2 = (Long) preMap.get(REPEAT_TIME);
- if ((time1 - time2) < (this.intervalTime * 1000))
+ if ((time1 - time2) < interval)
{
return true;
}
--
Gitblit v1.9.3