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 a626f1a..64eb2c7 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -74,6 +74,7 @@ public class ConfigProperties { private Long delayDownloadMp4; + public Integer verticalAdjustmentTime = 2; } @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 93e5f84..cf506e4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -149,6 +149,11 @@ public class PlcService { Street street = streetService.getStreetByPlcId(SRMNumber); //南京烟草物流只有一个相机 Integer cameraId = street.getCamera1Id() == null ? street.getCamera2Id():street.getCamera1Id(); + try { + Thread.sleep(configProperties.getCameraConfig().getVerticalAdjustmentTime()*1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } verticalAdjustment(cameraId); } diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index f17f461..3750e2b 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -22,6 +22,8 @@ server: Port: 8099 # ----默认摄像头的连接信息 cameraConfig: + #重置球机垂直方向开始延时,单位秒 + verticalAdjustmentTime: 2 # ------------球機選擇--- 0:利珀 1:海康 cameraType: 1 cameraPassword: a1234567