Merge branch 'yyhouc'
This commit is contained in:
commit
63c4a85a5f
|
@ -73,5 +73,31 @@ public class CrawlInfoController {
|
||||||
boolean bool=crawlInfoService.saveOrUpdateBatch(crawlInfo);
|
boolean bool=crawlInfoService.saveOrUpdateBatch(crawlInfo);
|
||||||
return R.data(bool?crawlInfo:1042);
|
return R.data(bool?crawlInfo:1042);
|
||||||
}
|
}
|
||||||
|
@ApiOperationSupport(order = 7)
|
||||||
|
@ApiOperation(value = "提交", notes = "传入CrawlInfo")
|
||||||
|
@PostMapping("/submit2")
|
||||||
|
public R submit2(@ApiParam(value = "CrawlInfo对象", required = true) @RequestBody List<CrawlInfo> crawlInfo) {
|
||||||
|
//根据type与Id判断是更新还是新增
|
||||||
|
boolean bool= false;
|
||||||
|
for (CrawlInfo info : crawlInfo) {
|
||||||
|
CrawlInfo one = crawlInfoService.getOne(Wrappers.<CrawlInfo>query().lambda().eq(CrawlInfo::getType, info.getType()).eq(CrawlInfo::getDisasterId, info.getDisasterId()));
|
||||||
|
if (one!=null){
|
||||||
|
//构建更新条件 根据type与disasterId.
|
||||||
|
bool=crawlInfoService.update(info,Wrappers.<CrawlInfo>query().lambda().eq(CrawlInfo::getType, info.getType()).eq(CrawlInfo::getDisasterId, info.getDisasterId()));
|
||||||
|
}else {
|
||||||
|
bool=crawlInfoService.save(info);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return R.data(bool?crawlInfo:1042);
|
||||||
|
}
|
||||||
|
//根据disasterId查询所有爬虫状态
|
||||||
|
@ApiOperationSupport(order = 7)
|
||||||
|
@ApiOperation(value = "查询爬虫状态", notes = "传入CrawlInfo")
|
||||||
|
@GetMapping("/getStatus")
|
||||||
|
public R getStatus(Long disasterId) {
|
||||||
|
//根据disasterId查询所有爬虫状态
|
||||||
|
List<CrawlInfo> list = crawlInfoService.list(Wrappers.<CrawlInfo>query().lambda().eq(CrawlInfo::getDisasterId, disasterId).notIn(CrawlInfo::getType, "1","2","3","4"));
|
||||||
|
return R.data(list);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue