| | |
|---|
| | | log.info("当前系统没有需要钢化的玻璃信息"); |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | TemperingGlassInfo maxGlassInfo = temperingGlassInfoList.stream().max(Comparator.comparingLong(TemperingGlassInfo::getId)).get(); |
|---|
| | | //拿到工程id及炉号 |
|---|
| | | // List<EngineerTemperingDTO> engineerTemperingList = temperingGlassInfoList.stream().map(e -> { |
|---|
| | | // EngineerTemperingDTO engineerTemperingDTO = new EngineerTemperingDTO(); |
|---|
| | | // BeanUtils.copyProperties(e, engineerTemperingDTO); |
|---|
| | | // return engineerTemperingDTO; |
|---|
| | | // }).distinct().collect(Collectors.toList()); |
|---|
| | | //将正在钢化的炉号过滤掉，仅获取待钢化的玻璃 |
|---|
| | | // List<TemperingRecord> temperingRecords = temperingRecordService.list(new LambdaQueryWrapper<TemperingRecord>().and(i -> i.isNull(TemperingRecord::getCoolEnergy).or().eq(TemperingRecord::getCoolEnergy, ""))); |
|---|
| | | // List<EngineerTemperingDTO> temperingList = new ArrayList<>(); |
|---|
| | | // if (CollectionUtils.isNotEmpty(temperingRecords)) { |
|---|
| | | // temperingList = temperingRecords.stream().map(e -> { |
|---|
| | | // EngineerTemperingDTO engineerTemperingDTO = new EngineerTemperingDTO(); |
|---|
| | | // BeanUtils.copyProperties(e, engineerTemperingDTO); |
|---|
| | | // return engineerTemperingDTO; |
|---|
| | | // }).collect(Collectors.toList()); |
|---|
| | | // } |
|---|
| | | // engineerTemperingList.removeAll(temperingList); |
|---|
| | | // if (CollectionUtils.isEmpty(engineerTemperingList)) { |
|---|
| | | // log.info("没有待钢化的任务，结束"); |
|---|
| | | // return; |
|---|
| | | // } |
|---|
| | | // if (engineerTemperingList.size() > 1) { |
|---|
| | | // log.info("存在多炉待钢化的任务，请检查现场是否有异常数据未处理"); |
|---|
| | | // return; |
|---|
| | | // } |
|---|
| | | // EngineerTemperingDTO temperingDTO = engineerTemperingList.get(0); |
|---|
| | | TemperingGlassInfo maxGlassInfo = temperingGlassInfoList.stream().max(Comparator.comparingLong(TemperingGlassInfo::getId)).get(); |
|---|
| | | |
|---|
| | | //将正在钢化的炉号过滤掉，仅获取待钢化的玻璃:判断待钢的玻璃是否已发送对接数据 |
|---|
| | | List<TemperingRecord> temperingRecordList = temperingRecordService.list(new LambdaQueryWrapper<TemperingRecord>().eq(TemperingRecord::getEngineerId, maxGlassInfo.getEngineerId()) |
|---|
| | | .eq(TemperingRecord::getTemperingLayoutId, maxGlassInfo.getTemperingLayoutId())); |
|---|
| | | if (CollectionUtils.isNotEmpty(temperingRecordList)) { |
|---|
| | | log.info("没有待钢化的任务，结束"); |
|---|
| | | return; |
|---|
| | | } |
|---|
| | | //获取待钢化的所有玻璃信息 |
|---|
| | | List<TemperingGlassInfo> temperingGlassList = temperingGlassInfoList.stream() |
|---|
| | | .filter(e -> e.getEngineerId().equals(maxGlassInfo.getEngineerId()) |
|---|
