From 4f5a50b4f20a1db38f90be7cb6355771a50b367b Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Thu, 6 Jan 2022 20:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A1=E3=80=81=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=8E=BB=E9=87=8D?=
 =?UTF-8?q?=20=20=20=20=20=202=E3=80=81=E4=B8=A4=E4=B8=AA=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=9A=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=8C=89=E9=92=AE=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/business/openapi/copywriting.js   |  7 ++++
 .../business/openapi/copywriting/index.vue    | 28 ++++++++++++----
 .../src/main/java/com/xjs/XjsOpenApiApp.java  |  3 ++
 .../controller/CopyWritingController.java     | 10 ++++++
 .../copywriting/mapper/CopyWritingMapper.java |  7 ++++
 .../service/CopyWritingService.java           |  6 ++++
 .../service/impl/CopyWritingServiceImpl.java  |  5 +++
 .../copywriting/task/DeleteRepeatTask.java    | 32 +++++++++++++++++++
 .../mapper/openapi/CopyWritingMapper.xml      |  9 ++++++
 9 files changed, 100 insertions(+), 7 deletions(-)
 create mode 100644 xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/task/DeleteRepeatTask.java

diff --git a/ruoyi-ui/src/api/business/openapi/copywriting.js b/ruoyi-ui/src/api/business/openapi/copywriting.js
index 9cec588f..a061a9b6 100644
--- a/ruoyi-ui/src/api/business/openapi/copywriting.js
+++ b/ruoyi-ui/src/api/business/openapi/copywriting.js
@@ -24,3 +24,10 @@ export function delCopyWriting(id) {
     method: 'delete'
   })
 }
+// 删除重复文案信息
+export function delRepeatCopyWriting() {
+  return request({
+    url: '/openapi/copyWriting/Repeat/',
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/business/openapi/copywriting/index.vue b/ruoyi-ui/src/views/business/openapi/copywriting/index.vue
index a2a3d334..cc5bcca8 100644
--- a/ruoyi-ui/src/views/business/openapi/copywriting/index.vue
+++ b/ruoyi-ui/src/views/business/openapi/copywriting/index.vue
@@ -48,10 +48,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-      </el-col>
-      <el-col :span="1.5">
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -60,7 +56,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['openapi:copywriting:remove']"
+          v-hasPermi="['openapi:copywriting:delete']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -73,6 +69,17 @@
           v-hasPermi="['openapi:copywriting:export']"
         >导出</el-button>
       </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="delRepeatCopyWriting"
+          v-hasPermi="['openapi:copywriting:delete']"
+        >删除重复文案</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -102,7 +109,7 @@
             type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['openapi:copywriting:remove']"
+            v-hasPermi="['openapi:copywriting:delete']"
           ></el-button>
           </el-tooltip>
         </template>
@@ -134,7 +141,7 @@
 </template>
 
 <script>
-import { listCopyWriting, getCopyWriting, delCopyWriting } from "@/api/business/openapi/copywriting";
+import { listCopyWriting, getCopyWriting,delRepeatCopyWriting, delCopyWriting } from "@/api/business/openapi/copywriting";
 
 export default {
   name: "CopyWriting",
@@ -187,6 +194,13 @@ export default {
     this.getList();
   },
   methods: {
+    //删除重复文案
+    delRepeatCopyWriting() {
+      delRepeatCopyWriting().then(res =>{
+        this.$modal.msgSuccess("删除"+res.data+"条");
+      })
+    },
+
     /** 详细按钮操作 */
     handleView(row) {
       this.open = true;
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/XjsOpenApiApp.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/XjsOpenApiApp.java
index c49f841a..52406d62 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/XjsOpenApiApp.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/XjsOpenApiApp.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @author xiejs
@@ -15,6 +16,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableCustomConfig
 @EnableCustomSwagger2
 @EnableRyFeignClients
+//这个服务开启boot内置定时任务
+@EnableScheduling
 public class XjsOpenApiApp {
     public static void main(String[] args) {
         SpringApplication.run(XjsOpenApiApp.class, args);
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java
index 2994d2fd..de95a56f 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java
@@ -67,6 +67,16 @@ public class CopyWritingController extends BaseController {
         return R.ok(copyWriting);
     }
 
+    @DeleteMapping("Repeat")
+    @ApiOperation("删除重复文案内容")
+    @RequiresPermissions("openapi:copywriting:delete")
+    @Log(title = "删除重复文案", businessType = BusinessType.DELETE)
+    public AjaxResult deleteRepeatData() {
+        int count = copyWritingService.deleteRepeatData();
+        return AjaxResult.success(count);
+    }
+
+
     /**
      * 封装随机调用api
      *
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/mapper/CopyWritingMapper.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/mapper/CopyWritingMapper.java
index a460075e..236c24b3 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/mapper/CopyWritingMapper.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/mapper/CopyWritingMapper.java
@@ -24,6 +24,13 @@ public interface CopyWritingMapper extends BaseMapper<CopyWriting> {
     CopyWriting getOneToRandom();
 
 
+    /**
+     * 删除重复文案数据
+     * @return int 删除条数
+     */
+    int deleteRepeatData();
+
+
     //---------------------代码自动生成-------------------------
     /**
      * 查询文案api，通过api获取文案信息
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/service/CopyWritingService.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/service/CopyWritingService.java
index 8132991e..364cfbb2 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/service/CopyWritingService.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/service/CopyWritingService.java
@@ -24,6 +24,12 @@ public interface CopyWritingService extends IService<CopyWriting> {
      */
     CopyWriting getOneToRandom();
 
+    /**
+     * 删除重复文案数据
+     * @return int 删除条数
+     */
+    int deleteRepeatData();
+
 
     //-------------------------代码自动生成----------------------------------
     /**
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/service/impl/CopyWritingServiceImpl.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/service/impl/CopyWritingServiceImpl.java
index 9b4d3329..a31edd29 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/service/impl/CopyWritingServiceImpl.java
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/service/impl/CopyWritingServiceImpl.java
@@ -29,6 +29,11 @@ public class CopyWritingServiceImpl extends ServiceImpl<CopyWritingMapper, CopyW
         return copyWritingMapper.getOneToRandom();
     }
 
+    @Override
+    public int deleteRepeatData() {
+        return copyWritingMapper.deleteRepeatData();
+    }
+
 
     //----------------------代码自动生成------------------------------------
     /**
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
new file mode 100644
index 00000000..e6387b82
--- /dev/null
+++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/task/DeleteRepeatTask.java
@@ -0,0 +1,32 @@
+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/resources/mapper/openapi/CopyWritingMapper.xml b/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/CopyWritingMapper.xml
index 4089d005..f61212d6 100644
--- a/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/CopyWritingMapper.xml
+++ b/xjs-business/xjs-business-openapi/src/main/resources/mapper/openapi/CopyWritingMapper.xml
@@ -66,5 +66,14 @@
         </foreach>
     </delete>
 
+    <delete id="deleteRepeatData">
+        DELETE
+        FROM
+            api_copywriting
+        WHERE
+                content IN ( SELECT t.content FROM ( SELECT content FROM api_copywriting GROUP BY content HAVING count( content ) > 1 ) t )
+          AND id NOT IN ( SELECT c.id FROM ( SELECT max( id ) id FROM api_copywriting GROUP BY content HAVING count( content )> 1 ) c )
+    </delete>
+
 
 </mapper>
\ No newline at end of file