1、爬虫服务新增新浪新闻模块数据前端展示
This commit is contained in:
xjs
parent
1b0625318c
commit
51324b5f0b
|
|
@ -16,6 +16,6 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|||
fallbackFactory = RemoteWebmagicSinaFactory.class)
|
||||
public interface RemoteWebmagicSinaFeign {
|
||||
|
||||
@GetMapping("/sina/taskForPRC")
|
||||
@GetMapping("/sinaNews/taskForPRC")
|
||||
R sinaTaskForPRC();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 查询新浪新闻列表
|
||||
export function listSinaNews(query) {
|
||||
return request({
|
||||
url: '/webmagic/sinaNews/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 删除新浪新闻
|
||||
export function delSinaNews(id) {
|
||||
return request({
|
||||
url: '/webmagic/sinaNews/' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
|
@ -0,0 +1,254 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
|
||||
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="标题" prop="title">
|
||||
<el-input
|
||||
v-model="queryParams.title"
|
||||
placeholder="请输入标题"
|
||||
clearable
|
||||
size="small"
|
||||
@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"
|
||||
size="small"
|
||||
style="width: 320px"
|
||||
value-format="yyyy-MM-dd"
|
||||
format="yyyy 年 MM 月 dd 日"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:picker-options="pickerOptions"
|
||||
@change="handleQuery"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['webmagic:sinaNews:remove']"
|
||||
>删除
|
||||
</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="sinaNewsList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column label="标题" align="center" prop="title" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<p style="cursor:pointer" v-text="scope.row.title" @click="to(scope.row.url)"></p>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="新闻分类" align="center" prop="category" width="250px"/>
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="250px" :show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['webmagic:sinaNews:remove']"
|
||||
>删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import {listSinaNews, delSinaNews} from "@/api/business/webmagic/sina/sinaNews"
|
||||
|
||||
export default {
|
||||
name: "SinaNews",
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 新浪新闻表格数据
|
||||
sinaNewsList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
title: null,
|
||||
category: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {},
|
||||
|
||||
//检查查询范围
|
||||
daterangeCreateTime: [],
|
||||
|
||||
//日期组件
|
||||
pickerOptions: {
|
||||
shortcuts: [{
|
||||
text: '昨天',
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24);
|
||||
picker.$emit('pick', [start, end]);
|
||||
}
|
||||
}, {
|
||||
text: '最近一周',
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
||||
picker.$emit('pick', [start, end]);
|
||||
}
|
||||
}, {
|
||||
text: '最近一个月',
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
||||
picker.$emit('pick', [start, end]);
|
||||
}
|
||||
}, {
|
||||
text: '最近三个月',
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
||||
picker.$emit('pick', [start, end]);
|
||||
}
|
||||
}]
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
//跳转链接
|
||||
to(url) {
|
||||
window.open(url, "_blank");
|
||||
},
|
||||
|
||||
/** 查询新浪新闻列表 */
|
||||
getList() {
|
||||
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
|
||||
this.queryParams.createTime = this.daterangeCreateTime[0];
|
||||
this.queryParams.endCreateTime = this.daterangeCreateTime[1];
|
||||
}
|
||||
|
||||
this.loading = true;
|
||||
listSinaNews(this.queryParams).then(response => {
|
||||
this.sinaNewsList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
title: null,
|
||||
category: null,
|
||||
url: null,
|
||||
createTime: null
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.daterangeCreateTime = [];
|
||||
this.queryParams.createTime = null
|
||||
this.queryParams.endCreateTime = null
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.id)
|
||||
this.single = selection.length !== 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
|
||||
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否确认删除新浪新闻编号为"' + ids + '"的数据项？').then(function () {
|
||||
return delSinaNews(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {
|
||||
});
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
<version>3.3.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<name>业务模块-博客模块</name>
|
||||
|
||||
<artifactId>xjs-business-blog</artifactId>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,34 +1,36 @@
|
|||
package com.xjs.sina.controller;
|
||||
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.common.core.web.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.web.page.TableDataInfo;
|
||||
import com.ruoyi.common.log.annotation.Log;
|
||||
import com.ruoyi.common.log.enums.BusinessType;
|
||||
import com.ruoyi.common.security.annotation.RequiresPermissions;
|
||||
import com.xjs.sina.pojo.SinaNews;
|
||||
import com.xjs.sina.service.SinaNewsService;
|
||||
import com.xjs.sina.task.SinaTask;
|
||||
import com.xjs.web.MyBaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 新浪爬虫数据controller
|
||||
*
|
||||
* @author xiejs
|
||||
* @since 2022-02-15
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("sina")
|
||||
@RequestMapping("sinaNews")
|
||||
@Api(tags = "爬虫模块-新浪新闻")
|
||||
public class SinaNewsController {
|
||||
public class SinaNewsController extends MyBaseController {
|
||||
@Autowired
|
||||
private SinaTask sinaTask;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@Autowired
|
||||
private SinaNewsService sinaNewsService;
|
||||
|
||||
|
||||
//----------------------远程rpc调用---------------------------
|
||||
|
|
@ -39,4 +41,29 @@ public class SinaNewsController {
|
|||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
//----------------------代码生成----------------------------
|
||||
|
||||
/**
|
||||
* 查询新浪新闻列表
|
||||
*/
|
||||
@RequiresPermissions("webmagic:sinaNews:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(SinaNews sinaNews) {
|
||||
startPage();
|
||||
List<SinaNews> list = sinaNewsService.selectSinaNewsList(sinaNews);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除新浪新闻
|
||||
*/
|
||||
@RequiresPermissions("webmagic:sinaNews:remove")
|
||||
@Log(title = "新浪新闻", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
return toAjax(sinaNewsService.deleteSinaNewsByIds(ids));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,10 @@ package com.xjs.sina.mapper;
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.xjs.sina.pojo.SinaNews;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 新浪新闻mapper
|
||||
* @author xiejs
|
||||
* @since 2022-02-15
|
||||
*/
|
||||
|
|
@ -14,4 +17,30 @@ public interface SinaNewsMapper extends BaseMapper<SinaNews> {
|
|||
* @return int
|
||||
*/
|
||||
int deleteRepeatData();
|
||||
|
||||
//-------------------------代码生成----------------------------
|
||||
|
||||
/**
|
||||
* 查询新浪新闻列表
|
||||
*
|
||||
* @param sinaNews 新浪新闻
|
||||
* @return 新浪新闻集合
|
||||
*/
|
||||
public List<SinaNews> selectSinaNewsList(SinaNews sinaNews);
|
||||
|
||||
/**
|
||||
* 删除新浪新闻
|
||||
*
|
||||
* @param id 新浪新闻主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSinaNewsById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除新浪新闻
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSinaNewsByIds(Long[] ids);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.xjs.sina.pojo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
|
@ -35,5 +36,14 @@ public class SinaNews implements Serializable {
|
|||
*/
|
||||
private String url;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 查询条件的结束时间
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Date endCreateTime;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ package com.xjs.sina.service;
|
|||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.xjs.sina.pojo.SinaNews;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 新浪新闻爬虫Service接口
|
||||
* @author xiejs
|
||||
|
|
@ -14,4 +16,30 @@ public interface SinaNewsService extends IService<SinaNews> {
|
|||
* @return int
|
||||
*/
|
||||
int deleteRepeatData();
|
||||
|
||||
//-------------------------代码生成----------------------------
|
||||
|
||||
/**
|
||||
* 查询新浪新闻列表
|
||||
*
|
||||
* @param sinaNews 新浪新闻
|
||||
* @return 新浪新闻集合
|
||||
*/
|
||||
public List<SinaNews> selectSinaNewsList(SinaNews sinaNews);
|
||||
|
||||
/**
|
||||
* 批量删除新浪新闻
|
||||
*
|
||||
* @param ids 需要删除的新浪新闻主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSinaNewsByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除新浪新闻信息
|
||||
*
|
||||
* @param id 新浪新闻主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSinaNewsById(Long id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@ import com.xjs.sina.service.SinaNewsService;
|
|||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 新浪新闻爬虫Service接口实现
|
||||
*
|
||||
* @author xiejs
|
||||
* @since 2022-02-15
|
||||
*/
|
||||
|
|
@ -22,4 +24,39 @@ public class SinaNewsServiceImpl extends ServiceImpl<SinaNewsMapper, SinaNews> i
|
|||
public int deleteRepeatData() {
|
||||
return sinaNewsMapper.deleteRepeatData();
|
||||
}
|
||||
|
||||
//-------------------------代码生成----------------------------
|
||||
|
||||
/**
|
||||
* 查询新浪新闻列表
|
||||
*
|
||||
* @param sinaNews 新浪新闻
|
||||
* @return 新浪新闻
|
||||
*/
|
||||
@Override
|
||||
public List<SinaNews> selectSinaNewsList(SinaNews sinaNews) {
|
||||
return sinaNewsMapper.selectSinaNewsList(sinaNews);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除新浪新闻
|
||||
*
|
||||
* @param ids 需要删除的新浪新闻主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteSinaNewsByIds(Long[] ids) {
|
||||
return sinaNewsMapper.deleteSinaNewsByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除新浪新闻信息
|
||||
*
|
||||
* @param id 新浪新闻主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteSinaNewsById(Long id) {
|
||||
return sinaNewsMapper.deleteSinaNewsById(id);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,38 @@
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.xjs.sina.mapper.SinaNewsMapper">
|
||||
|
||||
<resultMap type="com.xjs.sina.pojo.SinaNews" id="SinaNewsResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="title" column="title" />
|
||||
<result property="category" column="category" />
|
||||
<result property="url" column="url" />
|
||||
<result property="createTime" column="create_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSinaNewsVo">
|
||||
select id, title, category, url, create_time from webmagic_sina_news
|
||||
</sql>
|
||||
|
||||
<select id="selectSinaNewsList" parameterType="com.xjs.sina.pojo.SinaNews" resultMap="SinaNewsResult">
|
||||
<include refid="selectSinaNewsVo"/>
|
||||
<where>
|
||||
<if test="title != null and title != ''"> and title like concat('%', #{title}, '%')</if>
|
||||
<if test="category != null and category != ''"> and category = #{category}</if>
|
||||
<if test="createTime != null and endCreateTime != null"> and create_time between #{createTime} and #{endCreateTime}</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<delete id="deleteSinaNewsById" parameterType="Long">
|
||||
delete from webmagic_sina_news where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteSinaNewsByIds" parameterType="String">
|
||||
delete from webmagic_sina_news where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<delete id="deleteRepeatData">
|
||||
DELETE
|
||||
|
|
|
|||
Loading…
Reference in New Issue