From 40712d424e4ee45196160c5e31dc2b3a601b6ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 14 Dec 2023 16:12:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=A2=99=E6=89=A9=E5=B1=95?= =?UTF-8?q?=20=E6=89=AB=E7=A0=81=E6=9E=AA=E8=B6=85=E6=97=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=B3=A8=EF=BC=8C=E6=9C=AA=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E8=BF=94=E5=9B=9E=E8=87=AA=E5=B8=A6?= =?UTF-8?q?ip=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/CameraControlController.java | 15 +++++++++++++-- .../web/controller/RealTimeController.java | 6 ++++++ .../com/leaper/web/service/CameraService.java | 5 +++++ .../java/com/leaper/web/service/FtpsUtils.java | 1 + .../com/leaper/web/service/sick/SickSocket.java | 1 + web/src/main/resources/application-prod.yml | 16 ++++++++++++++-- 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/com/leaper/web/controller/CameraControlController.java b/web/src/main/java/com/leaper/web/controller/CameraControlController.java index 8328c41..928a43c 100644 --- a/web/src/main/java/com/leaper/web/controller/CameraControlController.java +++ b/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 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); } diff --git a/web/src/main/java/com/leaper/web/controller/RealTimeController.java b/web/src/main/java/com/leaper/web/controller/RealTimeController.java index 894a5be..a2f8966 100644 --- a/web/src/main/java/com/leaper/web/controller/RealTimeController.java +++ b/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> allCamerasPage(@PathVariable Integer page) { + return Result.success(cameraService.allCameras(page)); + } @GetMapping("/allCameras1") @ApiOperation(value = "全部球机1") //@SessionHandler diff --git a/web/src/main/java/com/leaper/web/service/CameraService.java b/web/src/main/java/com/leaper/web/service/CameraService.java index c376db0..c284d11 100644 --- a/web/src/main/java/com/leaper/web/service/CameraService.java +++ b/web/src/main/java/com/leaper/web/service/CameraService.java @@ -162,6 +162,11 @@ public class CameraService { return cameraMapper.selectByMap(new HashMap<>()); } + public List allCameras(int page){ + int pageNum =configProperties.getVideoStyleConfig().getVideoStyleRow() * configProperties.getVideoStyleConfig().getVideoStyleColumn(); + List cameras = cameraMapper.selectList(new QueryWrapper().last("limit "+ (page-1)*pageNum +","+pageNum)); + return cameras; + } /** * HD01 - HD05 * @return diff --git a/web/src/main/java/com/leaper/web/service/FtpsUtils.java b/web/src/main/java/com/leaper/web/service/FtpsUtils.java index 35e50a4..1f09610 100644 --- a/web/src/main/java/com/leaper/web/service/FtpsUtils.java +++ b/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) { diff --git a/web/src/main/java/com/leaper/web/service/sick/SickSocket.java b/web/src/main/java/com/leaper/web/service/sick/SickSocket.java index 8020116..e72cdbf 100644 --- a/web/src/main/java/com/leaper/web/service/sick/SickSocket.java +++ b/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; diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 4760607..6ac569b 100644 --- a/web/src/main/resources/application-prod.yml +++ b/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