From a34423fca89a64d4f04b373f83416b9046906c8d Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Tue, 11 Jan 2022 10:18:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=A8=E7=BD=91=E7=83=AD=E6=90=9C?=
 =?UTF-8?q?=E5=92=8C=E5=BE=AE=E4=BF=A1=E7=83=AD=E6=90=9C=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/business/monitor/service/index.vue  |  7 ++-
 .../com/xjs/common/task/DeleteRepeatTask.java | 44 +++++++++++++++++++
 .../copywriting/task/DeleteRepeatTask.java    | 32 --------------
 .../mapper/ApiTopsearchAllnetworkMapper.java  |  6 +++
 .../mapper/ApiTopsearchWechatMapper.java      |  5 +++
 .../ApiTopsearchAllnetworkService.java        |  6 +++
 .../service/ApiTopsearchWechatService.java    |  5 +++
 .../ApiTopsearchAllnetworkServiceImpl.java    |  9 ++++
 .../impl/ApiTopsearchWechatServiceImpl.java   |  9 ++++
 .../openapi/ApiTopsearchAllnetworkMapper.xml  | 21 +++++++++
 .../openapi/ApiTopsearchWechatMapper.xml      | 21 +++++++++
 11 files changed, 132 insertions(+), 33 deletions(-)
 create mode 100644 xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/DeleteRepeatTask.java
 delete mode 100644 xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/task/DeleteRepeatTask.java
 create mode 100644 xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/ApiTopsearchAllnetworkMapper.xml
 create mode 100644 xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/ApiTopsearchWechatMapper.xml

diff --git a/ruoyi-ui/src/views/business/monitor/service/index.vue b/ruoyi-ui/src/views/business/monitor/service/index.vue
index 3c8fd602..bad5a657 100644
--- a/ruoyi-ui/src/views/business/monitor/service/index.vue
+++ b/ruoyi-ui/src/views/business/monitor/service/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <el-row :gutter="24">
       <el-col :md="12" :sm="24">
         <el-card header="系统信息" style="margin-bottom: 20px" :bordered="false">
@@ -101,6 +101,9 @@ export default {
   name: "Online",
   data() {
     return {
+      //遮罩层
+      loading: true,
+
       serviceMonitorInfo: {}
     }
 
@@ -110,8 +113,10 @@ export default {
   },
   methods: {
     getServiceMonitor() {
+      this.loading = true
       getServiceMonitor().then(res => {
         this.serviceMonitorInfo = res.data
+        this.loading = false
       })
     },
   },
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/DeleteRepeatTask.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/DeleteRepeatTask.java
new file mode 100644
index 00000000..65a2dffc
--- /dev/null
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/DeleteRepeatTask.java
@@ -0,0 +1,44 @@
+package com.xjs.common.task;
+
+import com.xjs.copywriting.service.CopyWritingService;
+import com.xjs.topsearch.service.ApiTopsearchAllnetworkService;
+import com.xjs.topsearch.service.ApiTopsearchWechatService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author xiejs
+ * @desc 删除重复文案数据
+ * @create 2022-01-06
+ */
+@Component
+@Log4j2
+public class DeleteRepeatTask {
+    @Autowired
+    private CopyWritingService copyWritingService;
+    @Autowired
+    private ApiTopsearchAllnetworkService apiTopsearchAllnetworkService;
+    @Autowired
+    private ApiTopsearchWechatService apiTopsearchWechatService;
+
+
+    /**
+     * 2022-01-07 07:00:00
+     * 2022-01-07 08:00:00
+     * 2022-01-07 09:00:00
+     * 2022-01-07 10:00:00
+     */
+    @Scheduled(cron = "0 0 7-23 * * ? ")
+    public void execute() {
+        int copyWritingCount = copyWritingService.deleteRepeatData();
+        log.info("thread id:{},定时清除文案重复数据，重复数：{}", Thread.currentThread().getId(),copyWritingCount);
+        Integer allNetworkCount = apiTopsearchAllnetworkService.deleteRepeatData();
+        log.info("thread id:{},定时清除全网热搜榜重复数据，重复数：{}", Thread.currentThread().getId(),allNetworkCount);
+        Integer wechatCount = apiTopsearchWechatService.deleteRepeatData();
+        log.info("thread id:{},定时清除微信热搜榜重复数据，重复数：{}", Thread.currentThread().getId(),wechatCount);
+    }
+}
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/task/DeleteRepeatTask.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/task/DeleteRepeatTask.java
deleted file mode 100644
index e6387b82..00000000
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/task/DeleteRepeatTask.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.xjs.copywriting.task;
-
-import com.xjs.copywriting.service.CopyWritingService;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * @author xiejs
- * @desc 删除重复文案数据
- * @create 2022-01-06
- */
-@Component
-@Log4j2
-public class DeleteRepeatTask {
-    @Resource
-    private CopyWritingService copyWritingService;
-
-    /**
-     * 2022-01-07 07:00:00
-     * 2022-01-07 08:00:00
-     * 2022-01-07 09:00:00
-     * 2022-01-07 10:00:00
-     */
-    @Scheduled(cron = "0 0 7-23 * * ? ")
-    public void execute() {
-        int count = copyWritingService.deleteRepeatData();
-        log.info("thread id:{},定时清除文案重复数据，重复数：{}", Thread.currentThread().getId(),count);
-    }
-}
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/mapper/ApiTopsearchAllnetworkMapper.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/mapper/ApiTopsearchAllnetworkMapper.java
index 065f27fe..a9b1303e 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/mapper/ApiTopsearchAllnetworkMapper.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/mapper/ApiTopsearchAllnetworkMapper.java
@@ -9,5 +9,11 @@ import com.xjs.topsearch.domain.ApiTopsearchAllnetwork;
  */
 public interface ApiTopsearchAllnetworkMapper extends BaseMapper<ApiTopsearchAllnetwork> {
 
+    /**
+     * 删除全网热搜重复数据
+     * @return Integer
+     */
+    Integer deleteRepeatData();
+
 
 }
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/mapper/ApiTopsearchWechatMapper.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/mapper/ApiTopsearchWechatMapper.java
index 52daf31b..2dae40d7 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/mapper/ApiTopsearchWechatMapper.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/mapper/ApiTopsearchWechatMapper.java
@@ -8,4 +8,9 @@ import com.xjs.topsearch.domain.ApiTopsearchWechat;
  * @since 2022-01-11
  */
 public interface ApiTopsearchWechatMapper extends BaseMapper<ApiTopsearchWechat> {
+    /**
+     * 删除全网热搜重复数据
+     * @return Integer
+     */
+    Integer deleteRepeatData();
 }
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/ApiTopsearchAllnetworkService.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/ApiTopsearchAllnetworkService.java
index df2563de..9b16548c 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/ApiTopsearchAllnetworkService.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/ApiTopsearchAllnetworkService.java
@@ -9,4 +9,10 @@ import com.xjs.topsearch.domain.ApiTopsearchAllnetwork;
  * @since 2022-01-10
  */
 public interface ApiTopsearchAllnetworkService extends IService<ApiTopsearchAllnetwork> {
+
+    /**
+     * 删除全网热搜重复数据
+     * @return Integer
+     */
+    Integer deleteRepeatData();
 }
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/ApiTopsearchWechatService.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/ApiTopsearchWechatService.java
index f9ba9801..bcfa5aec 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/ApiTopsearchWechatService.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/ApiTopsearchWechatService.java
@@ -8,4 +8,9 @@ import com.xjs.topsearch.domain.ApiTopsearchWechat;
  * @since 2022-01-11
  */
 public interface ApiTopsearchWechatService extends IService<ApiTopsearchWechat> {
+    /**
+     * 删除全网热搜重复数据
+     * @return Integer
+     */
+    Integer deleteRepeatData();
 }
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/ApiTopsearchAllnetworkServiceImpl.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/ApiTopsearchAllnetworkServiceImpl.java
index 76443e47..b53075dd 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/ApiTopsearchAllnetworkServiceImpl.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/ApiTopsearchAllnetworkServiceImpl.java
@@ -6,10 +6,19 @@ import com.xjs.topsearch.mapper.ApiTopsearchAllnetworkMapper;
 import com.xjs.topsearch.service.ApiTopsearchAllnetworkService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @author xiejs
  * @since 2022-01-10
  */
 @Service
 public class ApiTopsearchAllnetworkServiceImpl extends ServiceImpl<ApiTopsearchAllnetworkMapper, ApiTopsearchAllnetwork> implements ApiTopsearchAllnetworkService {
+    @Resource
+    private ApiTopsearchAllnetworkMapper apiTopsearchAllnetworkMapper;
+
+    @Override
+    public Integer deleteRepeatData() {
+        return apiTopsearchAllnetworkMapper.deleteRepeatData();
+    }
 }
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/ApiTopsearchWechatServiceImpl.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/ApiTopsearchWechatServiceImpl.java
index 55d9de7e..68cdf607 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/ApiTopsearchWechatServiceImpl.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/ApiTopsearchWechatServiceImpl.java
@@ -6,10 +6,19 @@ import com.xjs.topsearch.mapper.ApiTopsearchWechatMapper;
 import com.xjs.topsearch.service.ApiTopsearchWechatService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @author xiejs
  * @since 2022-01-11
  */
 @Service
 public class ApiTopsearchWechatServiceImpl extends ServiceImpl<ApiTopsearchWechatMapper, ApiTopsearchWechat> implements ApiTopsearchWechatService {
+    @Resource
+    private ApiTopsearchWechatMapper apiTopsearchWechatMapper;
+
+    @Override
+    public Integer deleteRepeatData() {
+        return apiTopsearchWechatMapper.deleteRepeatData();
+    }
 }
diff --git a/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/ApiTopsearchAllnetworkMapper.xml b/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/ApiTopsearchAllnetworkMapper.xml
new file mode 100644
index 00000000..0295589b
--- /dev/null
+++ b/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/ApiTopsearchAllnetworkMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjs.topsearch.mapper.ApiTopsearchAllnetworkMapper">
+
+    <delete id="deleteRepeatData">
+        DELETE
+        FROM
+            api_topsearch_allnetwork
+        WHERE
+                title IN ( SELECT t.title FROM ( SELECT title FROM api_topsearch_allnetwork GROUP BY title HAVING count( title ) > 1 ) t )
+          AND id NOT IN (
+            SELECT
+                c.id
+            FROM
+                ( SELECT min( id ) id FROM api_topsearch_allnetwork GROUP BY title HAVING count( title )> 1 ) c
+        )
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/ApiTopsearchWechatMapper.xml b/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/ApiTopsearchWechatMapper.xml
new file mode 100644
index 00000000..db640fee
--- /dev/null
+++ b/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/ApiTopsearchWechatMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjs.topsearch.mapper.ApiTopsearchWechatMapper">
+
+    <delete id="deleteRepeatData">
+        DELETE
+        FROM
+            api_topsearch_wechat
+        WHERE
+                word IN ( SELECT t.word FROM ( SELECT word FROM api_topsearch_wechat GROUP BY word HAVING count( word ) > 1 ) t )
+          AND id NOT IN (
+            SELECT
+                c.id
+            FROM
+                ( SELECT min( id ) id FROM api_topsearch_wechat GROUP BY word HAVING count( word )> 1 ) c
+        )
+    </delete>
+
+</mapper>
\ No newline at end of file