From f02ad2926c2b5a2576e75c2cd6611862e9ec8cea Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 29 四月 2022 14:17:47 +0800
Subject: [PATCH] 摄像头
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
index d2bb210..fba1c84 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;
+import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
@@ -40,14 +41,14 @@
}
//杩斿洖鏌ヨ鐨勬憚鍍忓ご淇℃伅鍒楄〃
- List<MonitorBo> listresult;
+ CommonPage commonPage;
if (monitorParam == null) {
- listresult = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
} else {
- listresult = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
}
- return ResponseUtil.successPage(listresult);
+ return ResponseUtil.success(commonPage);
}
--
Gitblit v1.9.3