From 9fc0d89543c069dc7f1f38621e8758dfd4e31da9 Mon Sep 17 00:00:00 2001 From: yiming Date: Tue, 22 Mar 2022 14:09:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E6=97=B6=E9=97=B4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhehekeji/web/config/ConfigProperties.java | 5 +++++ .../com/zhehekeji/web/service/PlcService.java | 15 +++++++++------ .../zhehekeji/web/service/ksec/KsecDecoder.java | 2 +- web/src/main/resources/application-dev.yml | 4 ++++ web/src/main/resources/application-prod.yml | 4 ++++ web/src/main/resources/application-test.yml | 4 ++++ 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java index ed1b9a1..07723c4 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -47,6 +47,11 @@ public class ConfigProperties { private Integer cameraPort; private String videoServer; + + private Long delayCaptureTime; + + private Long delayScanTime; + } @Data 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 8b14886..f7ac0aa 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -205,7 +205,7 @@ public class PlcService { if(code.startsWith("C1") || code.startsWith("C3")){ delay = true; } - path = cameraCapture(cameraId,delay,2000L); + path = cameraCapture(cameraId,delay,configProperties.getCameraConfig().getDelayCaptureTime()); } //update order info after capture if (path != null && needCapture) { @@ -438,16 +438,16 @@ public class PlcService { } public void check(PlcCmdInfo plcCmdInfo,String cmdCode,String wmsCode){ + long startTime = System.currentTimeMillis(); Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId()); Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1()); gyrateCameraByCode(cameraId, cmdCode); - String path = cameraCapture(cameraId,true,3000L); + String path = cameraCapture(cameraId,true,configProperties.getCameraConfig().getDelayCaptureTime()); OrderInfo orderInfo = new OrderInfo(street,plcCmdInfo,1,cmdCode); Stock stock = stockMapper.getByShelveIdAndRowColumn(orderInfo.getShelveId(),orderInfo.getRow(),orderInfo.getColumn()); - - System.out.println(configProperties.getSavePath().getMediaPath()+path); + log.info("pic path:{}",configProperties.getSavePath().getMediaPath()+path); try { - Thread.sleep(3500L); + Thread.sleep(configProperties.getCameraConfig().getDelayScanTime()); } catch (InterruptedException e) { e.printStackTrace(); } @@ -455,7 +455,7 @@ public class PlcService { if(StringUtils.isEmpty(scanCode)){ scanCode = "识别异常"; } - System.out.println(scanCode); + log.info("code:{}",scanCode); //核对正确 Integer status = 2; if(!wmsCode.equals(scanCode)){ @@ -483,6 +483,9 @@ public class PlcService { stockMapper.updateById(stock); } checkLog(stock); + long end = System.currentTimeMillis(); + long s = end - startTime; + log.info("time:{}millisecond",s); } diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java index 82b5639..8cb715c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java @@ -100,7 +100,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { tcpLogger.info("info:{}",body); //盘点 //转球机到盘点位 然后拍照 - plcService.check(plcCmdInfo,Cmd.E1.name(), dataInfo.getCode()); + plcService.check(plcCmdInfo,ksecInfo.getData().getCmdName(), dataInfo.getCode()); //找到该货位的最后一张照片与现在的照片比照 //plcService.recordStock(plcCmdInfo, dataInfo.getCode(), 0, 0); } diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 8367a7b..c4e31e7 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -32,6 +32,10 @@ cameraConfig: cameraUser: admin cameraPort: 37777 videoServer: 192.168.8.140:8083 + #相机抓图延迟 毫秒 + delayCaptureTime: 2000 + #OCR识别延迟 毫秒 + delayScanTime: 2000 # ------------ # -----图片 mp4下载地址 diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 1897240..971d0cf 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -32,6 +32,10 @@ cameraConfig: cameraUser: admin cameraPort: 37777 videoServer: 127.0.0.1:8083 + #相机抓图延迟 毫秒 + delayCaptureTime: 2000 + #OCR识别延迟 毫秒 + delayScanTime: 2000 # ------------ # -----图片 mp4下载地址 savePath: diff --git a/web/src/main/resources/application-test.yml b/web/src/main/resources/application-test.yml index 1897240..971d0cf 100644 --- a/web/src/main/resources/application-test.yml +++ b/web/src/main/resources/application-test.yml @@ -32,6 +32,10 @@ cameraConfig: cameraUser: admin cameraPort: 37777 videoServer: 127.0.0.1:8083 + #相机抓图延迟 毫秒 + delayCaptureTime: 2000 + #OCR识别延迟 毫秒 + delayScanTime: 2000 # ------------ # -----图片 mp4下载地址 savePath: