Merge branch 'yyhouc'
This commit is contained in:
commit
637b99e087
|
@ -1,6 +1,7 @@
|
|||
package com.kening.vordm.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
||||
import com.kening.vordm.entity.CrawlInfo;
|
||||
import com.kening.vordm.service.CrawlInfoService;
|
||||
|
@ -15,6 +16,7 @@ import org.springblade.core.tool.api.R;
|
|||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@AllArgsConstructor
|
||||
|
@ -67,8 +69,8 @@ public class CrawlInfoController {
|
|||
@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);
|
||||
public R submit(@ApiParam(value = "CrawlInfo对象", required = true) @RequestBody List<CrawlInfo> crawlInfo) {
|
||||
boolean bool=crawlInfoService.saveBatch(crawlInfo);
|
||||
return R.data(bool?crawlInfo:1042);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -314,7 +314,6 @@ public class DisasterInfoController {
|
|||
guestInfo.setId(one.getId());
|
||||
flag1 = guestInfoService.updateById(guestInfo);
|
||||
}
|
||||
|
||||
DisasterInfo disasterInfo = new DisasterInfo();
|
||||
BeanUtil.copyProperties(callForHelpVo, disasterInfo);
|
||||
disasterInfo.setUploadTime(new Date());
|
||||
|
|
|
@ -183,6 +183,7 @@ public class DictBizController {
|
|||
dictBiz.setId(null);
|
||||
//添加父子关系
|
||||
dictBiz.setParentId(dict.getId());
|
||||
dictBiz.setCode(dict.getDictKey());
|
||||
}
|
||||
return R.success(dictService.saveBatch(list)||list.size()==0?"操作成功":"操作失败");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue