1、新浪新闻模块和文案网模块根据类别查询，获取所有类别

4 years ago · 22571f8071
parent 9f150e483c
commit 22571f8071
13 changed files with 144 additions and 27 deletions
--- 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',
+  })
+}
--- 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',
+  })
+}
--- 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-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"
+            v-for="index in typeList"
+            :key="index"
+            :label="index"
+            :value="index"
          />
        </el-select>
-            </el-form-item>-->
+      </el-form-item>
      <el-form-item label="文案主题" prop="theme">
        <el-input
          v-model="queryParams.theme"
@ -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;
@ -250,7 +264,8 @@ export default {
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
    },


--- 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");
--- 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远程调用")
--- 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();
 }
--- 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;


--- 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();
+
 }
--- 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);
+    }
 }
--- 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远程调用")
--- 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();
 }
--- 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);
+    }
 }
--- 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