From 865e106762fd7835b975cf5dc8bbe552977dc099 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 29 Dec 2025 13:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=A3=80=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquipmentController.java | 27 +++++++++---------- .../desk/device/mapper/EquipmentMapper.java | 2 +- .../device/service/IEquipmentService.java | 2 +- .../service/impl/EquipmentServiceImpl.java | 18 +++++++++++-- 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java index 0076ff56..23bb58bb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java @@ -25,6 +25,9 @@ */ package org.springblade.desk.device.controller; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -39,6 +42,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.device.pojo.excel.EquipmentExcel; +import org.springblade.desk.order.wrapper.AssayContentWrapper; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -78,26 +82,21 @@ public class EquipmentController extends BladeController { EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); return R.data(EquipmentWrapper.build().entityVO(detail)); } - /** - * 设备信息表 分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入equipment") - public R> list(@Parameter(hidden = true) @RequestParam Map equipment, Query query) { - IPage pages = equipmentService.page(Condition.getPage(query), Condition.getQueryWrapper(equipment, EquipmentEntity.class)); - return R.data(EquipmentWrapper.build().pageVO(pages)); - } /** * 设备信息表 自定义分页 */ @GetMapping("/page") @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入equipment") - public R> page(EquipmentVO equipment, Query query) { - IPage pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment); - return R.data(pages); + @Operation(summary = "分页", description = "") + @Parameters({ + @Parameter(name = "deviceCode", description = "设备编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "deviceName", description = "设备名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "category", description = "设备分类", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + }) + public R> page(@Parameter(hidden = true)EquipmentEntity equipment, Query query) { + IPage pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment); + return R.data(EquipmentWrapper.build().pageVO(pages)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.java index b879fc4f..9af909d8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.java @@ -49,7 +49,7 @@ public interface EquipmentMapper extends BaseMapper { * @param equipment 查询参数 * @return List */ - List selectEquipmentPage(IPage page, EquipmentVO equipment); + List selectEquipmentPage(IPage page, EquipmentEntity equipment); /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java index 94a1c7d7..89a3b742 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java @@ -47,7 +47,7 @@ public interface IEquipmentService extends BaseService { * @param equipment 查询参数 * @return IPage */ - IPage selectEquipmentPage(IPage page, EquipmentVO equipment); + IPage selectEquipmentPage(IPage page, EquipmentEntity equipment); /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java index 809b3ed5..2f1a6704 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java @@ -25,6 +25,8 @@ */ package org.springblade.desk.device.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.excel.EquipmentExcel; import org.springblade.desk.device.pojo.vo.EquipmentVO; @@ -35,6 +37,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; +import java.util.Objects; /** * 设备信息表 服务实现类 @@ -46,8 +49,19 @@ import java.util.List; public class EquipmentServiceImpl extends BaseServiceImpl implements IEquipmentService { @Override - public IPage selectEquipmentPage(IPage page, EquipmentVO equipment) { - return page.setRecords(baseMapper.selectEquipmentPage(page, equipment)); + public IPage selectEquipmentPage(IPage page, EquipmentEntity equipment) { +// return page.setRecords(baseMapper.selectEquipmentPage(page, equipment)); + // 1. 创建条件构造器 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + // 2. 动态添加条件（核心！） + // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件 + wrapper.like(Objects.nonNull(equipment.getDeviceCode()), EquipmentEntity::getDeviceCode, equipment.getDeviceCode()) + .like(Objects.nonNull(equipment.getDeviceName()), EquipmentEntity::getDeviceName, equipment.getDeviceName()) + .like(Objects.nonNull(equipment.getCategory()), EquipmentEntity::getCategory, equipment.getCategory()); + + // 3. 执行分页查询 + return baseMapper.selectPage(page, wrapper); }