1、全网热搜和微信热搜定时任务删除重复数据

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
       })
     },
   },

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);
+    }
+}

xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/task/DeleteRepeatTask.java

@@ -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);
-    }
-}

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();
+
 
 }

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();
 }

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();
 }

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();
 }

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();
+    }
 }

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();
+    }
 }

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>

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>