Merge remote-tracking branch 'origin/main'

This commit is contained in:
wr
2025-12-26 11:22:51 +08:00
8 changed files with 44 additions and 18 deletions

View File

@@ -231,22 +231,6 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
});
}
// //将装置无数据的统计入库 按运维要求,判断装置的最新数据不是当天,则认为装置无数据
// List<LineDetailVO.noDataLineInfo> noDataLineInfo = lineFeignClient.getNoDataLine().getData();
// if (CollUtil.isNotEmpty(noDataLineInfo)) {
// LambdaQueryWrapper<LineWarning> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper.eq(LineWarning::getTargetType, "0").eq(LineWarning::getAlarmTime, date);
// this.baseMapper.delete(lambdaQueryWrapper);
// noDataLineInfo.forEach(item -> {
// String deptId = Objects.isNull(deptLineMap.get(item.getLineId())) ? null : deptLineMap.get(item.getLineId()).get(0).getId();
// LineWarning lineWarning = new LineWarning();
// lineWarning.setAlarmTime(firstDayOfMonth);
// lineWarning.setDeptId(deptId);
// lineWarning.setLineId(item.getLineId());
// lineWarning.setTargetType("0");
// result.add(lineWarning);
// });
// }
this.saveOrUpdateBatchByMultiId(result);
}