Commit 939cfb16 authored by 廖旭伟's avatar 廖旭伟

修改测试bug

parent 9ce82895
...@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -50,7 +51,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService { ...@@ -50,7 +51,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
List<SitePdu> siteList = JSONObject.parseArray(jsonObject.getString("data"),SitePdu.class); List<SitePdu> siteList = JSONObject.parseArray(jsonObject.getString("data"),SitePdu.class);
log.info("总数量:{}",siteList.size()); log.info("总数量:{}",siteList.size());
siteList.forEach(site -> { siteList.forEach(site -> {
siteMatterService.getDao().delete(new SiteMatterQuery().siteId(site.getId())); //siteMatterService.getDao().delete(new SiteMatterQuery().siteId(site.getId()));
int page=100; int page=100;
int pageNum=100; int pageNum=100;
for(int i=1;i<=page;i++){ for(int i=1;i<=page;i++){
...@@ -67,15 +68,19 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService { ...@@ -67,15 +68,19 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
} }
//删除后新增 //删除后新增
log.info("事项总数量:{}",siteMatterRest.getData().getData().size()); log.info("事项总数量:{}",siteMatterRest.getData().getData().size());
List<SiteMatterEntity> siteMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> { List<SiteMatterEntity> siteMatterEntities = new ArrayList<>();
siteMatterRest.getData().getData().forEach(siteMatter ->{
SiteMatterEntity temp = siteMatterService.selectOne(new SiteMatterQuery().matterId(siteMatter.getMatterId()));
if(temp==null) {
SiteMatterEntity target = new SiteMatterEntity(); SiteMatterEntity target = new SiteMatterEntity();
target.initAttrValue(); target.initAttrValue();
BeanUtils.copyProperties(siteMatter, target, BeanUtil.getNullPropertyNames(siteMatter)); BeanUtils.copyProperties(siteMatter, target, BeanUtil.getNullPropertyNames(siteMatter));
target.setCreateTime(new Date()); target.setCreateTime(new Date());
target.setViewsCount(0l); target.setViewsCount(0l);
target.setIsConvert(0); target.setIsConvert(0);
return target; siteMatterEntities.add(target);
}).collect(Collectors.toList()); }
});
if (!ObjectUtils.isEmpty(siteMatterEntities)) { if (!ObjectUtils.isEmpty(siteMatterEntities)) {
// sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId())); // sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment