Преглед изворни кода

feat(manhole): 添加设备列表关键字搜索功能

- 在 ManholeDeviceListInDTO 中新增 keyword 字段用于模糊查询
- 实现按设备编号、设备名称、设备位置的多字段模糊搜索
- 集成到 EquipmentBaseService 查询逻辑中
- 支持关键词为空时的条件判断
- 保持原有排序逻辑不变
nahida пре 1 недеља
родитељ
комит
459fc04b90

+ 6 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/EquipmentBaseServiceImpl.java

@@ -351,6 +351,12 @@ public class EquipmentBaseServiceImpl extends ServiceImpl<EquipmentBaseMapper, E
         }
         LambdaQueryWrapper<EquipmentBase> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(CollUtil.isNotEmpty(equipmentIds), EquipmentBase::getEquipmentId, equipmentIds)
+                .and(StringUtils.isNotBlank(listInDTO.getKeyword()), wrapper -> wrapper
+                        .like(EquipmentBase::getEquipmentCode, listInDTO.getKeyword())
+                        .or()
+                        .like(EquipmentBase::getEquipmentName, listInDTO.getKeyword())
+                        .or()
+                        .like(EquipmentBase::getEquipmentLocation, listInDTO.getKeyword()))
                 .orderByDesc(EquipmentBase::getUpdateTime);
         List<EquipmentBase> equipmentBaseList = this.list(queryWrapper);
         if (CollUtil.isEmpty(equipmentBaseList)) {

+ 3 - 0
pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/in/ManholeDeviceListInDTO.java

@@ -25,6 +25,9 @@ public class ManholeDeviceListInDTO implements Serializable {
     @ApiModelProperty(value = "在线状态(0-离线,1-在线)")
     private Integer onlineStatus;
 
+    @ApiModelProperty(value = "关键字,支持按设备编号、设备名称、设备位置模糊查询")
+    private String keyword;
+
     @ApiModelProperty("是否查询井盖监测数据:默认不查询")
     private Boolean isQueryManholeData = false;
 }