From 71de5ccd657e15c5d0e9bd4f3fe3a3c0c2bb7f5f Mon Sep 17 00:00:00 2001
From: QuShuailong <qu.shuailong@hzleaper.com>
Date: Sun, 2 Apr 2023 10:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=94=A8=E5=90=8C=E4=BE=A7?=
 =?UTF-8?q?=E7=90=83=E6=9C=BA=E6=8B=8D=E5=BC=A0=E8=B4=A7=E7=89=A9=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E7=85=A7=E7=89=87=EF=BC=8C=E7=94=A8=E5=AF=B9=E4=BE=A7?=
 =?UTF-8?q?=E7=90=83=E6=9C=BA=E6=8B=8D=E5=BC=A0=E8=B4=A7=E7=89=A9=E4=BE=A7?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=82=E6=95=B0=E7=85=A7=E7=89=87=E3=80=82=E9=9C=80?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA=E9=A2=84?=
 =?UTF-8?q?=E7=BD=AE=E7=82=B9=EF=BC=9AE1-L/R-IN=E3=80=81E2-L/R-IN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/service/PlcService.java | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

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 2ec6bc9..2193f05 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -593,21 +593,41 @@ public class PlcService {
             HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),1);
         });
         Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1());
-        log.info("1");
-        gyrateCameraByCode(cameraId, cmdCode);
+
+        //重庆亚士创能盘点时先用同侧相机拍摄货物顶部
+        Integer leftRightTop = plcCmdInfo.getLeftRight1() == 1 ? 2 : 1;
+        Integer cameraIdTop = getCameraByPlcCmd(plcCmdInfo, leftRightTop);
+        String cameraCmdCode = cmdCode;
+        if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){
+            //内测
+            cameraCmdCode = cmdCode + "-" + plcCmdInfo.getLeftRightStr(1) + "-IN";
+        }
+
+        log.info("1 camera ptz:"+cameraCmdCode);
+        gyrateCameraByCode(cameraIdTop, cameraCmdCode);
         try {
             Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
         String path = PathUtil.createFileNameByRowColumn("jpg",cameraId,plcCmdInfo.getRow1(),plcCmdInfo.getColumn1());
-        log.info("2");
-        cameraCapture(cameraId,false,null,path);
+        cameraCapture(cameraIdTop,false,null,path);
+
+        //重庆亚士创能盘点时再用对侧球机拍侧面层数
+        String cameraCmdCode2 =  "E2-" + plcCmdInfo.getLeftRightStr(1) + "-IN";
+        log.info("2 camera ptz:"+cameraCmdCode2);
+        try {
+            Thread.sleep(1500l);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        cameraCapture(cameraId,false,null,path+".jpg");
+
         //托盘码
         String trayCode = null;
         Boolean trayCheck = Boolean.TRUE;
         log.info("3");
-        //重庆项目 单身，只用扫码枪
+        //重庆项目 单伸，只用扫码枪
 
         SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(),plcCmdInfo.getLeftRight1());