整体流程测试修改0401-2

shiyunteng

2025-04-01 7911497ffa51bd41fc334153b2a456ff02554747

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java

@@ -1,14 +1,12 @@
package com.by4cloud.platformx.device.controller;

import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.DeviceRepair;
import com.by4cloud.platformx.device.service.DeviceRepairService;
@@ -43,17 +41,14 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param deviceRepair 设备维修
     * @param queryDTO 设备维修
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('device_deviceRepair_view')" )
    public R getDeviceRepairPage(@ParameterObject Page page, @ParameterObject DeviceRepair deviceRepair) {
        LambdaQueryWrapper<DeviceRepair> wrapper = Wrappers.lambdaQuery();
      wrapper.eq(StrUtil.isNotBlank(deviceRepair.getSerialNo()),DeviceRepair::getSerialNo,deviceRepair.getSerialNo());
      wrapper.orderByDesc(DeviceRepair::getCreateTime);
        return R.ok(deviceRepairService.page(page, wrapper));
    public R getDeviceRepairPage(@ParameterObject Page page, DeviceRepairQueryDTO queryDTO) {
        return R.ok(deviceRepairService.pageNew(page, queryDTO));
    }