From 9d0512aa6a192ee105ff9251e68a4360c7355319 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 10 六月 2025 18:34:53 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java index a7f1cb4..58ab291 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java @@ -28,15 +28,15 @@ * @param queryQo 鏌ヨ鏉′欢鍊煎璞� * @return 瀹炰綋璁板綍鍒楄〃 */ - public QueryResultVo<List<VoCamera>> some(CameraQo queryQo, int pageSize) { + public QueryResultVo<List<VoCamera>> some(VideoQo queryQo, int pageSize) { Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryQo); - Long itemTotal = dao.selectTotal(params); + Long itemTotal = dao.selectTotal4Monitor(params); QueryResultVo<List<VoCamera>> rsVo = new QueryResultVo<>(); rsVo.pageSize = pageSize; rsVo.pageCurr = queryQo.pageCurr; rsVo.calculateAndSet(itemTotal, params); - rsVo.obj = dao.selectSome(params); + rsVo.obj = dao.selectSome4Monitor((params)) ; return rsVo; } -- Gitblit v1.8.0