柳州烟草修改

web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java

@@ -323,7 +323,8 @@ public class CameraControlController {
     @ApiOperation(value = "录像")
     public Result MP4(@PathVariable Integer id) {
         checkLogin(id);
-        cameraControlModule.downloadMp4(id,"D:\\work\\"+LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))+".mp4", LocalDateTime.now().minusMinutes(10),LocalDateTime.now().minusMinutes(8));
+        LocalDateTime localDateTime = LocalDateTime.of(2022,7,21,8,20);
+        cameraControlModule.downloadMp4(id,"E:\\work\\"+localDateTime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))+".mp4", localDateTime,localDateTime.plusMinutes(3));
         return Result.success();
     }
 

web/src/main/java/com/zhehekeji/web/controller/StockController.java

@@ -89,7 +89,7 @@ public class StockController {
         OutputStream os = response.getOutputStream();
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("盘点" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")), "UTF-8");
+        String fileName = URLEncoder.encode("盘点" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")), "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         List<StockExportExcel> excels = stockService.exportExcels(streetId);
         EasyExcel.write(os, StockExportExcel.class).sheet().doWrite(excels);
@@ -101,7 +101,7 @@ public class StockController {
         OutputStream os = response.getOutputStream();
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("全部巷道盘点结果" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")), "UTF-8");
+        String fileName = URLEncoder.encode("全部巷道盘点结果" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")), "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         List<StockExportExcel> excels = stockService.exportAllExcels();
         EasyExcel.write(os, StockExportExcel.class).sheet().doWrite(excels);

web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java

@@ -292,10 +292,10 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule {
 
         NetSDKLib.LLong l = JoywareLoginModuleImpl.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId), download_by_data_type.getPointer(), net_out_download_by_data_type.getPointer(), 8000);
         if(l.longValue() != 0){
-            log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{},status:{}", path, start, end, LocalDateTime.now(),l.longValue());
+            log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{},status:{},cameraId:{}", path, start, end, LocalDateTime.now(),l.longValue(),cameraId);
         }else {
 
-            log.error("download mp4 error:{},startTime:{} ,endTime:{}",ToolKits.getErrorCodePrint(),start,end);
+            log.error("download mp4 error:{},startTime:{} ,endTime:{},cameraId:{}",ToolKits.getErrorCodePrint(),start,end,cameraId);
         }
     }
 

web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java

@@ -11,12 +11,15 @@ public class StockExportExcel {
     @ExcelProperty(index = 0, value = "巷道名称")
     private String streetName;
 
-    @ExcelProperty(index = 6, value = "盘点批次号")
+    @ExcelProperty(index = 7, value = "盘点批次号")
     private String lotnum;
 
     @ExcelProperty(index = 4, value = "条码")
     private String code;
 
+    @ExcelProperty(index = 5, value = "WMS条码")
+    private String wmsCode;
+
     @ExcelProperty(index = 1, value = "货架号")
     private String shelveId;
 
@@ -29,10 +32,10 @@ public class StockExportExcel {
     @ExcelProperty(index = 3, value = "列")
     private Integer column;
 
-    @ExcelProperty(index = 5, value = "盘点结果", converter = StockStatusConvert.class)
+    @ExcelProperty(index = 6, value = "盘点结果", converter = StockStatusConvert.class)
     private Integer status;
 
-    @ExcelProperty(index = 7, value = "时间", converter = LocalDateTimeConvert.class)
+    @ExcelProperty(index = 8, value = "时间", converter = LocalDateTimeConvert.class)
     private LocalDateTime exportTime;
 
 }

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

@@ -153,13 +153,18 @@ public class PlcService {
         update.setLeftRight2(plcCmdInfo.getLeftRight2());
         update.setColumn2(plcCmdInfo.getColumn2());
         update.setRow2(plcCmdInfo.getRow2());
+        LocalDateTime endDownLoadTime = endTime.plusSeconds(5);
+        Duration duration = Duration.between(order.getStartTime(),endDownLoadTime);
 
+        if(duration.toMinutes() > 50){
+            endDownLoadTime = order.getStartTime().plusMinutes(50);
+        }
         if (street.getCamera1Id() != null) {
-            String path = cameraVideo(street.getCamera1Id(),order.getStartTime(),endTime.plusSeconds(5));
+            String path = cameraVideo(street.getCamera1Id(),order.getStartTime(),endDownLoadTime);
             update.setVideoPath1(path);
         }
         if (street.getCamera2Id() != null) {
-            String path = cameraVideo(street.getCamera2Id(),order.getStartTime(),endTime.plusSeconds(5));
+            String path = cameraVideo(street.getCamera2Id(),order.getStartTime(),endDownLoadTime);
             update.setVideoPath2(path);
         }
         orderMapper.updateById(update);
@@ -588,12 +593,22 @@ public class PlcService {
             HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),1);
         });
         Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1());
-        gyrateCameraByCode(cameraId, cmdCode);
-        try {
-            Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+
+        if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){
+            //内测
+            String c = cmdCode + "-" + plcCmdInfo.getLeftRightStr(1) + "-IN";
+            log.info("camera ptz"+c);
+            gyrateCameraByCode(cameraId, c);
+        }else {
+            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);
         //托盘码

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

@@ -270,6 +270,7 @@ public class StockService {
             stockExportExcel.setCode(stock.getTrayCode());
             stockExportExcel.setLotnum(stock.getLotnum());
             stockExportExcel.setColumn(stock.getColumn());
+            stockExportExcel.setWmsCode(stock.getWmsTrayCode());
             //stockExportExcel.setCount(stock.getCount());
             stockExportExcel.setRow(stock.getRow());
             stockExportExcel.setStreetName(street.getName());

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

@@ -14,7 +14,7 @@ spring:
     testWhileIdle: false
     timeBetweenEvictionRunsMillis: 60000
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://172.16.0.64:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.77.91:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: root
     validationQuery: SELECT 1 FROM DUAL
 # --------本服务端口号