Pārlūkot izejas kodu

修改为远程录制视频,前端截图方式

hanzhiwei 2 gadi atpakaļ
vecāks
revīzija
f87f117901

+ 20 - 20
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -657,9 +657,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 //打开喇叭
                 openLoudSpeaker(subFunction.getSubId(), labRiskPlanLevel);
                 //获取摄像头第一帧
-                cutPhoto(subFunction.getSubId(),groupId);
+                //cutPhoto(subFunction.getSubId(),groupId);
                 //远程调用开始录制视频接口
-                //startVideo(subFunction.getSubId());
+                startVideo(subFunction.getSubId());
                 //向前端发送mqtt预案触发提示
                 messageSendService.riskPlanTriggerNotice();
             } else {
@@ -779,24 +779,24 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     private void stopVideoAndRecordLog(Long subjectId, Long groupId) {
         //关闭视频录像
         String recordVideo = "";
-//        try {
-//            LabHardware labHardware = labHardwareService.selectLabHardwareCameraBySub(subjectId);
-//            if (labHardware != null) {
-//                //开始录制视频
-//                log.info("远程调用关闭视频ip地址={}", labHardware.getIpAddress());
-//                R r = remoteCameraService.stopRecord(labHardware.getIpAddress());
-//                log.info("录制视频结束返回结果打印={}", JSON.toJSONString(r));
-//                if (r.getCode() == HttpStatus.SUCCESS) {
-//                    recordVideo = String.valueOf(r.getData());
-//                } else {
-//                    log.info("结束录制视频失败!");
-//                }
-//            } else {
-//                log.info("未查询到实验室关联摄像头信息!请检查ip是否为空!");
-//            }
-//        } catch (Exception e) {
-//            log.error("远程调用结束录制视频接口异常!{}", e);
-//        }
+        try {
+            LabHardware labHardware = labHardwareService.selectLabHardwareCameraBySub(subjectId);
+            if (labHardware != null) {
+                //开始录制视频
+                log.info("远程调用关闭视频ip地址={}", labHardware.getIpAddress());
+                R r = remoteCameraService.stopRecord(labHardware.getIpAddress());
+                log.info("录制视频结束返回结果打印={}", JSON.toJSONString(r));
+                if (r.getCode() == HttpStatus.SUCCESS) {
+                    recordVideo = String.valueOf(r.getData());
+                } else {
+                    log.info("结束录制视频失败!");
+                }
+            } else {
+                log.info("未查询到实验室关联摄像头信息!请检查ip是否为空!");
+            }
+        } catch (Exception e) {
+            log.error("远程调用结束录制视频接口异常!{}", e);
+        }
         //更新风险概要  recordVideo - 视频记录存放地址
         String handlePerson = "";
         if (!Objects.isNull(tokenService.getLoginUser())) {