From 38473e929d5ae452d22405d286bbef51758f582c Mon Sep 17 00:00:00 2001 From: qinyulong Date: Fri, 23 Jan 2026 15:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=8C=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83ID=E5=92=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/device/pojo/vo/EquipmentVO.java | 4 +++ .../controller/EquipmentController.java | 6 ++-- .../desk/device/mapper/EquipmentMapper.java | 2 +- .../desk/device/mapper/EquipmentMapper.xml | 33 +++++++++++++++++-- .../device/service/IEquipmentService.java | 2 +- .../service/impl/EquipmentServiceImpl.java | 29 ++++++++-------- 6 files changed, 56 insertions(+), 20 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/EquipmentVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/EquipmentVO.java index b618d9d8..21789e69 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/EquipmentVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/EquipmentVO.java @@ -53,4 +53,8 @@ public class EquipmentVO extends EquipmentEntity { * 状态名称 */ String statusName; + /** + * 工作中心名称 + */ + String workCenterName; } 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 dbf95f07..dedb7b50 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 @@ -99,10 +99,12 @@ public class EquipmentController extends BladeController { @Parameter(name = "typeName", description = "类别名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "used", description = "服役状态", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")), @Parameter(name = "virtualMac", description = "虚拟设备", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "workCenterId", description = "作业中心ID", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")), + @Parameter(name = "equipmentLocation", 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)); + IPage pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment); + return R.data(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 7faf43e8..1f6823b1 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 @@ -25,7 +25,7 @@ public interface EquipmentMapper extends BaseMapper { * @param equipment 查询参数 * @return List */ - List selectEquipmentPage(IPage page, EquipmentEntity equipment); + List selectEquipmentPage(IPage page, EquipmentEntity equipment); /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml index 7713186b..8ed99f01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml @@ -38,8 +38,37 @@ - + select + e.*, + wc.WC_NAME as workCenterName + from MES_EQUIPMENT e LEFT JOIN BA_WORK_CENTER wc ON e.WORK_CENTER_ID = wc.ID + WHERE e.IS_DELETED = 0 + + AND e.DEVICE_CODE LIKE CONCAT('%', CONCAT(#{equipment.deviceCode}, '%')) + + + AND e.DEVICE_NAME LIKE CONCAT('%', CONCAT(#{equipment.deviceName}, '%')) + + + AND e.CATEGORY LIKE CONCAT('%', CONCAT(#{equipment.category}, '%')) + + + AND e.TYPE_NAME LIKE CONCAT('%', CONCAT(#{equipment.typeName}, '%')) + + + AND e.EQUIPMENT_LOCATION LIKE CONCAT('%', CONCAT(#{equipment.equipmentLocation}, '%')) + + + AND e.USED = #{equipment.used} + + + AND e.VIRTUAL_MAC = #{equipment.virtualMac} + + + AND wc.ID = #{equipment.workCenterId} + + ORDER BY e.CREATE_TIME DESC 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 9589c383..c430bbec 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 @@ -48,7 +48,7 @@ public interface IEquipmentService extends BaseService { * @param equipment 查询参数 * @return IPage */ - IPage selectEquipmentPage(IPage page, EquipmentEntity 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 890a6df0..d3a3a5df 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 @@ -57,23 +57,24 @@ public class EquipmentServiceImpl extends BaseServiceImpl selectEquipmentPage(IPage page, EquipmentEntity 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()) - .like(Objects.nonNull(equipment.getTypeName()), EquipmentEntity::getTypeName, equipment.getTypeName()) - .like(Objects.nonNull(equipment.getEquipmentLocation()), EquipmentEntity::getEquipmentLocation, equipment.getEquipmentLocation()) - .eq(Objects.nonNull(equipment.getUsed()), EquipmentEntity::getUsed, equipment.getUsed()) - .eq(Objects.nonNull(equipment.getVirtualMac()), EquipmentEntity::getVirtualMac, equipment.getVirtualMac()) - .eq(Objects.nonNull(equipment.getWorkCenterId()), EquipmentEntity::getWorkCenterId, equipment.getWorkCenterId()); +// 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()) +// .like(Objects.nonNull(equipment.getTypeName()), EquipmentEntity::getTypeName, equipment.getTypeName()) +// .like(Objects.nonNull(equipment.getEquipmentLocation()), EquipmentEntity::getEquipmentLocation, equipment.getEquipmentLocation()) +// .eq(Objects.nonNull(equipment.getUsed()), EquipmentEntity::getUsed, equipment.getUsed()) +// .eq(Objects.nonNull(equipment.getVirtualMac()), EquipmentEntity::getVirtualMac, equipment.getVirtualMac()) +// .eq(Objects.nonNull(equipment.getWorkCenterId()), EquipmentEntity::getWorkCenterId, equipment.getWorkCenterId()); // 3. 执行分页查询 - return baseMapper.selectPage(page, wrapper); + List equipmentVOS = baseMapper.selectEquipmentPage(page, equipment); + return page.setRecords(equipmentVOS); }