提交 c42b62da authored 作者: ljj's avatar ljj

doc:优化核查历史快照的日志

上级 cb43be84
...@@ -111,11 +111,16 @@ public class HistoryCheckDeviceServiceImpl implements HistoryCheckDeviceService ...@@ -111,11 +111,16 @@ public class HistoryCheckDeviceServiceImpl implements HistoryCheckDeviceService
for (DeviceInLibVo deviceInLibVo : devInLibrary) { for (DeviceInLibVo deviceInLibVo : devInLibrary) {
List<HistoryCheckDevice> hiss = historyCheckDeviceDao.findAllByDetailIdAndDeviceLibraryId(detailId, deviceInLibVo.getId()); List<HistoryCheckDevice> hiss = historyCheckDeviceDao.findAllByDetailIdAndDeviceLibraryId(detailId, deviceInLibVo.getId());
if (hiss == null || hiss.size() != 1) { if (hiss == null || hiss.size() < 1) {
log.warn("[check] 核查的历史账单中发现错误数据,错误的装备id:{}", deviceInLibVo.getId()); log.warn("[check] 核查的历史账单中发现错误数据,未生成快照的,错误的装备id:{}", deviceInLibVo.getId());
continue; continue;
} }
HistoryCheckDevice his = hiss.get(0);
if (hiss.size() > 1) {
log.info("有空需排查的his id:{}",hiss.parallelStream().map(HistoryCheckDevice::getId).collect(Collectors.toList()));
}
HistoryCheckDevice his = hiss.get(hiss.size() -1);
deviceInLibVo.setModel(his.getModel()); deviceInLibVo.setModel(his.getModel());
deviceInLibVo.setName(his.getName()); deviceInLibVo.setName(his.getName());
deviceInLibVo.setSeqNumber(his.getSeqNumber()); deviceInLibVo.setSeqNumber(his.getSeqNumber());
...@@ -133,11 +138,16 @@ public class HistoryCheckDeviceServiceImpl implements HistoryCheckDeviceService ...@@ -133,11 +138,16 @@ public class HistoryCheckDeviceServiceImpl implements HistoryCheckDeviceService
for (DeviceNotInLibVo deviceNotInLibVo : devNotInLibrary) { for (DeviceNotInLibVo deviceNotInLibVo : devNotInLibrary) {
List<HistoryCheckDevice> hiss = historyCheckDeviceDao.findAllByDetailIdAndDeviceLibraryId(detailId, deviceNotInLibVo.getId()); List<HistoryCheckDevice> hiss = historyCheckDeviceDao.findAllByDetailIdAndDeviceLibraryId(detailId, deviceNotInLibVo.getId());
if (hiss == null || hiss.size() != 1) { if (hiss == null || hiss.size() < 1) {
log.warn("[check] 核查的历史账单中发现错误数据,错误的装备id:{}", deviceNotInLibVo.getId()); log.warn("[check] 核查的历史账单中发现错误数据,未生成快照的,错误的装备id:{}", deviceNotInLibVo.getId());
continue; continue;
} }
HistoryCheckDevice his = hiss.get(0);
if (hiss.size() > 1) {
log.info("有空需排查的his id:{}",hiss.parallelStream().map(HistoryCheckDevice::getId).collect(Collectors.toList()));
}
HistoryCheckDevice his = hiss.get(hiss.size() -1);
deviceNotInLibVo.setModel(his.getModel()); deviceNotInLibVo.setModel(his.getModel());
deviceNotInLibVo.setName(his.getName()); deviceNotInLibVo.setName(his.getName());
deviceNotInLibVo.setSeqNumber(his.getSeqNumber()); deviceNotInLibVo.setSeqNumber(his.getSeqNumber());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论