From 35d1b8fdc91aa355f61f7fcc77ac85113130466c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 15 Aug 2024 15:09:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E9=81=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/leaper/web/controller/CameraRecord.java | 6 ++++++ .../main/java/com/leaper/web/pojo/street/StreetSearch.java | 1 + web/src/main/java/com/leaper/web/service/CameraService.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web/src/main/java/com/leaper/web/controller/CameraRecord.java b/web/src/main/java/com/leaper/web/controller/CameraRecord.java index 644cee6..d1d5a1d 100644 --- a/web/src/main/java/com/leaper/web/controller/CameraRecord.java +++ b/web/src/main/java/com/leaper/web/controller/CameraRecord.java @@ -95,6 +95,12 @@ public class CameraRecord { return new Result<>(true); } } + @PostMapping("/1") + @ApiOperation(value = "视频转换 ") + @LicenseHandler + public Result booleanResult(@RequestBody Record record) { + return new Result<>(true); + } private static long toSecondsSinceMidnight(LocalDateTime dateTime) { LocalDateTime midnight = dateTime.toLocalDate().atStartOfDay(); Duration duration = Duration.between(midnight, dateTime); diff --git a/web/src/main/java/com/leaper/web/pojo/street/StreetSearch.java b/web/src/main/java/com/leaper/web/pojo/street/StreetSearch.java index a5ea113..243b17e 100644 --- a/web/src/main/java/com/leaper/web/pojo/street/StreetSearch.java +++ b/web/src/main/java/com/leaper/web/pojo/street/StreetSearch.java @@ -8,4 +8,5 @@ public class StreetSearch { private Integer pageSize; private Integer pageNum; + private String channel; } 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 52d94ae..2e79e70 100644 --- a/web/src/main/java/com/leaper/web/service/CameraService.java +++ b/web/src/main/java/com/leaper/web/service/CameraService.java @@ -118,7 +118,7 @@ public class CameraService { ExecutorService executor = Executors.newFixedThreadPool(20); public PageInfo cameras(StreetSearch streetSearch) { PageHelper.startPage(streetSearch.getPageNum(), streetSearch.getPageSize()); - List cameras = cameraMapper.selectByMap(new HashMap<>(0)); + List cameras = cameraMapper.selectList(new QueryWrapper().eq(streetSearch.getChannel()!=null ,"channel",streetSearch.getChannel())); if(cameras.size() > 0){ CountDownLatch latch = new CountDownLatch(cameras.size()); cameras.forEach(camera -> {