diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java new file mode 100644 index 0000000..5526eea --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java @@ -0,0 +1,73 @@ +package com.kening.vordm.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @TableName crawl_info + */ +@TableName(value ="crawl_info") +@Data +public class CrawlInfo implements Serializable { + /** + * 自增列 + */ + @TableId( + value = "id", + type = IdType.ASSIGN_ID + ) + private Long id; + + /** + * 爬虫类型 1-bing,2-baidu 3-twitter,4-weibo 5 -landset.6-sentinel,7-searchone, + */ + private Integer type; + + /** + * 管理人员 + */ + private Long manageId; + + /** + * 爬虫状态，0-未开始，1-正在爬取 2已完成 + */ + private Integer status; + + /** + * 灾害id + */ + private Long disasterId; + + /** + * 启动时间 + */ + private Date startTime; + + /** + * 完成时间 + */ + private Date endTime; + + /** + * 实际关键词 + */ + private String keywords; + + /** + * 实际爬取范围 + */ + @TableField("`range`") + private String range; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java new file mode 100644 index 0000000..44dff47 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java @@ -0,0 +1,68 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.kening.vordm.entity.CrawlInfo; +import com.kening.vordm.service.CrawlInfoService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +@RestController +@AllArgsConstructor +@RequestMapping("/ui/crawlInfo") +public class CrawlInfoController{ + private CrawlInfoService crawlInfoService; + @ApiOperationSupport(order = 1) + @ApiOperation(value = "分页", notes = "传入CrawlInfo") + @ApiImplicitParams({ + @ApiImplicitParam(name = "current", value = "当前页", paramType = "query", dataType = "int"), + @ApiImplicitParam(name = "size", value = "分页大小", paramType = "query", dataType = "int") + }) + @GetMapping("/list") + public R> list(CrawlInfo crawlInfo, Query query) { + IPage pages = crawlInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(crawlInfo)); + return R.data(pages); + } + @ApiOperationSupport(order = 2) + @ApiOperation(value = "新增", notes = "传入CrawlInfo") + @PostMapping("/save") + public R save(@ApiParam(value = "CrawlInfo对象", required = true) @RequestBody CrawlInfo crawlInfo) { + return R.status(crawlInfoService.save(crawlInfo)); + } + @ApiOperationSupport(order = 3) + @ApiOperation(value = "修改", notes = "传入CrawlInfo") + @PostMapping("/update") + public R update(@ApiParam(value = "CrawlInfo对象", required = true) @RequestBody CrawlInfo crawlInfo) { + return R.status(crawlInfoService.updateById(crawlInfo)); + } + @ApiOperationSupport(order = 4) + @ApiOperation(value = "删除", notes = "传入id") + @PostMapping("/remove") + public R remove(@ApiParam(value = "主键", required = true) @RequestParam String ids) { + return R.status(crawlInfoService.removeByIds(Arrays.asList(ids.split(",")))); + } + @ApiOperationSupport(order = 5) + @ApiOperation(value = "详情", notes = "传入id") + @GetMapping("/detail") + public R detail(@ApiParam(value = "主键", required = true) @RequestParam String id) { + CrawlInfo detail = crawlInfoService.getById(id); + return R.data(detail); + } + @ApiOperationSupport(order = 6) + @ApiOperation(value = "提交", notes = "传入CrawlInfo") + @PostMapping("/submit") + public R submit(@ApiParam(value = "CrawlInfo对象", required = true) @RequestBody CrawlInfo crawlInfo) { + boolean bool=crawlInfoService.saveOrUpdate(crawlInfo); + return R.data(bool?crawlInfo:1042); + } +} + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java index 56fede1..ba7d236 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java @@ -64,9 +64,12 @@ public class NewsController { }) @GetMapping("/list") public R> list(News news, Query query) { + String title = news.getTitle(); + news.setTitle(null); QueryWrapper queryWrapper = Condition.getQueryWrapper(news); - queryWrapper.orderByDesc("contact_date"); - IPage pages = newsService.page(Condition.getPage(query), Condition.getQueryWrapper(news)); + queryWrapper.like("title",title); + queryWrapper.orderByDesc("title"); + IPage pages = newsService.page(Condition.getPage(query), queryWrapper); return R.data(pages); } @PostMapping("review") diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.java new file mode 100644 index 0000000..795fd7c --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.java @@ -0,0 +1,18 @@ +package com.kening.vordm.mapper; + +import com.kening.vordm.entity.CrawlInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【crawl_info】的数据库操作Mapper +* @createDate 2023-04-20 16:53:45 +* @Entity com.kening.vordm.entity.CrawlInfo +*/ +public interface CrawlInfoMapper extends BaseMapper { + +} + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.xml new file mode 100644 index 0000000..d0ecf66 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + id,type,manage_id, + staus,disaster_id,start_time, + end_time,keywords,range + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CrawlInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CrawlInfoService.java new file mode 100644 index 0000000..0b54112 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CrawlInfoService.java @@ -0,0 +1,13 @@ +package com.kening.vordm.service; + +import com.kening.vordm.entity.CrawlInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【crawl_info】的数据库操作Service +* @createDate 2023-04-20 16:53:45 +*/ +public interface CrawlInfoService extends IService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CrawlInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CrawlInfoServiceImpl.java new file mode 100644 index 0000000..177c8d8 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CrawlInfoServiceImpl.java @@ -0,0 +1,22 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.CrawlInfo; +import com.kening.vordm.service.CrawlInfoService; +import com.kening.vordm.mapper.CrawlInfoMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【crawl_info】的数据库操作Service实现 +* @createDate 2023-04-20 16:53:45 +*/ +@Service +public class CrawlInfoServiceImpl extends ServiceImpl + implements CrawlInfoService{ + +} + + + +