blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xiangpei
2024-08-24 633b96bb1ced95e60df5e28249ce51b6ffe82d27 
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java


@@ -121,6 +121,12 @@


        List<WorkOrderErrorType> waitAddErrorTypeList = new ArrayList<>(48);


        Integer updateNum = 0;


        Date now = new Date();


        // 因故障类型不一致而要更新状态的工单


        List<WorkOrder> willUpdateStatusWorkOrderList = new ArrayList<>(48);


        // 更改工单类型而要增加的系统运维处理信息


        List<WorkOrderYwConditionRecord> willAddMsg = new ArrayList<>(48);


        // 即将要添加的错误类型


        List<WorkOrderErrorType> willAddErrorType = new ArrayList<>(96);


        for (WorkOrder workOrder : workOrderList) {


            WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());


            if (Objects.nonNull(databaseWorkOrder)) {


@@ -138,20 +144,20 @@


                            workOrderErrorType.setCreateTime(now);


                            workOrderErrorType.setUpdateTime(now);


                            workOrderErrorType.setErrorName(errorType);


                            workOrderErrorTypeService.save(workOrderErrorType);


                            willAddErrorType.add(workOrderErrorType);


                        }


                    }


                    databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);


                    databaseWorkOrder.setUpdateTime(now);


                    baseMapper.updateById(databaseWorkOrder);


                    willUpdateStatusWorkOrderList.add(databaseWorkOrder);


                    updateNum++;


                    // 同时新增一个运维处理信息，表明此工单被调整


                    WorkOrderYwConditionRecord ywRecord = new WorkOrderYwConditionRecord();


                    ywRecord.setWorkOrderId(databaseWorkOrder.getId());


                    ywRecord.setWorkOrderNo(databaseWorkOrder.getWorkOrderNo());


                    ywRecord.setCommitUser(1);


                    ywRecord.setYwCondition("故障类型更新，工单状态调整为待处理");


                    ywRecord.setCreateTime(new Date());


                    workOrderYwConditionRecordMapper.insert(ywRecord);


                    willAddMsg.add(ywRecord);


                }


            } else {


                workOrder.setCreateTime(new Date());


@@ -163,6 +169,15 @@


//                }


                waitAddList.add(workOrder);


            }


        }


        if (willAddErrorType.size() > 0) {


            workOrderErrorTypeService.getBaseMapper().addMany(willAddErrorType);


        }


        if (willAddMsg.size() > 0) {


            workOrderYwConditionRecordMapper.insertMany(willAddMsg);


        }


        if (willUpdateStatusWorkOrderList.size() > 0) {


            this.baseMapper.updateMany(willUpdateStatusWorkOrderList);


        }


        if (CollectionUtils.isEmpty(waitAddList)) {


            return Boolean.TRUE;


@@ -184,7 +199,7 @@


                notAddList.add(workOrder);


                continue;


            }


            workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));


            workOrder.setWorkOrderNo(IdUtils.randomNO());


            if (Objects.nonNull(point.getUnitId())) {


                workOrder.setUnitId(Math.toIntExact(point.getUnitId()));


            }


@@ -241,7 +256,7 @@


    @Override


    public Result add(WorkOrderForm form) {


        WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);


        entity.setWorkOrderNo(IdUtils.timeAddRandomNO(5));


        entity.setWorkOrderNo(IdUtils.randomNO());


        entity.setCreateTime(DateUtils.getNowDate());


        entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);


        Date now = new Date();


@@ -299,7 +314,7 @@


        notifyService.save(notify);


        // 同步点位状态


        if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {


            ywPointService.updateRecovery(Arrays.asList(workOrder.getSerialNumber()), 0);


            ywPointService.updateRecovery(Collections.singletonList(workOrder.getSerialNumber()), 0);


        }


        return Result.ok("操作成功");


    }


@@ -311,12 +326,13 @@


        List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)


                .in(WorkOrder::getStatus, WorkOrderStatusEnum.YW_HANDLE.getValue())


                .in(WorkOrder::getErrorType, form.getErrorTypes())


                .select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo)


                .select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo, WorkOrder::getSerialNumber)


                .list();


        if (list.isEmpty()) {


            return Result.error("没有工单可以审核");


        }


        List<Integer> ids = list.stream().map(WorkOrder::getId).collect(Collectors.toList());


        List<String> serialNumbers = list.stream().map(WorkOrder::getSerialNumber).toList();


        // 工单状态


        LambdaUpdateWrapper<WorkOrder> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();


        lambdaUpdateWrapper.in(WorkOrder::getId, ids);


@@ -343,6 +359,10 @@


                    workOrder.getWorkOrderNo());


            notifies.add(notify);


        }


        // 同步点位状态


        if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {


            ywPointService.updateRecovery(serialNumbers, 0);


        }


        notifyService.saveBatch(notifies);


        return Result.ok("操作成功");


    }


@@ -360,7 +380,7 @@


        baseMapper.updateById(workOrder);


        // 添加一条运维情况记录


        WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();


        workOrderYwConditionRecord.setWorkOrderId(workOrder.getId());


        workOrderYwConditionRecord.setWorkOrderNo(workOrder.getWorkOrderNo());


        workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());


        workOrderYwConditionRecord.setYwCondition(form.getYwCondition());


        workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());


@@ -474,7 +494,7 @@




        // 查询符合条件的工单


        List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)


                .select(WorkOrder::getSerialNumber, WorkOrder::getSerialNumber)


                .select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)


                .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)


                .eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())


                .eq(WorkOrder::getErrorType, data.getErrorType())


@@ -513,7 +533,7 @@


                query.setWorkOrderNOList(new LambdaQueryChainWrapper<>(baseMapper)


                        .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)


                        .eq(Objects.nonNull(query.getUnitId()), WorkOrder::getUnitId, query.getUnitId())


                        .select(WorkOrder::getId)


                        .select(WorkOrder::getWorkOrderNo)


                        .list()


                        .stream()


                        .map(WorkOrder::getWorkOrderNo)


@@ -527,7 +547,7 @@


                    .update();


            addDistributeRecord(query.getWorkOrderNOList(), distributeWayEnum);


            // 同步点位状态


            List<String> serialNumberList = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getSerialNumber).in(WorkOrder::getId, query.getWorkOrderNOList()).list().stream().map(WorkOrder::getSerialNumber).toList();


            List<String> serialNumberList = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getSerialNumber).in(WorkOrder::getWorkOrderNo, query.getWorkOrderNOList()).list().stream().map(WorkOrder::getSerialNumber).toList();


            ywPointService.updateRecovery(serialNumberList, 1);


            return Result.ok("成功下发" + query.getWorkOrderNOList().size() + "条工单");


        } catch (Exception e) {