dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备操作记录 分页

Browse Source
This commit is contained in:
daiyongfei
2025-09-09 09:55:58 +08:00
parent 91f787eec7
commit f7a82ef138
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceChargeDischargeController.java
View File

@ -39,7 +39,7 @@ public class DeviceChargeDischargeController extends BaseController {
/** /**
* 查询设备充放电记录列表 * 查询设备充放电记录列表
*/ */
@SaCheckPermission("equipment:chargeDischarge:list") // @SaCheckPermission("equipment:chargeDischarge:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<DeviceChargeDischargeVo> list(DeviceChargeDischargeBo bo, PageQuery pageQuery) { public TableDataInfo<DeviceChargeDischargeVo> list(DeviceChargeDischargeBo bo, PageQuery pageQuery) {
return deviceChargeDischargeService.queryPageList(bo, pageQuery); return deviceChargeDischargeService.queryPageList(bo, pageQuery);
@ -48,7 +48,7 @@ public class DeviceChargeDischargeController extends BaseController {
/** /**
* 设备充放电记录列表 * 设备充放电记录列表
*/ */
@SaCheckPermission("equipment:chargeDischarge:export") // @SaCheckPermission("equipment:chargeDischarge:export")
@Log(title = "设备充放电记录", businessType = BusinessType.EXPORT) @Log(title = "设备充放电记录", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(DeviceChargeDischargeBo bo, HttpServletResponse response) { public void export(DeviceChargeDischargeBo bo, HttpServletResponse response) {
@ -61,7 +61,7 @@ public class DeviceChargeDischargeController extends BaseController {
* *
* @param id 主键 * @param id 主键
*/ */
@SaCheckPermission("equipment:chargeDischarge:query") // @SaCheckPermission("equipment:chargeDischarge:query")
@GetMapping("/{id}") @GetMapping("/{id}")
public R<DeviceChargeDischargeVo> getInfo(@NotNull(message = "主键不能为空") public R<DeviceChargeDischargeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) { @PathVariable Long id) {
@ -71,7 +71,7 @@ public class DeviceChargeDischargeController extends BaseController {
/** /**
* 新增设备充放电记录 * 新增设备充放电记录
*/ */
@SaCheckPermission("equipment:chargeDischarge:add") // @SaCheckPermission("equipment:chargeDischarge:add")
@Log(title = "设备充放电记录", businessType = BusinessType.INSERT) @Log(title = "设备充放电记录", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
@ -82,7 +82,7 @@ public class DeviceChargeDischargeController extends BaseController {
/** /**
* 修改设备充放电记录 * 修改设备充放电记录
*/ */
@SaCheckPermission("equipment:chargeDischarge:edit") // @SaCheckPermission("equipment:chargeDischarge:edit")
@Log(title = "设备充放电记录", businessType = BusinessType.UPDATE) @Log(title = "设备充放电记录", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
@ -95,11 +95,13 @@ public class DeviceChargeDischargeController extends BaseController {
* *
* @param ids 主键串 * @param ids 主键串
*/ */
@SaCheckPermission("equipment:chargeDischarge:remove") // @SaCheckPermission("equipment:chargeDischarge:remove")
@Log(title = "设备充放电记录", businessType = BusinessType.DELETE) @Log(title = "设备充放电记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
return toAjax(deviceChargeDischargeService.deleteWithValidByIds(List.of(ids), true)); return toAjax(deviceChargeDischargeService.deleteWithValidByIds(List.of(ids), true));
} }
} }

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

@ -85,11 +85,12 @@ public class WEBDeviceController extends BaseController {
*/ */
@Operation(summary = "设备操作记录") @Operation(summary = "设备操作记录")
@GetMapping(value = "/getOperationRecord/{deviceId}") @GetMapping(value = "/getOperationRecord/{deviceId}")
public R<List<DeviceLog>> getOperationRecord(@PathVariable Long deviceId, public TableDataInfo<DeviceLog> getOperationRecord(@PathVariable Long deviceId,
@RequestParam(required = false) String startTime, @RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime) { @RequestParam(required = false) String endTime,
List<DeviceLog> device = deviceService.getOperationRecord(deviceId, startTime, endTime); PageQuery pageQuery) {
return R.ok(device); TableDataInfo<DeviceLog> device = deviceService.getOperationRecord(deviceId, startTime, endTime,pageQuery);
return device;
} }
@ -111,8 +112,6 @@ public class WEBDeviceController extends BaseController {
} }
} }

2
fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java
View File

@ -57,7 +57,7 @@ public interface WEBDeviceService extends IService<Device> {
* @param endTime 结束时间 * @param endTime 结束时间
* @return * @return
*/ */
List<DeviceLog> getOperationRecord(Long deviceId, String startTime, String endTime); TableDataInfo<DeviceLog> getOperationRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery);
/** /**

11
fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java
View File

@ -132,20 +132,19 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
* @return * @return
*/ */
@Override @Override
public List<DeviceLog> getOperationRecord(Long deviceId, String startTime, String endTime) { public TableDataInfo<DeviceLog> getOperationRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery) {
Page<DeviceLog> page = pageQuery.build();
QueryWrapper<DeviceLog> queryWrapper = new QueryWrapper<DeviceLog>().eq("device_id", deviceId); QueryWrapper<DeviceLog> queryWrapper = new QueryWrapper<DeviceLog>().eq("device_id", deviceId);
if (StrUtil.isNotEmpty(startTime)) { if (StrUtil.isNotEmpty(startTime)) {
queryWrapper.ge("create_time", startTime); queryWrapper.ge("create_time", startTime);
} }
if (StrUtil.isNotEmpty(endTime)) { if (StrUtil.isNotEmpty(endTime)) {
queryWrapper.le("create_time", endTime); queryWrapper.le("create_time", endTime);
} }
queryWrapper.orderByDesc("create_time");
List<DeviceLog> logList = deviceLogMapper.selectList( IPage<DeviceLog> logList = deviceLogMapper.selectPage(page, queryWrapper);
queryWrapper.orderByDesc("create_time")); return TableDataInfo.build(logList);
return logList;
} }