liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

pageQuery

Browse Source
This commit is contained in:
daiyongfei
2025-09-08 17:37:01 +08:00
parent 870f94b2d4
commit 91f787eec7
4 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java
View File

@ -3,6 +3,8 @@ package com.fuyuanshen.web.controller.device;
import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
import com.fuyuanshen.common.core.domain.R;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.web.core.BaseController;
import com.fuyuanshen.equipment.domain.DeviceLog;
import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
@ -101,15 +103,16 @@ public class WEBDeviceController extends BaseController {
*/
@Operation(summary = "设备告警记录")
@GetMapping(value = "/getAlarmRecord/{deviceId}")
public R<List<DeviceAlarmVo>> getAlarmRecord(@PathVariable Long deviceId,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime) {
List<DeviceAlarmVo> device = deviceService.getAlarmRecord(deviceId, startTime, endTime);
return R.ok(device);
public TableDataInfo<DeviceAlarmVo> getAlarmRecord(@PathVariable Long deviceId,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
PageQuery pageQuery) {
return deviceService.getAlarmRecord(deviceId, startTime, endTime, pageQuery);
}
}