Merge remote-tracking branch 'origin/master'

This commit is contained in:
wr
2025-04-01 11:06:53 +08:00
12 changed files with 54 additions and 18 deletions

View File

@@ -67,9 +67,14 @@ public class IDataIntegrityServiceImpl implements IDataIntegrityService {
);
//以尺寸100分片
List<List<String>> pendingIds = ListUtils.partition(lineIds, NUM);
LineCountEvaluateParam lineCountEvaluateParam = new LineCountEvaluateParam();
lineCountEvaluateParam.setStartTime(beginDay);
lineCountEvaluateParam.setEndTime(endDay);
for (List<String> pendingId : pendingIds) {
lineCountEvaluateParam.setLineId(pendingId);
List<LineDevGetDTO> lineDevGetDTOList = commTerminalGeneralClient.getMonitorDetailList(pendingId).getData();
List<MeasurementCountDTO> countList = dataVFeignClient.getMeasurementCount(pendingId, beginDay, endDay).getData();
List<MeasurementCountDTO.MeasurementCountResultDTO> countList = dataVFeignClient.getMeasurementCount(lineCountEvaluateParam).getData();
poList.addAll(
lineDevGetDTOList.stream()
.map(item -> {