临时提交

This commit is contained in:
lin
2025-10-14 15:57:24 +08:00
parent f4e68e2aef
commit 7ebc23210a
6 changed files with 230 additions and 58 deletions

View File

@@ -156,6 +156,9 @@ public class CommonGBChannel {
@Schema(description = "是否支持对讲 1支持,0不支持")
private Integer enableBroadcast;
@Schema(description = "抽稀后的图层层级")
private Integer mapLevel;
public String encode(String serverDeviceId) {
return encode(null, serverDeviceId);
}

View File

@@ -798,7 +798,10 @@ public class ChannelProvider {
public String queryListByAddressAndDirectionType(Map<String, Object> params ){
StringBuilder sqlBuild = new StringBuilder();
sqlBuild.append(BASE_SQL_FOR_CAMERA_DEVICE);
sqlBuild.append(" where coalesce(wdc.gb_address, wdc.address) = #{address} and coalesce(wdc.gb_direction_type, wdc.direction_type) = #{directionType}");
sqlBuild.append(" where coalesce(wdc.gb_address, wdc.address) = #{address}");
if (params.get("directionType") != null) {
sqlBuild.append(" and coalesce(wdc.gb_direction_type, wdc.direction_type) = #{directionType}");
}
return sqlBuild.toString();
}