临时提交

src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java

@@ -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);
     }

src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java

@@ -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();
     }
 

src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java

@@ -171,9 +171,9 @@ public class CameraChannelController {
     @ResponseBody
     @Operation(summary = "根据安装地址和监视方位获取摄像头", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "address", description = "安装地址")
-    @Parameter(name = "directionType", description = "监视方位")
+    @Parameter(name = "directionType", description = "监视方位", required = false)
     @Parameter(name = "geoCoordSys", description = "坐标系类型：WGS84,GCJ02、BD09")
-    public List<CameraChannel> queryListByAddressAndDirectionType(String address, Integer directionType, @RequestParam(required = false) String geoCoordSys) {
+    public List<CameraChannel> queryListByAddressAndDirectionType(String address, @RequestParam(required = false) Integer directionType, @RequestParam(required = false) String geoCoordSys) {
         return channelService.queryListByAddressAndDirectionType(address, directionType, geoCoordSys);
     }
 
@@ -277,4 +277,5 @@ public class CameraChannelController {
         return channelService.queryListForMobile(page, count, topGroupAlias);
     }
 
+
 }

src/main/java/com/genersoft/iot/vmp/web/custom/bean/CameraChannel.java

@@ -18,4 +18,9 @@ public class CameraChannel extends CommonGBChannel {
     @Setter
     @Schema(description = "图标路径")
     private String icon;
+
+    @Getter
+    @Setter
+    @Schema(description = "移动设备唯一编号")
+    private Long unitNo;
 }