| | |
| | | check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.MODELING_FAIL.getValue()); |
| | | } |
| | | // 点位在线率 |
| | | if (2 == result.getSnapResult()) { |
| | | workOrder.setSerialNumber(result.getExternalIndexCode()); |
| | | workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED); |
| | | if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) { |
| | | workOrder.setErrorTypeList(new ArrayList<>()); |
| | | workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue()); |
| | | } else { |
| | | workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue()); |
| | | } |
| | | } |
| | | // if (2 == result.getSnapResult()) { |
| | | // workOrder.setSerialNumber(result.getExternalIndexCode()); |
| | | // workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED); |
| | | // if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) { |
| | | // workOrder.setErrorTypeList(new ArrayList<>()); |
| | | // workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue()); |
| | | // } else { |
| | | // workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue()); |
| | | // } |
| | | // } |
| | | if (WorkOrderStatusEnum.WAIT_DISTRIBUTE.equals(workOrder.getStatus())) { |
| | | workOrderList.add(workOrder); |
| | | } else if (WorkOrderStatusEnum.DISTRIBUTED.equals(workOrder.getStatus())) { |
| | |
| | | check(YwThreadConstants.Car_NoIntegrityCount, integrityRate, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.CAR_SIX.getValue()); |
| | | } |
| | | // 点位在线率 |
| | | if (2 == result.getSnapResult()) { |
| | | workOrder.setSerialNumber(result.getExternalIndexCode()); |
| | | workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED); |
| | | if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) { |
| | | workOrder.setErrorTypeList(new ArrayList<>()); |
| | | workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue()); |
| | | } else { |
| | | workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue()); |
| | | } |
| | | } |
| | | // if (2 == result.getSnapResult()) { |
| | | // workOrder.setSerialNumber(result.getExternalIndexCode()); |
| | | // workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED); |
| | | // if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) { |
| | | // workOrder.setErrorTypeList(new ArrayList<>()); |
| | | // workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue()); |
| | | // } else { |
| | | // workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue()); |
| | | // } |
| | | // } |
| | | if (WorkOrderStatusEnum.WAIT_DISTRIBUTE.equals(workOrder.getStatus())) { |
| | | workOrderList.add(workOrder); |
| | | } else if (WorkOrderStatusEnum.DISTRIBUTED.equals(workOrder.getStatus())) { |
| | |
| | | /** 添加工单 */ |
| | | workOrderService.innerAddWorkOrder(workOrderList); |
| | | workOrderService.innerAddWorkOrder(distributeList); |
| | | |
| | | } |
| | | |
| | | /** |
| | |
| | | */ |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public void addBatch(WorkOrderWhite workOrderWhite) { |
| | | public Result addBatch(WorkOrderWhite workOrderWhite) { |
| | | List<String> errorTypeListAdd = workOrderWhite.getErrorTypeList(); |
| | | List<WorkOrderWhite> whites = workOrderWhiteMapper.selectList(); |
| | | for (WorkOrderWhite white : whites) { |
| | | List<String> errorTypeList = Arrays.asList(white.getErrorType().split(",")); |
| | | List<String> errorTypeList = new ArrayList<>(Arrays.asList(white.getErrorType().split(","))); |
| | | for (String newError : errorTypeListAdd) { |
| | | if (errorTypeList.contains(newError)) { |
| | | continue; |
| | |
| | | workOrderWhiteMapper.deleteAll(); |
| | | workOrderWhiteMapper.insertBatch(whites); |
| | | } |
| | | return Result.ok(); |
| | | } |
| | | |
| | | private <T extends Comparable<T>> T parseThreshold(String thresholdStr, Class<?> type) { |