From 22571f80710f66a85045ecd3c217835ef2f9abcb Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Thu, 17 Feb 2022 10:33:50 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E6=B5=AA=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=96=87=E6=A1=88=E7=BD=91=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=88=AB=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../copywritingnetwork/copyWritingNetwork.js  |  9 ++++
 .../api/business/webmagic/sina/sinaNews.js    |  8 +++
 .../webmagic/copywritingnetwork/index.vue     | 49 ++++++++++++-------
 .../business/webmagic/sina/sinaNews/index.vue | 34 +++++++++----
 .../CopyWritingNetworkController.java         | 10 ++++
 .../mapper/CopyWritingNetworkMapper.java      |  5 ++
 .../pojo/CopyWritingNetwork.java              |  5 ++
 .../service/CopyWritingNetworkService.java    |  7 +++
 .../impl/CopyWritingNetworkServiceImpl.java   | 10 ++++
 .../sina/controller/SinaNewsController.java   |  8 +++
 .../com/xjs/sina/service/SinaNewsService.java |  6 +++
 .../service/impl/SinaNewsServiceImpl.java     | 10 ++++
 .../webmagic/CopyWritingNetworkMapper.xml     | 10 ++++
 13 files changed, 144 insertions(+), 27 deletions(-)

diff --git a/ruoyi-ui/src/api/business/webmagic/copywritingnetwork/copyWritingNetwork.js b/ruoyi-ui/src/api/business/webmagic/copywritingnetwork/copyWritingNetwork.js
index b4a57a79..1356f519 100644
--- a/ruoyi-ui/src/api/business/webmagic/copywritingnetwork/copyWritingNetwork.js
+++ b/ruoyi-ui/src/api/business/webmagic/copywritingnetwork/copyWritingNetwork.js
@@ -16,3 +16,12 @@ export function delCopyWritingNetwork(id) {
     method: 'delete'
   })
 }
+
+
+// 获取类型
+export function getType() {
+  return request({
+    url: '/webmagic/copyWritingNetwork/getType',
+    method: 'get',
+  })
+}
diff --git a/ruoyi-ui/src/api/business/webmagic/sina/sinaNews.js b/ruoyi-ui/src/api/business/webmagic/sina/sinaNews.js
index 064bbbb0..c02716d2 100644
--- a/ruoyi-ui/src/api/business/webmagic/sina/sinaNews.js
+++ b/ruoyi-ui/src/api/business/webmagic/sina/sinaNews.js
@@ -16,3 +16,11 @@ export function delSinaNews(id) {
     method: 'delete'
   })
 }
+
+// 获取类型
+export function getType() {
+  return request({
+    url: '/webmagic/sinaNews/getType',
+    method: 'get',
+  })
+}
diff --git a/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue b/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue
index c558da18..a50aab4a 100644
--- a/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue
+++ b/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--      <el-form-item label="文案标签" prop="type">
-              <el-select v-model="queryParams.type" placeholder="请选择文案标签" clearable size="small">
-                <el-option
-                  v-for="dict in dict.type.sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>-->
+      <el-form-item label="文案标签" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择文案标签" clearable size="small">
+          <el-option
+            v-for="index in typeList"
+            :key="index"
+            :label="index"
+            :value="index"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="文案主题" prop="theme">
         <el-input
           v-model="queryParams.theme"
@@ -79,7 +79,7 @@
 
     <el-table v-loading="loading" :data="copyWritingNetworkList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="文案标签" align="center" prop="type" :show-overflow-tooltip="true" width="120px" />
+      <el-table-column label="文案标签" align="center" prop="type" :show-overflow-tooltip="true" width="120px"/>
       <el-table-column label="文案主题" align="center" prop="theme" :show-overflow-tooltip="true" width="200px"/>
       <el-table-column label="文案内容" align="center" prop="content" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
@@ -108,7 +108,11 @@
 </template>
 <script>
 
-import {listCopyWritingNetwork, delCopyWritingNetwork} from "@/api/business/webmagic/copywritingnetwork/copyWritingNetwork"
+import {
+  listCopyWritingNetwork,
+  delCopyWritingNetwork,
+  getType
+} from "@/api/business/webmagic/copywritingnetwork/copyWritingNetwork"
 
 export default {
   name: "CopyWritingNetwork",
@@ -147,8 +151,10 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
+      rules: {},
+
+      //类型集合
+      typeList:[],
 
       //日期组件
       pickerOptions: {
@@ -190,8 +196,16 @@ export default {
   },
   created() {
     this.getList();
+    this.getType();
   },
   methods: {
+    //获取类型
+    getType() {
+      getType().then(res =>{
+        this.typeList=res.data
+      })
+    },
+
     /** 查询文案网列表 */
     getList() {
       this.loading = true;
@@ -238,19 +252,20 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
 
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除文案网编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除文案网编号为"' + ids + '"的数据项？').then(function () {
         return delCopyWritingNetwork(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
 
 
diff --git a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue
index 497b5156..e7c28939 100644
--- a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue
+++ b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue
@@ -2,6 +2,17 @@
   <div class="app-container">
 
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="新闻分类" prop="category">
+        <el-select v-model="queryParams.category" placeholder="请输入新闻分类" clearable size="small">
+          <el-option
+            v-for="index in typeList"
+            :key="index"
+            :label="index"
+            :value="index"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -11,15 +22,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="新闻分类" prop="category">
-        <el-input
-          v-model="queryParams.category"
-          placeholder="请输入新闻分类"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="daterangeCreateTime"
@@ -95,7 +98,7 @@
 
 <script>
 
-import {listSinaNews, delSinaNews} from "@/api/business/webmagic/sina/sinaNews"
+import {listSinaNews, delSinaNews,getType} from "@/api/business/webmagic/sina/sinaNews"
 
 export default {
   name: "SinaNews",
@@ -134,6 +137,9 @@ export default {
       //检查查询范围
       daterangeCreateTime: [],
 
+      //类型集合
+      typeList:[],
+
       //日期组件
       pickerOptions: {
         shortcuts: [{
@@ -175,8 +181,16 @@ export default {
 
   created() {
     this.getList();
+    this.getType();
   },
   methods: {
+    //获取类型
+    getType() {
+      getType().then(res =>{
+        this.typeList=res.data
+      })
+    },
+
     //跳转链接
     to(url) {
       window.open(url, "_blank");
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/controller/CopyWritingNetworkController.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/controller/CopyWritingNetworkController.java
index 95c380c7..8da92b74 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/controller/CopyWritingNetworkController.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/controller/CopyWritingNetworkController.java
@@ -35,6 +35,16 @@ public class CopyWritingNetworkController extends MyBaseController {
     @Autowired
     private CopyWritingNetworkTask copyWritingNetworkTask;
 
+
+    @GetMapping("getType")
+    @ApiOperation("获取标签")
+    public AjaxResult getType() {
+        List<Object> typeList=copyWritingNetworkService.getType();
+        return AjaxResult.success(typeList);
+    }
+
+
+
     //----------------------远程rpc调用---------------------------
     @GetMapping("taskForPRC")
     @ApiOperation("供定时任务服务RPC远程调用")
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/mapper/CopyWritingNetworkMapper.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/mapper/CopyWritingNetworkMapper.java
index f1752673..90392dcf 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/mapper/CopyWritingNetworkMapper.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/mapper/CopyWritingNetworkMapper.java
@@ -45,4 +45,9 @@ public interface CopyWritingNetworkMapper extends BaseMapper<CopyWritingNetwork>
      */
     public int deleteCopyWritingNetworkByIds(Long[] ids);
 
+    /**
+     * 获取文案的标签
+     * @return list
+     */
+    List<String> getType();
 }
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/pojo/CopyWritingNetwork.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/pojo/CopyWritingNetwork.java
index 3ce6c737..c0bad679 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/pojo/CopyWritingNetwork.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/pojo/CopyWritingNetwork.java
@@ -3,6 +3,7 @@ package com.xjs.copywritingNetwork.pojo;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.annotation.Excel;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -21,16 +22,20 @@ public class CopyWritingNetwork implements Serializable {
     private Long id;
 
     /** 文案标签 */
+    @Excel(name = "文案标签")
     private String type;
 
     /** 文案主题 */
+    @Excel(name = "文案主题")
     private String theme;
 
     /** 文案内容 */
+    @Excel(name = "文案内容")
     private String content;
 
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/CopyWritingNetworkService.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/CopyWritingNetworkService.java
index fc56c58f..51e16f52 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/CopyWritingNetworkService.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/CopyWritingNetworkService.java
@@ -44,4 +44,11 @@ public interface CopyWritingNetworkService extends IService<CopyWritingNetwork>
      * @return 结果
      */
     int deleteCopyWritingNetworkById(Long id);
+
+    /**
+     * 获取文案的标签
+     * @return list
+     */
+    List<Object> getType();
+
 }
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java
index 8283f33e..c0cf52b1 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xjs.copywritingNetwork.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xjs.copywritingNetwork.mapper.CopyWritingNetworkMapper;
 import com.xjs.copywritingNetwork.pojo.CopyWritingNetwork;
@@ -58,4 +59,13 @@ public class CopyWritingNetworkServiceImpl extends ServiceImpl<CopyWritingNetwor
     public int deleteCopyWritingNetworkById(Long id) {
         return copyWritingNetworkMapper.deleteCopyWritingNetworkById(id);
     }
+
+    @Override
+    public List<Object> getType() {
+        QueryWrapper<CopyWritingNetwork> wrapper = new QueryWrapper<>();
+        wrapper.groupBy("type");
+        wrapper.select("type");
+
+        return this.listObjs(wrapper);
+    }
 }
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/controller/SinaNewsController.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/controller/SinaNewsController.java
index fef15e88..f2095a57 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/controller/SinaNewsController.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/controller/SinaNewsController.java
@@ -33,6 +33,14 @@ public class SinaNewsController extends MyBaseController {
     private SinaNewsService sinaNewsService;
 
 
+    @GetMapping("getType")
+    @ApiOperation("获取标签")
+    public AjaxResult getType() {
+        List<Object> typeList=sinaNewsService.getType();
+        return AjaxResult.success(typeList);
+    }
+
+
     //----------------------远程rpc调用---------------------------
     @GetMapping("taskForPRC")
     @ApiOperation("供定时任务服务RPC远程调用")
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/SinaNewsService.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/SinaNewsService.java
index df33efe0..b7c3b1e5 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/SinaNewsService.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/SinaNewsService.java
@@ -42,4 +42,10 @@ public interface SinaNewsService extends IService<SinaNews> {
      * @return 结果
      */
     public int deleteSinaNewsById(Long id);
+
+    /**
+     * 获取新闻分类
+     * @return List
+     */
+    List<Object> getType();
 }
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java
index 190a34bf..5003611a 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xjs.sina.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xjs.sina.mapper.SinaNewsMapper;
 import com.xjs.sina.pojo.SinaNews;
@@ -59,4 +60,13 @@ public class SinaNewsServiceImpl extends ServiceImpl<SinaNewsMapper, SinaNews> i
     public int deleteSinaNewsById(Long id) {
         return sinaNewsMapper.deleteSinaNewsById(id);
     }
+
+    @Override
+    public List<Object> getType() {
+        QueryWrapper<SinaNews> wrapper = new QueryWrapper<>();
+        wrapper.groupBy("category");
+        wrapper.select("category");
+
+        return this.listObjs(wrapper);
+    }
 }
diff --git a/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/CopyWritingNetworkMapper.xml b/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/CopyWritingNetworkMapper.xml
index cfc151ea..123ecce0 100644
--- a/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/CopyWritingNetworkMapper.xml
+++ b/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/CopyWritingNetworkMapper.xml
@@ -29,6 +29,16 @@
         order by create_time desc
     </select>
 
+
+    <select id="getType" resultType="java.lang.String">
+        SELECT
+            type
+        FROM
+            webmagic_copywriting_network
+        GROUP BY
+            type
+    </select>
+
     <delete id="deleteRepeatData">
         delete from webmagic_copywriting_network where id not in	(
             SELECT