预案结束，写入预案未查询。

修改楼层来源

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

@@ -138,6 +138,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     @Autowired
     private ILabHardwareService labHardwareService;
 
+    @Autowired
+    private ILabBuildFloorLayoutService labBuildFloorLayoutService;
+
     private static final Logger log = LoggerFactory.getLogger(LabRiskPlanServiceImpl.class);
 
 
@@ -1051,7 +1054,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             labRiskPlanLevel.setRiskAttribute(riskAttribute);
 
             LabRiskPlan labRiskPlan = labRiskPlanMapper.selectLabRiskPlanByRiskPlanId(subFunction.getSubId());
-            labRiskPlanLevel.setFloorId(labRiskPlan.getFloorId());
+            LabBuildFloorLayout labBuildFloorLayout = new LabBuildFloorLayout();
+            labBuildFloorLayout.setSubId(subFunction.getSubId());
+            List <LabBuildFloorLayoutVo> list = labBuildFloorLayoutService.selectLabBuildFloorLayoutList(labBuildFloorLayout);
+            labRiskPlanLevel.setFloorId(list.get(0).getFloorId());
             labRiskPlanLevel.setTopName(labRiskPlan.getTopName());
 
             log.error("触发预案2");
@@ -1296,14 +1302,13 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 
                     }
                 }
-                R r = remoteCameraService.stopRecord("192.168.1.64");
-
 
                 //TODO 更新风险概要  recordVideo - 视频记录存放地址
                 String handlePerson = null;
                 String recordVideo = "";
                 labRiskPlanAbnormalDescService.updateLabRiskPlanAbnormalDesc(groupVo.getId(),handlePerson, recordVideo);
 
+                writerEnterRiskPlan(riskPlanId,2);
                 //结束前向前端发送mqtt预案触发提示
                 messageSendService.riskPlanTriggerNotice();