From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java
index d483bc0..441ee91 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java
@@ -11,6 +11,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverrunAlarm;
import org.jeecg.modules.mdc.service.IMdcOverrunAlarmService;
import org.springframework.web.bind.annotation.*;
@@ -39,7 +40,7 @@
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param mdcOverrunAlarm
+ * @param mdcEquipment
* @param pageNo
* @param pageSize
* @param req
@@ -48,13 +49,13 @@
@AutoLog(value = "mdc瓒呴檺鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "mdc瓒呴檺鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ", notes = "mdc瓒呴檺鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(MdcOverrunAlarm mdcOverrunAlarm,
+ public Result<?> queryPageList(MdcEquipment mdcEquipment,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MdcOverrunAlarm> queryWrapper = QueryGenerator.initQueryWrapper(mdcOverrunAlarm, req.getParameterMap());
+ //QueryWrapper<MdcOverrunAlarm> queryWrapper = QueryGenerator.initQueryWrapper(mdcOverrunAlarm, req.getParameterMap());
Page<MdcOverrunAlarm> page = new Page<MdcOverrunAlarm>(pageNo, pageSize);
- IPage<MdcOverrunAlarm> pageList = mdcOverrunAlarmService.page(page, queryWrapper);
+ IPage<MdcOverrunAlarm> pageList = mdcOverrunAlarmService.pageList(page, mdcEquipment, req);
return Result.OK(pageList);
}
--
Gitblit v1.9.3