fix(ops): 修复区域设备索引初始化查询条件
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled

问题:selectListByAreaIdAndRelationType(null, "BADGE") 生成 WHERE area_id = NULL
导致查询结果为空,索引无法初始化

修复:areaId 为 null 时不添加该查询条件,查询所有 BADGE 类型设备

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
lzh
2026-01-29 00:04:53 +08:00
parent ff858fc3b8
commit afa5837160

View File

@@ -18,16 +18,20 @@ public interface OpsAreaDeviceRelationMapper extends BaseMapperX<OpsAreaDeviceRe
/**
* 根据区域ID和关联类型查询关联关系
*
* @param areaId 区域ID
* @param areaId 区域ID可为null表示查询所有区域
* @param relationType 关联类型TRAFFIC_COUNTER/BEACON/BADGE
* @return 关联关系列表
*/
default List<OpsAreaDeviceRelationDO> selectListByAreaIdAndRelationType(Long areaId, String relationType) {
return selectList(new LambdaQueryWrapperX<OpsAreaDeviceRelationDO>()
.eq(OpsAreaDeviceRelationDO::getAreaId, areaId)
LambdaQueryWrapperX<OpsAreaDeviceRelationDO> wrapper = new LambdaQueryWrapperX<OpsAreaDeviceRelationDO>()
.eq(OpsAreaDeviceRelationDO::getRelationType, relationType)
.eq(OpsAreaDeviceRelationDO::getEnabled, true)
.orderByDesc(OpsAreaDeviceRelationDO::getCreateTime));
.eq(OpsAreaDeviceRelationDO::getEnabled, true);
if (areaId != null) {
wrapper.eq(OpsAreaDeviceRelationDO::getAreaId, areaId);
}
return selectList(wrapper.orderByDesc(OpsAreaDeviceRelationDO::getCreateTime));
}
/**