From e37fc3a7f6db2381f1e1f91a863b87612c59487f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 4 Jan 2024 22:34:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BD=95=E5=83=8F=E5=9C=B0=E5=9D=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202.=E7=90=83=E6=9C=BA=E8=BD=AC=E8=87=B3io=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=82=B9=E6=97=B6=E4=BD=BF=E7=94=A8code=203.=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=AD=A6=E5=86=85=E5=AE=B9=204.=E6=9C=AA?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=90=83=E6=9C=BA=E6=8E=92=E9=99=A4=E7=90=83?= =?UTF-8?q?=E6=9C=BA=E7=9A=84id=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../leaper/web/controller/CameraControlController.java | 5 +++-- .../java/com/leaper/web/controller/CameraController.java | 8 +++++++- web/src/main/java/com/leaper/web/entity/DeviceReq.java | 4 ++-- web/src/main/java/com/leaper/web/pojo/warn/WarnVO.java | 1 + .../main/java/com/leaper/web/service/CameraService.java | 2 ++ web/src/main/java/com/leaper/web/service/WarnService.java | 1 + web/src/main/resources/mapper/WarnMapper.xml | 4 ++++ 7 files changed, 20 insertions(+), 5 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 d725dfd..4639b73 100644 --- a/web/src/main/java/com/leaper/web/controller/CameraControlController.java +++ b/web/src/main/java/com/leaper/web/controller/CameraControlController.java @@ -364,8 +364,9 @@ public class CameraControlController { public Result MP4(@PathVariable Integer id) { checkLogin(id); LocalDateTime localDateTime = LocalDateTime.of(2022,7,21,8,20); - cameraControlModule.downloadMp4(id,"E:\\work\\"+localDateTime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))+".mp4", localDateTime,localDateTime.plusMinutes(3),configProperties.getSavePath()); - return Result.success(); + String path = localDateTime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))+".mp4"; + cameraControlModule.downloadMp4(id,"E:\\work\\"+path, localDateTime,localDateTime.plusMinutes(3),configProperties.getSavePath()); + return Result.success(configProperties.getCameraConfig().getWorkUrl()+path); } diff --git a/web/src/main/java/com/leaper/web/controller/CameraController.java b/web/src/main/java/com/leaper/web/controller/CameraController.java index 5c0450e..8933b34 100644 --- a/web/src/main/java/com/leaper/web/controller/CameraController.java +++ b/web/src/main/java/com/leaper/web/controller/CameraController.java @@ -142,7 +142,13 @@ public class CameraController { @PostMapping("/io/toPtz") @ApiOperation(value = "转至球机IO配置点") public Result toPtz(@RequestBody CameraIOPtz req) { - Integer ptzId = cameraService.getPtzId(req.getCameraIOId()); + Integer ptzId = null; + if(req.getCameraIOId()!=null){ + ptzId = cameraService.getPtzId(req.getCameraIOId()); + }else { + ptzId = cameraService.getPtzIdByCodeAndCameraId(req.getCode(),req.getCameraId()); + } + cameraControlModule.toPtz(ptzId,req.getCameraId()); return Result.success(); } diff --git a/web/src/main/java/com/leaper/web/entity/DeviceReq.java b/web/src/main/java/com/leaper/web/entity/DeviceReq.java index d7f061e..2b0fe19 100644 --- a/web/src/main/java/com/leaper/web/entity/DeviceReq.java +++ b/web/src/main/java/com/leaper/web/entity/DeviceReq.java @@ -9,7 +9,7 @@ import java.util.List; @Data public class DeviceReq { String deviceCode; - String warmName; + String warnName; List cameraList; @@ -20,7 +20,7 @@ public class DeviceReq { public Warn getWarn() { Warn warn = new Warn(); warn.setDeviceCode(this.deviceCode); - warn.setWarnName(this.warmName); + warn.setWarnName(this.warnName); warn.setType(this.type); warn.setStartTime(LocalDateTime.now()); return warn; diff --git a/web/src/main/java/com/leaper/web/pojo/warn/WarnVO.java b/web/src/main/java/com/leaper/web/pojo/warn/WarnVO.java index b65caff..75036db 100644 --- a/web/src/main/java/com/leaper/web/pojo/warn/WarnVO.java +++ b/web/src/main/java/com/leaper/web/pojo/warn/WarnVO.java @@ -10,6 +10,7 @@ public class WarnVO extends Warn { private String streetName; private String timeLength; + private String typeName; @ApiModelProperty("为海康球机时，调用此命令") private String cmd1; 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 b6f55bd..3a87267 100644 --- a/web/src/main/java/com/leaper/web/service/CameraService.java +++ b/web/src/main/java/com/leaper/web/service/CameraService.java @@ -147,9 +147,11 @@ public class CameraService { if(ok){ camera.setStatus("连接正常"); }else { + CameraConnMap.disConn(camera.getId()); camera.setStatus("未连接"); } }catch (Exception e){ + CameraConnMap.disConn(camera.getId()); camera.setStatus("未连接"); }finally { latch.countDown(); diff --git a/web/src/main/java/com/leaper/web/service/WarnService.java b/web/src/main/java/com/leaper/web/service/WarnService.java index 52357e0..48f6ad1 100644 --- a/web/src/main/java/com/leaper/web/service/WarnService.java +++ b/web/src/main/java/com/leaper/web/service/WarnService.java @@ -33,6 +33,7 @@ public class WarnService { int remainingSeconds = seconds.intValue() % 60; String timeLength = String.format("%02d:%02d", minutes,remainingSeconds); warnVO.setTimeLength(timeLength); + warnVO.setTypeName("1".equals(warnVO.getType())?"报警":"巡检"); } }); diff --git a/web/src/main/resources/mapper/WarnMapper.xml b/web/src/main/resources/mapper/WarnMapper.xml index 9d48f47..7dd0afe 100644 --- a/web/src/main/resources/mapper/WarnMapper.xml +++ b/web/src/main/resources/mapper/WarnMapper.xml @@ -13,6 +13,10 @@ and t.street_id = #{req.streetId} + + + and t.type = #{req.type} + order by t.id desc