Bläddra i källkod

Merge remote-tracking branch 'origin/dev' into dev

xuxiaofei 3 år sedan
förälder
incheckning
f7939d7818

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

@@ -1424,20 +1424,20 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             try {
                 LabHardware labHardware = labHardwareService.selectLabHardwareCameraBySub(subFunction.getSubId());
                 if (labHardware == null) {
-                    log.info("未查询到实验室关联摄像头信息!请检查ip是否为空!");
+                    log.info("手动关闭火焰预案-未查询到实验室关联摄像头信息!请检查ip是否为空!");
                 }
                 //开始录制视频
-                log.info("远程调用开始录制视频ip地址={}",labHardware.getIpAddress());
+                log.info("手动关闭火焰预案-远程调用结束录制视频ip地址={}",labHardware.getIpAddress());
                 R r = remoteCameraService.startRecord(labHardware.getIpAddress());
-                log.info("结束录制视频返回结果打印={}", JSON.toJSONString(r));
+                log.info("手动关闭火焰预案-结束录制视频返回结果打印={}", JSON.toJSONString(r));
                 if (r.getCode() == HttpStatus.SUCCESS){
                     com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(r.getData()));
                     recordVideo = jsonObject.getString("msg");
                 }else {
-                    log.info("结束录制视频失败!");
+                    log.info("手动关闭火焰预案-结束录制视频失败!");
                 }
             } catch (Exception e) {
-                log.error("远程调用开始录制视频接口失败!{}",e);
+                log.error("手动关闭火焰预案-远程调用结束录制视频接口失败!{}",e);
             }
             //更新风险概要
             String handlePerson = tokenService.getLoginUser().getNickName();