From 51324b5f0b075e72de86c1e0654b0de4a4d766c5 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Wed, 16 Feb 2022 08:52:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=88=AC=E8=99=AB=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E6=B5=AA=E6=96=B0=E9=97=BB=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=95=B0=E6=8D=AE=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webmagic/RemoteWebmagicSinaFeign.java | 2 +- .../api/business/webmagic/sina/sinaNews.js | 18 ++ .../business/webmagic/sina/sinaNews/index.vue | 254 ++++++++++++++++++ xjs-business/xjs-business-blog/pom.xml | 1 + .../sina/controller/SinaNewsController.java | 55 +++- .../com/xjs/sina/mapper/SinaNewsMapper.java | 29 ++ .../main/java/com/xjs/sina/pojo/SinaNews.java | 10 + .../com/xjs/sina/service/SinaNewsService.java | 28 ++ .../service/impl/SinaNewsServiceImpl.java | 37 +++ .../mapper/webmagic/SinaNewsMapper.xml | 32 +++ 10 files changed, 451 insertions(+), 15 deletions(-) create mode 100644 ruoyi-ui/src/api/business/webmagic/sina/sinaNews.js create mode 100644 ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/webmagic/RemoteWebmagicSinaFeign.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/webmagic/RemoteWebmagicSinaFeign.java index 992711c3..874dc6fb 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/webmagic/RemoteWebmagicSinaFeign.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/webmagic/RemoteWebmagicSinaFeign.java @@ -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(); } diff --git a/ruoyi-ui/src/api/business/webmagic/sina/sinaNews.js b/ruoyi-ui/src/api/business/webmagic/sina/sinaNews.js new file mode 100644 index 00000000..064bbbb0 --- /dev/null +++ b/ruoyi-ui/src/api/business/webmagic/sina/sinaNews.js @@ -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' + }) +} diff --git a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue new file mode 100644 index 00000000..de17d42d --- /dev/null +++ b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/xjs-business/xjs-business-blog/pom.xml b/xjs-business/xjs-business-blog/pom.xml index 90faceb9..3f30221a 100644 --- a/xjs-business/xjs-business-blog/pom.xml +++ b/xjs-business/xjs-business-blog/pom.xml @@ -8,6 +8,7 @@ 3.3.0 4.0.0 + 业务模块-博客模块 xjs-business-blog 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 39a968db..93119b10 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 @@ -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 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)); + } + + } diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/mapper/SinaNewsMapper.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/mapper/SinaNewsMapper.java index 88a754d4..628ab434 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/mapper/SinaNewsMapper.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/mapper/SinaNewsMapper.java @@ -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 { * @return int */ int deleteRepeatData(); + + //-------------------------代码生成---------------------------- + + /** + * 查询新浪新闻列表 + * + * @param sinaNews 新浪新闻 + * @return 新浪新闻集合 + */ + public List selectSinaNewsList(SinaNews sinaNews); + + /** + * 删除新浪新闻 + * + * @param id 新浪新闻主键 + * @return 结果 + */ + public int deleteSinaNewsById(Long id); + + /** + * 批量删除新浪新闻 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSinaNewsByIds(Long[] ids); } diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/pojo/SinaNews.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/pojo/SinaNews.java index a78ddad5..9fdb8138 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/pojo/SinaNews.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/pojo/SinaNews.java @@ -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; } 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 308f6a5d..df33efe0 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 @@ -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 { * @return int */ int deleteRepeatData(); + + //-------------------------代码生成---------------------------- + + /** + * 查询新浪新闻列表 + * + * @param sinaNews 新浪新闻 + * @return 新浪新闻集合 + */ + public List selectSinaNewsList(SinaNews sinaNews); + + /** + * 批量删除新浪新闻 + * + * @param ids 需要删除的新浪新闻主键集合 + * @return 结果 + */ + public int deleteSinaNewsByIds(Long[] ids); + + /** + * 删除新浪新闻信息 + * + * @param id 新浪新闻主键 + * @return 结果 + */ + public int deleteSinaNewsById(Long id); } 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 739629c9..190a34bf 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 @@ -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 i public int deleteRepeatData() { return sinaNewsMapper.deleteRepeatData(); } + + //-------------------------代码生成---------------------------- + + /** + * 查询新浪新闻列表 + * + * @param sinaNews 新浪新闻 + * @return 新浪新闻 + */ + @Override + public List 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); + } } diff --git a/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/SinaNewsMapper.xml b/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/SinaNewsMapper.xml index d89e6871..ae269649 100644 --- a/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/SinaNewsMapper.xml +++ b/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/SinaNewsMapper.xml @@ -4,6 +4,38 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + select id, title, category, url, create_time from webmagic_sina_news + + + + + + delete from webmagic_sina_news where id = #{id} + + + + delete from webmagic_sina_news where id in + + #{id} + + DELETE