冲突解决-glj
This commit is contained in:
glj
commit
ff7e4eabaa
|
|
@ -1,5 +1,6 @@
|
|||
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;
|
||||
|
|
@ -15,14 +16,19 @@ import java.util.Date;
|
|||
@TableName(value ="crawl_info")
|
||||
@Data
|
||||
public class CrawlInfo implements Serializable {
|
||||
|
||||
|
||||
/**
|
||||
* 自增列
|
||||
*/
|
||||
@TableId
|
||||
private Integer id;
|
||||
@TableId(
|
||||
value = "id",
|
||||
type = IdType.ASSIGN_ID
|
||||
)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 爬虫类型 1-bing,2-baidu 3-twitter,4-weibo 5 -landset.6-sentinel,7-searchone,8 word clouds，9-hotspot
|
||||
* 爬虫类型 1-bing,2-baidu 3-twitter,4-weibo 5 -landset.6-sentinel,7-searchone,
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
|
|
@ -59,6 +65,7 @@ public class CrawlInfo implements Serializable {
|
|||
/**
|
||||
* 实际爬取范围
|
||||
*/
|
||||
@TableField("`range`")
|
||||
private String range;
|
||||
|
||||
@TableField(exist = false)
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
|
|||
@SpringCloudApplication
|
||||
public class VoRdmApplication {
|
||||
public static void main(String[] args) {
|
||||
BladeApplication.run("glj-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
|
||||
BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,20 @@
|
|||
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.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
|
|
@ -17,9 +24,52 @@ 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<IPage<CrawlInfo>> list(CrawlInfo crawlInfo, Query query) {
|
||||
IPage<CrawlInfo> 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(@RequestBody CrawlInfo crawlInfo) {
|
||||
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<CrawlInfo> 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -64,9 +64,12 @@ public class NewsController {
|
|||
})
|
||||
@GetMapping("/list")
|
||||
public R<IPage<News>> list(News news, Query query) {
|
||||
String title = news.getTitle();
|
||||
news.setTitle(null);
|
||||
QueryWrapper<News> queryWrapper = Condition.getQueryWrapper(news);
|
||||
queryWrapper.orderByDesc("contact_date");
|
||||
IPage<News> pages = newsService.page(Condition.getPage(query), Condition.getQueryWrapper(news));
|
||||
queryWrapper.like("title",title);
|
||||
queryWrapper.orderByDesc("title");
|
||||
IPage<News> pages = newsService.page(Condition.getPage(query), queryWrapper);
|
||||
return R.data(pages);
|
||||
}
|
||||
@PostMapping("review")
|
||||
|
|
|
|||
|
|
@ -4,13 +4,17 @@ package com.kening.vordm.mapper;
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.kening.vordm.entity.CrawlInfo;
|
||||
|
||||
|
||||
/**
|
||||
* @author G1393
|
||||
* @author Administrator
|
||||
* @description 针对表【crawl_info】的数据库操作Mapper
|
||||
* @createDate 2023-04-21 16:51:37
|
||||
* @Entity new.domain.CrawlInfo
|
||||
* @createDate 2023-04-20 16:53:45
|
||||
* @Entity com.kening.vordm.entity.CrawlInfo
|
||||
*/
|
||||
public interface CrawlInfoMapper extends BaseMapper<CrawlInfo> {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -21,4 +21,5 @@
|
|||
status,disaster_id,start_time,
|
||||
end_time,keywords,range
|
||||
</sql>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@ package com.kening.vordm.service;
|
|||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.kening.vordm.entity.CrawlInfo;
|
||||
|
||||
|
||||
/**
|
||||
* @author G1393
|
||||
* @author Administrator
|
||||
* @description 针对表【crawl_info】的数据库操作Service
|
||||
* @createDate 2023-04-21 16:51:37
|
||||
* @createDate 2023-04-20 16:53:45
|
||||
*/
|
||||
public interface CrawlInfoService extends IService<CrawlInfo> {
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,20 @@ import com.kening.vordm.mapper.CrawlInfoMapper;
|
|||
import com.kening.vordm.service.CrawlInfoService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
||||
/**
|
||||
* @author G1393
|
||||
* @author Administrator
|
||||
* @description 针对表【crawl_info】的数据库操作Service实现
|
||||
* @createDate 2023-04-21 16:51:37
|
||||
* @createDate 2023-04-20 16:53:45
|
||||
*/
|
||||
@Service
|
||||
public class CrawlInfoServiceImpl extends ServiceImpl<CrawlInfoMapper, CrawlInfo>
|
||||
implements CrawlInfoService{
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue