Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-30 628b80d0452602c5c02cec9ddbbee266f89d60c8

 ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java

@@ -68,7 +68,13 @@
        }
        for (DeviceInfoVO deviceInfo : deviceList) {
            // 国标设备的编码就是取视频流的设备编码，国标设备就一个。国标设备的每一个通道代表一个摄像头，也就是设备id是取流的通道id
            String frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId(), deviceInfo.getWorkOrderNo());
            String frameImg = null;
            try {
                frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId(), deviceInfo.getWorkOrderNo());
            } catch (Exception e) {
                e.printStackTrace();
                continue;
            }
            if (StringUtils.hasText(frameImg)) {
                WorkOrderCheckImg img = new WorkOrderCheckImg();
                img.setWorkOrderNo(deviceInfo.getWorkOrderNo());