视频时间调整，盘点拍照调整

web/src/main/java/com/zhehekeji/web/entity/StockLog.java

@@ -27,6 +27,12 @@ public class StockLog {
     @TableField(value = "`shelve_id`")
     private String shelveId;
 
+
+    @ApiModelProperty("巷道号")
+    @TableField(value = "`street_Id`")
+    private String streetId;
+
+
     @TableField(value = "`row`")
     @ApiModelProperty("行号")
     private Integer row;

web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java

@@ -257,8 +257,8 @@ public class HikCameraControlModuleImpl implements CameraControlModule {
     }
 
     public void downloadMp4(Integer cameraId, String path, LocalDateTime start, LocalDateTime end) {
-        start = start.minusMinutes(1);
+        start = start.minusSeconds(30);
-        end = end.minusMinutes(1);
+        end = end.minusSeconds(-20);
         PathUtil.checkDirc(path);
         HCNetSDK.NET_DVR_TIME startTime = new HCNetSDK.NET_DVR_TIME();
         startTime.setTime(start.getYear(), start.getMonthValue(), start.getDayOfMonth(), start.getHour(), start.getMinute(), start.getSecond());

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -459,6 +459,7 @@ public class PlcService {
                 if(orderInfo.getCode().startsWith("C2") || orderInfo.getCode().startsWith("C4")){
                     StockLog stockLog = new StockLog();
                     stockLog.setShelveId(orderInfo.getShelveId());
+                    stockLog.setStreetId(order.getStreetId().toString());
                     stockLog.setRow(orderInfo.getRow());
                     stockLog.setColumn(orderInfo.getColumn());
                     stockLog.setPic(path);
@@ -594,26 +595,27 @@ public class PlcService {
         });
         Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1());
         log.info("taskId:{}", plcCmdInfo.getTaskId());
-        //重庆亚士创能盘点时用球机拍条码
+
-        log.info("0 camera ptz:"+cmdCode);
-        gyrateCameraByCode(cameraId, cmdCode);
-        try {
-            Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
         String path = PathUtil.createFileNameByRowColumn("jpg",cameraId,plcCmdInfo.getRow1(),plcCmdInfo.getColumn1());
-        cameraCapture(cameraId,false,null,path);
+//        //重庆亚士创能盘点时用球机拍条码
-        log.info("camera:{} capture: {}", cameraId, path);
+//        log.info("0 camera ptz:"+cmdCode);
+//        gyrateCameraByCode(cameraId, cmdCode);
+//        try {
+//            Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+//        cameraCapture(cameraId,false,null,path);
+//        log.info("camera:{} capture: {}", cameraId, path);
 
-        //重庆亚士创能盘点时用同侧相机拍摄货物顶部
+        //重庆亚士创能盘点时用同侧相机拍摄货物顶部(E1-TOP)
         Integer leftRightTop = plcCmdInfo.getLeftRight1() == 1 ? 2 : 1;
         Integer cameraIdTop = getCameraByPlcCmd(plcCmdInfo, leftRightTop);
         String cameraCmdCode1 = cmdCode;
-        if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){
+//        if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){
-            //内测
+//            //内测
-            cameraCmdCode1 = cmdCode + "-" + plcCmdInfo.getLeftRightStr(1) + "-IN";
+        cameraCmdCode1 = cmdCode + "-" + "TOP";
-        }
+//        }
 
         log.info("1 camera ptz:"+cameraCmdCode1);
         gyrateCameraByCode(cameraIdTop, cameraCmdCode1);
@@ -622,10 +624,10 @@ public class PlcService {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        cameraCapture(cameraIdTop,false,null,path+".jpg");
+        cameraCapture(cameraIdTop,false,null,path);
 
-        //重庆亚士创能盘点时用对侧球机拍侧面层数
+        //重庆亚士创能盘点时用对侧球机拍侧面层数(E1-SIDE)
-        String cameraCmdCode2 =  "E2-" + plcCmdInfo.getLeftRightStr(1) + "-IN";
+        String cameraCmdCode2 =  cmdCode + "-" + "SIDE";
         gyrateCameraByCode(cameraId, cameraCmdCode2);
         log.info("2 camera ptz:"+cameraCmdCode2);
         try {
@@ -633,7 +635,7 @@ public class PlcService {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        cameraCapture(cameraId,false,null,path+".jpg.jpg");
+        cameraCapture(cameraId,false,null,path+".jpg");
 
         //托盘码
         String trayCode = null;

web/src/main/resources/application-test.yml

@@ -7,7 +7,7 @@ spring:
     maxWait: 60000
     minEvictableIdleTimeMillis: 300000
     minIdle: 15
-    password: Leaper@123
+    password: root
     poolPreparedStatements: true
     testOnBorrow: true
     testOnReturn: false
@@ -30,14 +30,31 @@ cameraConfig:
   cameraType: 0
   cameraPassword: a1234567
   cameraUser: admin
-  cameraPort: 8000
+  cameraPort: 37777
   videoServer: 127.0.0.1:8083
   #相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的
   delayCaptureTime: 3500
+  #随行模式下的相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的
+  # 发了C1之后多久拍照
+  C1DelayCaptureTime: 1500
+  # 内侧货架 发了C2 之后多久拍照
+  C2DelayCaptureTime: 1500
+  # 外侧货架 发了C2 之后多久拍照
+  C2OutDelayCaptureTime: 2500
+  # 发了C3之后多久拍照
+  C3DelayCaptureTime: 1500
+  C4DelayCaptureTime: 1500
+  C4OutDelayCaptureTime: 1500
+  #发了盘点指令之后多久拍照
+  EDelayCaptureTime: 2500
+  # 发了B2之后多久转原点位
+  B2DelayTime: 2000
+  # 外侧货架发了B2多久转原点位
+  B2OutDelayTime: 2000
   # 下载mp4延迟  海康的下载mp4需要2分钟
   # 利珀延迟10s就可
   # 单位毫秒
-  delayDownloadMp4: 120000
+  delayDownloadMp4: 10000
 # ------------
 # -----图片  mp4下载地址
 savePath: