From 193cf9a3e74802731d0891beaa46abbadc794a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 28 Aug 2023 10:12:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E8=BD=AC=E6=8D=A2=EF=BC=8C?= =?UTF-8?q?=E7=85=A7=E7=89=87=E6=8B=8D=E7=85=A7=E7=9A=84=E5=BB=B6=E8=BF=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA3s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/java/com/zhehekeji/web/service/PlcService.java | 6 +++--- .../main/java/com/zhehekeji/web/service/client/Decoder.java | 2 -- 2 files changed, 3 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 396f499..31e731f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -629,7 +629,7 @@ public class PlcService { * @return */ @Transactional - public List emptyCheck04(ECResultMessage ecResultMessage ){ + public synchronized List emptyCheck04(ECResultMessage ecResultMessage ){ EmptyCheckPic emptyCheckPic = new EmptyCheckPic( ecResultMessage.getEmptyCheckMsg().substring(ecResultMessage.getEmptyCheckMsg() .lastIndexOf(";",ecResultMessage.getEmptyCheckMsg().lastIndexOf(";")-1)+1, @@ -647,7 +647,7 @@ public class PlcService { gyrateCameraByCode(cameraId,"C2-IN"+leftOrRight); //等待2s再拍照 try { - Thread.sleep(1000l); + Thread.sleep(3000l); } catch (InterruptedException e) { e.printStackTrace(); } @@ -666,7 +666,7 @@ public class PlcService { gyrateCameraByCode(cameraId,"C2-OUT"+leftOrRight); //等待2s再拍照 try { - Thread.sleep(1000l); + Thread.sleep(3000l); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java index 949ff23..a6a44fc 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java @@ -219,8 +219,6 @@ public class Decoder extends DelimiterBasedFrameDecoder { PuTianNettyClient.write(ptData); //返回结尾货位两侧的照片(EC04)(易高发送) //照片 - - List emptyCheckPics = plcService.emptyCheck04(ecResultMessage); String webPicPath = plcService.getWebPicPath(); if(emptyCheckPics.size() > 1){