视频墙扩展

扫码枪超时修改
注，未确定所有的返回自带ip端口

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

@@ -2,10 +2,12 @@ package com.leaper.web.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.leaper.filter.pojo.LicenseHandler;
+import com.leaper.web.entity.CameraRecord;
 import com.leaper.web.lib.CameraConnMap;
 import com.leaper.web.lib.CameraControlLoginModule;
 import com.leaper.web.lib.CameraControlModule;
 import com.leaper.web.lib.TaskDelayExecutor;
+import com.leaper.web.mapper.CameraRecordMapper;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.core.util.Assert;
 import com.leaper.web.config.ConfigProperties;
@@ -24,6 +26,7 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Api(value = "CameraControl",tags = "球机控制管理")
 @RestController
@@ -31,6 +34,8 @@ import java.util.List;
 @Slf4j
 public class CameraControlController {
 
+    @Resource
+    CameraRecordMapper cameraRecordMapper;
     @Resource
     private CameraMapper cameraMapper;
 
@@ -369,9 +374,11 @@ public class CameraControlController {
     public Result<String> record(@RequestBody CameraRecord cameraRecord) {
         checkLogin(cameraRecord.getCameraId());
         String url ="work\\"+cameraRecord.getStartTime().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))+".mp4";
+        cameraRecord.setPath(url);
         cameraRecordMapper.insert(cameraRecord);
-        cameraControlModule.downloadMp4(cameraRecord.getCameraId(),"D:\\"+url, cameraRecord.getStartTime(),cameraRecord.getEndTime());
-        return Result.success("api\\"+url);
+        ConfigProperties.SavePath savePath = configProperties.getSavePath();
+        cameraControlModule.downloadMp4(cameraRecord.getCameraId(),"D:\\"+url, cameraRecord.getStartTime(),cameraRecord.getEndTime(),savePath);
+        return Result.success("api/"+url);
     }
 
     @PostMapping("/mp4/recordList")
@@ -383,6 +390,10 @@ public class CameraControlController {
                 .le(cameraRecord.getEndTime() != null, "end_Time",cameraRecord.getEndTime())
                 .ge(cameraRecord.getStartTime() != null,"start_time" ,cameraRecord.getStartTime())
         );
+        cameraRecordList = cameraRecordList.stream()
+                .peek(k ->{
+                    k.setPath("api/"+k.getPath());
+                }).collect(Collectors.toList());
         return Result.success(cameraRecordList);
     }
 

web/src/main/java/com/leaper/web/controller/RealTimeController.java

@@ -41,6 +41,12 @@ public class RealTimeController {
         return Result.success(cameraService.allCameras());
     }
 
+    @GetMapping("/allCameras/{page}")
+    @ApiOperation(value = "全部球机")
+    //@SessionHandler
+    public Result<List<Camera>> allCamerasPage(@PathVariable Integer page) {
+        return Result.success(cameraService.allCameras(page));
+    }
     @GetMapping("/allCameras1")
     @ApiOperation(value = "全部球机1")
     //@SessionHandler

web/src/main/java/com/leaper/web/service/CameraService.java

@@ -162,6 +162,11 @@ public class CameraService {
         return cameraMapper.selectByMap(new HashMap<>());
     }
 
+    public List<Camera> allCameras(int page){
+        int pageNum =configProperties.getVideoStyleConfig().getVideoStyleRow() * configProperties.getVideoStyleConfig().getVideoStyleColumn();
+        List<Camera> cameras = cameraMapper.selectList(new QueryWrapper<Camera>().last("limit "+ (page-1)*pageNum +","+pageNum));
+        return cameras;
+    }
     /**
      * HD01 - HD05
      * @return

web/src/main/java/com/leaper/web/service/FtpsUtils.java

@@ -83,6 +83,7 @@ public class FtpsUtils {
      * @param srcFilePath 开始地址
      * @param targetFilePath 目标地址
      */
+
     public void moveFile(boolean flag ,int count,
                          String srcFilePath,
                          String targetFilePath) {

web/src/main/java/com/leaper/web/service/sick/SickSocket.java

@@ -28,6 +28,7 @@ public class SickSocket {
         InputStream is = null;
         try {
             socket.connect(new InetSocketAddress(ip,port),3000);
+            socket.setSoTimeout(3000);
             os = socket.getOutputStream();
             is = socket.getInputStream();
             int i = 0;

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

@@ -52,11 +52,23 @@ cameraConfig:
   workUrl: 127.0.0.1:8083/work/
 # ------------
 # -----图片  mp4下载地址
+
 savePath:
-  mediaPath: d:\\data\media\
-  mp4Path: d://data/mp4/
+  #是否云端保存
+  isCloudSave: false
+  saveDays: 1
+  # 定期删除文件cron解析
+  deleteSaveCron: 0 0 0 2 * ?
+  cloudIp: 121.37.95.190
+  cloudUser: root
+  cloudPassword: Leaper@123
+  mediaPathCache: d:\\data\media\
+  mp4PathCache: d://data/mp4/
+  mediaPath: /mnt/media/
+  mp4Path: /mnt/mp4/
 # ------------服务端类型  0：TCP(罗伯泰克)    1:KSEC(JSON)（昆船）
 serverMode: 1
+
 ksec:
   ip: 192.168.168.11
   port: 8001