isAddkf 添加防重复提交

fs-user-app/src/main/java/com/fs/framework/interceptor/RepeatSubmitInterceptor.java

@@ -30,7 +30,8 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
             RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
             if (annotation != null)
             {
-                if (this.isRepeatSubmit(request))
+                int interval = annotation.interval();
+                if (this.isRepeatSubmit(request, interval))
                 {
                     AjaxResult ajaxResult = AjaxResult.error("不允许重复提交，请稍后再试");
                     ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
@@ -49,8 +50,9 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
      * 验证是否重复提交由子类实现具体的防重复提交的规则
      *
      * @param request
+     * @param interval 间隔时间(毫秒)
      * @return
      * @throws Exception
      */
-    public abstract boolean isRepeatSubmit(HttpServletRequest request);
+    public abstract boolean isRepeatSubmit(HttpServletRequest request, int interval);
 }

fs-user-app/src/main/java/com/fs/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -37,21 +37,23 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
     private RedisCache redisCache;
 
     /**
-     * 间隔时间，单位:秒 默认10秒
+     * 默认间隔时间，单位:毫秒 默认10秒(10000毫秒)
      * 
      * 两次相同参数的请求，如果间隔时间大于该参数，系统不会认定为重复提交的数据
      */
-    private int intervalTime = 10;
+    private int defaultIntervalTime = 10000;
 
-    public void setIntervalTime(int intervalTime)
+    public void setDefaultIntervalTime(int defaultIntervalTime)
     {
-        this.intervalTime = intervalTime;
+        this.defaultIntervalTime = defaultIntervalTime;
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public boolean isRepeatSubmit(HttpServletRequest request)
+    public boolean isRepeatSubmit(HttpServletRequest request, int interval)
     {
+        int intervalMs = interval > 0 ? interval : defaultIntervalTime;
+
         String nowParams = "";
         if (request instanceof RepeatedlyRequestWrapper)
         {
@@ -88,7 +90,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
             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, intervalMs))
                 {
                     return true;
                 }
@@ -96,7 +98,8 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
         }
         Map<String, Object> cacheMap = new HashMap<String, Object>();
         cacheMap.put(url, nowDataMap);
-        redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS);
+        int intervalSeconds = (intervalMs + 999) / 1000;
+        redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalSeconds, TimeUnit.SECONDS);
         return false;
     }
 
@@ -112,12 +115,15 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
 
     /**
      * 判断两次间隔时间
+     * @param nowMap 当前请求数据
+     * @param preMap 上次请求数据
+     * @param intervalMs 间隔时间(毫秒)
      */
-    private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap)
+    private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap, int intervalMs)
     {
         long time1 = (Long) nowMap.get(REPEAT_TIME);
         long time2 = (Long) preMap.get(REPEAT_TIME);
-        if ((time1 - time2) < (this.intervalTime * 1000))
+        if ((time1 - time2) < intervalMs)
         {
             return true;
         }

fs-wx-api/src/main/java/com/fs/framework/interceptor/RepeatSubmitInterceptor.java

@@ -30,8 +30,7 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
             RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
             if (annotation != null)
             {
-                int interval = annotation.interval();
-                if (this.isRepeatSubmit(request, interval))
+                if (this.isRepeatSubmit(request))
                 {
                     AjaxResult ajaxResult = AjaxResult.error("不允许重复提交，请稍后再试");
                     ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
@@ -50,9 +49,8 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
      * 验证是否重复提交由子类实现具体的防重复提交的规则
      *
      * @param request
-     * @param interval 间隔时间(毫秒)
      * @return
      * @throws Exception
      */
-    public abstract boolean isRepeatSubmit(HttpServletRequest request, int interval);
+    public abstract boolean isRepeatSubmit(HttpServletRequest request);
 }

fs-wx-api/src/main/java/com/fs/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -37,23 +37,21 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
     private RedisCache redisCache;
 
     /**
-     * 默认间隔时间，单位:毫秒 默认10秒(10000毫秒)
+     * 间隔时间，单位:秒 默认10秒
      * 
      * 两次相同参数的请求，如果间隔时间大于该参数，系统不会认定为重复提交的数据
      */
-    private int defaultIntervalTime = 10000;
+    private int intervalTime = 10;
 
-    public void setDefaultIntervalTime(int defaultIntervalTime)
+    public void setIntervalTime(int intervalTime)
     {
-        this.defaultIntervalTime = defaultIntervalTime;
+        this.intervalTime = intervalTime;
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public boolean isRepeatSubmit(HttpServletRequest request, int interval)
+    public boolean isRepeatSubmit(HttpServletRequest request)
     {
-        int intervalMs = interval > 0 ? interval : defaultIntervalTime;
-
         String nowParams = "";
         if (request instanceof RepeatedlyRequestWrapper)
         {
@@ -90,7 +88,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
             if (sessionMap.containsKey(url))
             {
                 Map<String, Object> preDataMap = (Map<String, Object>) sessionMap.get(url);
-                if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap, intervalMs))
+                if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap))
                 {
                     return true;
                 }
@@ -98,8 +96,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
         }
         Map<String, Object> cacheMap = new HashMap<String, Object>();
         cacheMap.put(url, nowDataMap);
-        int intervalSeconds = (intervalMs + 999) / 1000;
-        redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalSeconds, TimeUnit.SECONDS);
+        redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS);
         return false;
     }
 
@@ -115,15 +112,12 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
 
     /**
      * 判断两次间隔时间
-     * @param nowMap 当前请求数据
-     * @param preMap 上次请求数据
-     * @param intervalMs 间隔时间(毫秒)
      */
-    private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap, int intervalMs)
+    private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap)
     {
         long time1 = (Long) nowMap.get(REPEAT_TIME);
         long time2 = (Long) preMap.get(REPEAT_TIME);
-        if ((time1 - time2) < intervalMs)
+        if ((time1 - time2) < (this.intervalTime * 1000))
         {
             return true;
         }