From 42c1674a987cb5590b359e45dbc173f1703395db Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Wed, 26 Jan 2022 09:30:33 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81api=E7=BB=9F=E8=AE=A1=E9=81=AE?=
 =?UTF-8?q?=E7=BD=A9=E5=B1=82=E4=BC=98=E5=8C=96=202=E3=80=81=E7=83=AD?=
 =?UTF-8?q?=E6=90=9C=E6=A6=9C=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/statistics/apistatistics/index.vue      | 12 ++++++++++--
 .../topsearch/controller/ApiTopSearchController.java |  5 +++++
 .../topsearch/service/impl/TopSearchServiceImpl.java |  4 ----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue b/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue
index 041db427..a86b0113 100644
--- a/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue
+++ b/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue
@@ -1,5 +1,8 @@
 <template>
-  <div>
+  <div v-loading="loading"
+       element-loading-text="拼命加载中"
+       element-loading-spinner="el-icon-loading"
+       element-loading-background="rgba(0, 0, 0, 0.8)">
 
     <div ref="historyChart" style="height: 400px;width: 100%;margin-top: 25px">
 
@@ -33,6 +36,9 @@ export default {
     return {
       historyApiData: {},
       todayApiData: {},
+
+      //遮罩层
+      loading: false,
     }
   },
 
@@ -93,7 +99,7 @@ export default {
         },
         yAxis: {
           splitNumber: 10,
-          max:80,
+          max:60,
         },
         series: [{
           name: '次数',
@@ -106,7 +112,9 @@ export default {
 
     //查询API历史记录统计
     getStatisticsHistoryApi() {
+      this.loading=true
       getStatisticsHistoryApi().then(res => {
+        this.loading=false
         this.historyApiData = res.data
         this.initHistory()
       })
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/controller/ApiTopSearchController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/controller/ApiTopSearchController.java
index 7b52f404..578b24dc 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/controller/ApiTopSearchController.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/controller/ApiTopSearchController.java
@@ -45,6 +45,9 @@ public class ApiTopSearchController {
     @Log(title = "获取热搜榜")
     @RequiresPermissions("openapi:topsearch:list")
     public AjaxResult topSearch() {
+        //清理重复数据
+        topSearchService.deleteRepeatData();
+
         if (redisService.hasKey(HOT)) {
             Map<String, List> cacheObject = redisService.getCacheObject(HOT);
             return AjaxResult.success(cacheObject);
@@ -70,6 +73,8 @@ public class ApiTopSearchController {
     @GetMapping("getTopsearchForRPC")
     @ApiOperation("内部远程调用热搜榜接口")
     public R<Map<String, List>> topSearchForRPC() {
+        //清理重复数据
+        topSearchService.deleteRepeatData();
         Map<String, List> map = topSearchService.getAllTopSearch();
         return R.ok(map);
     }
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/TopSearchServiceImpl.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/TopSearchServiceImpl.java
index 24ca2781..c0241eb0 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/TopSearchServiceImpl.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/TopSearchServiceImpl.java
@@ -64,10 +64,6 @@ public class TopSearchServiceImpl implements TopSearchService {
         listHashMap.put("baiduList", baiduList);
         listHashMap.put("weiboList", weiboList);
         listHashMap.put("douyinList", douyinList);
-
-        //清理重复数据
-        this.deleteRepeatData();
-
         return listHashMap;
     }