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 -> {