blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xiangpei
2024-09-18 5b76d629eef02be2f8c7c8ccde13d02aee25e63b 
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java


@@ -73,7 +73,6 @@


@RequiredArgsConstructor


public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {




    private final WorkOrderMapper workOrderMapper;


    private final YwPointService ywPointService;


    private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;


    private final WorkOrderAuditingRecordService workOrderAuditingRecordService;


@@ -82,9 +81,8 @@


    private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;


    private final WorkOrderErrorTypeServiceImpl workOrderErrorTypeService;


    private final SysConfigMapper configMapper;


    private final ServerConfig serverConfig;


    private final ReportMapper reportMapper;


    private final SysDictDataMapper dictDataMapper;


    private final WorkOrderCheckImgMapper workOrderCheckImgMapper;




    @Value("${rtsp.server:http://127.0.0.1:7788}")


    private String rtspServer;


@@ -402,7 +400,7 @@


        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);


        ywConditionList.stream().forEach(item -> {


            if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {


                item.setCommitUserName("系统消息");


                item.setUnitName("系统消息");


            }


        });


        return ywConditionList;


@@ -685,6 +683,8 @@


                FFmpegFrameGrabber grabber = null;


                try {


                    grabber = FFmpegFrameGrabber.createDefault(rtspUrl);


                    //设置10s超时


                    grabber.setTimeout(10000);


                    grabber.start();


                    Frame frame = grabber.grabImage(); // 直接捕获一帧


                    if (frame != null) {


@@ -791,6 +791,13 @@


        List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo());


        List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());


        workOrder.setErrorTypeList(errList);


        // 检测图片


        List<WorkOrderCheckImg> imgList = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)


                .eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo)


                .orderByDesc(WorkOrderCheckImg::getCreateTime)


                .last("limit 20")


                .list();


        workOrder.setImgList(imgList);


        return Result.ok().data(workOrder);


    }


}