From 9ddd2e73bb050a963a5a585e8a53108eb4820814 Mon Sep 17 00:00:00 2001
From: qiushui <wangyiming1031@aliyun.com>
Date: Mon, 14 Feb 2022 14:00:49 +0800
Subject: [PATCH] code bug

---
 web/src/main/java/com/zhehekeji/web/entity/Camera.java      | 5 -----
 web/src/main/java/com/zhehekeji/web/service/PlcService.java | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/entity/Camera.java b/web/src/main/java/com/zhehekeji/web/entity/Camera.java
index 8259b1c..7a0408b 100644
--- a/web/src/main/java/com/zhehekeji/web/entity/Camera.java
+++ b/web/src/main/java/com/zhehekeji/web/entity/Camera.java
@@ -32,11 +32,6 @@ public class Camera {
     @ApiModelProperty(value = "预置点 增长值",hidden = true)
     private Integer ptzId;
 
-    /**
-     *为空的话 就取默认值
-     */
-    private String m3u8;
-
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 }
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index f00a037..08b92c6 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -190,7 +190,7 @@ public class PlcService {
         /**
          * 拍照是C2   C4拍照（取货完成、放货完成）
          */
-        Boolean needCapture = doNeedCaptureByCode(code);
+        Boolean needCapture = doNeedCaptureByCode(orderInfo.getCmdCode());
         /***
          * 判断该巷道有几个相机
          * 如果有一个相机，就一个相机转
@@ -199,7 +199,7 @@ public class PlcService {
          * 没有就不管了
          */
         Integer cameraId = getCameraByPlcCmd(plcCmdInfo,orderInfo.getLeftRight());
-        gyrateCameraByCode(cameraId,code);
+        gyrateCameraByCode(cameraId,orderInfo.getCmdCode());
         if(needCapture){
             Boolean delay = false;
             if(code.startsWith("C1") || code.startsWith("C3")){