From 753aa175023e188889f3c098609901428f876b4a Mon Sep 17 00:00:00 2001 From: qiushui Date: Thu, 13 Jan 2022 15:19:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=20=E8=A7=86=E9=A2=91=20?= =?UTF-8?q?=E9=87=87=E7=94=A8=E5=BB=B6=E6=97=B6=E9=98=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/lib/CameraDelayTask.java | 16 ++++++++++++++-- .../com/zhehekeji/web/lib/TaskDelayExecutor.java | 1 + .../com/zhehekeji/web/service/PlcService.java | 8 ++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraDelayTask.java b/web/src/main/java/com/zhehekeji/web/lib/CameraDelayTask.java index 1251f55..7ea06df 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraDelayTask.java +++ b/web/src/main/java/com/zhehekeji/web/lib/CameraDelayTask.java @@ -26,13 +26,25 @@ public class CameraDelayTask implements Delayed { private long executeTime; + private long delayTime; + + public CameraDelayTask(Integer cameraId, LocalDateTime startTime, LocalDateTime endTime, String path, Integer type, long delayTime) { + this.cameraId = cameraId; + this.startTime = startTime; + this.endTime = endTime; + this.path = path; + this.type = type; + this.executeTime = System.currentTimeMillis()+delayTime; + this.delayTime = delayTime; + } + @Override public long getDelay(TimeUnit unit) { - return unit.convert(this.executeTime - System.nanoTime(), TimeUnit.NANOSECONDS); + return unit.convert(this.executeTime - System.currentTimeMillis(), TimeUnit.MILLISECONDS); } @Override public int compareTo(Delayed o) { - return 0; + return (int) (this.getDelay(TimeUnit.MILLISECONDS) -o.getDelay(TimeUnit.MILLISECONDS)); } } diff --git a/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java b/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java index 049cc24..ae2dbda 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java +++ b/web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java @@ -36,6 +36,7 @@ public class TaskDelayExecutor { CameraControlModule cameraControlModule = SpringContextUtil.getBean(CameraControlModule.class); CameraDelayTask cameraDelayTask = queue.take(); if(cameraDelayTask != null){ + System.out.println(LocalDateTime.now()); if(cameraDelayTask.getType() == 0){ cameraControlModule.downloadMp4(cameraDelayTask.getCameraId(), cameraDelayTask.getPath(), cameraDelayTask.getStartTime(), cameraDelayTask.getEndTime()); }else if(cameraDelayTask.getType() == 1){ 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 641cabe..051c8c9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -441,13 +441,13 @@ public class PlcService { Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId()); Integer cameraId = getCameraByPlcCmd(plcCmdInfo,1); gyrateCameraByCode(cameraId, cmdCode); - String path = cameraCapture(cameraId,true,2500L); + String path = cameraCapture(cameraId,true,3000L); 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); try { - Thread.sleep(800); + Thread.sleep(3500L); } catch (InterruptedException e) { e.printStackTrace(); } @@ -484,5 +484,9 @@ public class PlcService { } } + public void checkPicDelay(){ + + } + }