Commit c57ae60f authored by 赵啸非's avatar 赵啸非

添加热门事项

parent b2de13bb
...@@ -68,7 +68,7 @@ public class DeviceCallbackController { ...@@ -68,7 +68,7 @@ public class DeviceCallbackController {
} }
} catch (Exception e) { } catch (Exception e) {
log.error("接收数据失败", e); log.error("接收数据失败", e);
Rest.fail(e.getMessage()); // Rest.fail(e.getMessage());
} }
return Rest.ok(); return Rest.ok();
......
...@@ -44,9 +44,10 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService { ...@@ -44,9 +44,10 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
sitePdu.setId(1L); sitePdu.setId(1L);
Rest<List<SitePdu>> siteRest = siteFeign.getFlatSitesBySiteId(sitePdu); Rest<List<SitePdu>> siteRest = siteFeign.getFlatSitesBySiteId(sitePdu);
if (siteRest.getCode() == YesNoEnum.YES.getValue()) { if (siteRest.getCode() == YesNoEnum.YES.getValue()) {
log.info("总数量:{}",siteRest.getData().size()); log.info("站点总数量:{}",siteRest.getData().size());
siteRest.getData().forEach(site -> { siteRest.getData().forEach(site -> {
sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId())); sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
log.info("删除事项:{}",siteRest.getData().size());
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++){
...@@ -54,7 +55,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService { ...@@ -54,7 +55,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
siteMatterPdu.setSiteId(site.getId()); siteMatterPdu.setSiteId(site.getId());
siteMatterPdu.setPage(i); siteMatterPdu.setPage(i);
siteMatterPdu.setSize(pageNum); siteMatterPdu.setSize(pageNum);
log.info("请求列表:"+i); log.info("请求页数列表:"+i);
Rest<RespData<List<SiteMatterPdu>>> siteMatterRest = siteMatterFeign.list(siteMatterPdu); Rest<RespData<List<SiteMatterPdu>>> siteMatterRest = siteMatterFeign.list(siteMatterPdu);
if (siteMatterRest.getCode() == YesNoEnum.YES.getValue()) { if (siteMatterRest.getCode() == YesNoEnum.YES.getValue()) {
if(siteMatterRest.getData().getData().size()==0){ if(siteMatterRest.getData().getData().size()==0){
...@@ -62,7 +63,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService { ...@@ -62,7 +63,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
break; break;
} }
//删除后新增 //删除后新增
log.info("事项总数量:{}",siteMatterRest.getData().getData().size()); log.info("返回事项总数量:{}",siteMatterRest.getData().getData().size());
List<SheetMatterEntity> sheetMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> { List<SheetMatterEntity> sheetMatterEntities = siteMatterRest.getData().getData().stream().map(siteMatter -> {
SheetMatterEntity sheetMatterEntity = new SheetMatterEntity(); SheetMatterEntity sheetMatterEntity = new SheetMatterEntity();
sheetMatterEntity.initAttrValue(); sheetMatterEntity.initAttrValue();
...@@ -79,7 +80,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService { ...@@ -79,7 +80,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
if (!ObjectUtils.isEmpty(sheetMatterEntities)) { if (!ObjectUtils.isEmpty(sheetMatterEntities)) {
// sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId())); // sheetMatterService.getDao().delete(new SheetMatterQuery().siteId(site.getId()));
log.info("新增数量:{}",sheetMatterEntities.size()); log.info("新增事项数量:{}",sheetMatterEntities.size());
sheetMatterService.save(sheetMatterEntities); sheetMatterService.save(sheetMatterEntities);
/* List<List<SheetMatterEntity>> partition = ListUtil.partition(sheetMatterEntities, 500); /* List<List<SheetMatterEntity>> partition = ListUtil.partition(sheetMatterEntities, 500);
for (List<SheetMatterEntity> matterEntities : partition) { for (List<SheetMatterEntity> matterEntities : partition) {
...@@ -87,7 +88,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService { ...@@ -87,7 +88,7 @@ public class SyncSiteMatterTaskImpl implements ITaskExcuteService {
} }
}else{ }else{
log.info("请求错误,code:{}",siteMatterRest.getCode()); log.info("请求错误,code:{} msg:{}",siteMatterRest.getCode(),siteMatterRest.getMsg());
} }
} }
......
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