From a49a6a80a76b2642232b887dd646a255cf5eaa4e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 18:16:01 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index 4a76367..b093af9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -77,11 +77,14 @@
*/
@GetMapping("/report/list")
public ResponseVO<Object> listReportData(BaseConditionVO conditionVO
- , @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "deviceCode", required = false) String deviceCode) {
+ , @RequestParam(value = "keyword", required = false) String keyword
+ , @RequestParam(value = "deviceCode", required = false) String deviceCode
+ , @RequestParam(value = "order", required = false) Integer order
+ ,@RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
+ CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode,order,seq);
List<LightReportDataBo> lightReportDataBos = (List<LightReportDataBo>) commonPage.getList();
if (lightReportDataBos == null) {
--
Gitblit v1.9.3