From e41c35acbfaca46e7d4149143dd39c45e1470d2e Mon Sep 17 00:00:00 2001
From: qiushui <wangyiming1031@aliyun.com>
Date: Mon, 20 Dec 2021 15:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=89=88=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhehekeji/web/lib/OrderInfo.java | 24 +++++++------------
 .../lib/hik/HikCameraControlModuleImpl.java   |  2 +-
 .../com/zhehekeji/web/service/PlcService.java |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java b/web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java
index 7822041..0028038 100644
--- a/web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java
+++ b/web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java
@@ -31,8 +31,8 @@ public class OrderInfo {
 
     private Integer leftRight;
 
-    public OrderInfo(Street street, PlcCmdInfo plcCmdInfo, Integer times){
-        if(street == null){
+    public OrderInfo(Street street, PlcCmdInfo plcCmdInfo, Integer times, String c) {
+        if (street == null) {
             return;
         }
         //拍照，转动 需要知道是哪个货架
@@ -40,34 +40,26 @@ public class OrderInfo {
         //判断左右 行列号
 
         isPre = true;
-        if(times % 2 ==0){
+        if (times % 2 == 0) {
             isPre = false;
         }
-        if(times == 2 || times == 1){
+        if (times == 2 || times == 1) {
             leftRight = plcCmdInfo.getLeftRight1();
             row = plcCmdInfo.getRow1();
             column = plcCmdInfo.getColumn1();
-        }else if(times == 4 || times == 3){
+        } else if (times == 4 || times == 3) {
             leftRight = plcCmdInfo.getLeftRight2();
             row = plcCmdInfo.getRow2();
             column = plcCmdInfo.getColumn2();
         }
-        //找到球机IO配置的预置点
-        //todo
-        if(!"C6".equals(code)){
-            if(leftRight == 1){
-                code = code+"-L";
-            }else if(leftRight == 2){
-                code = code+"-R";
-            }
-        }
-        if(leftRight == 1){
+        if (leftRight == 1) {
             shelveId = street.getLeftShelveId();
-        }else {
+        } else {
             shelveId = street.getRightShelveId();
         }
         orderId = 0L;
         orderNum = plcCmdInfo.getOrderNum();
+        code = c;
     }
 
 
diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java
index 5fafc0b..1656db1 100644
--- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java
+++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java
@@ -385,7 +385,7 @@ public class HikCameraControlModuleImpl implements CameraControlModule {
     public void toPtz(Integer ptzId, Integer cameraId)
     {
         int dwPTZCommand = HCNetSDK.GOTO_PRESET;
-        Boolean ok = HikLoginModuleImpl.hcNetsdk.NET_DVR_PTZPreset_Other(CameraConnMap.getConnId(cameraId).intValue(), 1, dwPTZCommand, ptzId.intValue());
+        Boolean ok = HikLoginModuleImpl.hcNetsdk.NET_DVR_PTZPreset_Other(CameraConnMap.getConnId(cameraId).intValue(), 1, dwPTZCommand, ptzId);
         if(!ok){
             log.error("toPtz error:{},cameraId:{}", HikLoginModuleImpl.hcNetsdk.NET_DVR_GetLastError(),cameraId);
         }
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 b231af5..6bd27a9 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -169,7 +169,7 @@ public class PlcService {
             log.error("street not found ,plcId :{}", plcCmdInfo.getPlcId());
             return;
         }
-        OrderInfo orderInfo = new OrderInfo(street, plcCmdInfo, times);
+        OrderInfo orderInfo = new OrderInfo(street, plcCmdInfo, times, code);
         String path = null;
         /**
          * 拍照是C2   C4拍照（取货完成、放货完成）