Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

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

@@ -452,27 +452,11 @@ public class Device {
 	public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
 		this.sipTransactionInfo = sipTransactionInfo;
 	}
+    public boolean isBroadcastPushAfterAck() {
+        return broadcastPushAfterAck;
+    }
 
-	/*======================设备主子码流逻辑START=========================*/
-	@Schema(description = "开启主子码流切换的开关（false-不开启，true-开启）")
-	private boolean switchPrimarySubStream;
-
-	public boolean isSwitchPrimarySubStream() {
-		return switchPrimarySubStream;
-	}
-
-	public void setSwitchPrimarySubStream(boolean switchPrimarySubStream) {
-		this.switchPrimarySubStream = switchPrimarySubStream;
-	}
-
-	/*======================设备主子码流逻辑END=========================*/
-
-
-	public boolean isBroadcastPushAfterAck() {
-		return broadcastPushAfterAck;
-	}
-
-	public void setBroadcastPushAfterAck(boolean broadcastPushAfterAck) {
-		this.broadcastPushAfterAck = broadcastPushAfterAck;
-	}
+    public void setBroadcastPushAfterAck(boolean broadcastPushAfterAck) {
+        this.broadcastPushAfterAck = broadcastPushAfterAck;
+    }
 }

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

@@ -246,6 +246,10 @@ public class DeviceChannel {
 	@Schema(description = "GPS的更新时间")
 	private String gpsTime;
 
+	@Schema(description = "码流标识，优先级高于设备中码流标识，" +
+			"用于选择码流时组成码流标识。默认为null，不设置。可选值: stream/streamnumber/streamprofile/streamMode")
+	private String streamIdentification;
+
 	public int getId() {
 		return id;
 	}
@@ -574,4 +578,12 @@ public class DeviceChannel {
 	public void setGpsTime(String gpsTime) {
 		this.gpsTime = gpsTime;
 	}
+
+	public String getStreamIdentification() {
+		return streamIdentification;
+	}
+
+	public void setStreamIdentification(String streamIdentification) {
+		this.streamIdentification = streamIdentification;
+	}
 }

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

@@ -0,0 +1,44 @@
+package com.genersoft.iot.vmp.gb28181.bean;
+
+/**
+ * 码流索引标识
+ */
+public enum GbSteamIdentification {
+    /**
+     * 主码流 stream:0
+     * 子码流 stream:1s
+     */
+    streamMain("stream", new String[]{"0","1"}),
+    /**
+     * 国标28181-2022定义的方式
+     * 主码流 streamnumber:0
+     * 子码流 streamnumber:1
+     */
+    streamnumber("streamnumber", new String[]{"0","1"}),
+    /**
+     * 主码流 streamprofile:0
+     * 子码流 streamprofile:1
+     */
+    streamprofile("streamprofile", new String[]{"0","1"}),
+    /**
+     * 适用的品牌： TP-LINK
+     */
+    streamMode("streamMode", new String[]{"main","sub"}),
+    ;
+
+    GbSteamIdentification(String value, String[] indexArray) {
+        this.value = value;
+        this.indexArray = indexArray;
+    }
+
+    private String value;
+    private String[] indexArray;
+
+    public String getValue() {
+        return value;
+    }
+
+    public String[] getIndexArray() {
+        return indexArray;
+    }
+}

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

@@ -52,7 +52,7 @@ public class SubscribeHolder {
         Runnable runnable = dynamicTask.get(taskOverdueKey);
         if (runnable instanceof ISubscribeTask) {
             ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
-            subscribeTask.stop();
+            subscribeTask.stop(null);
         }
         // 添加任务处理订阅过期
         dynamicTask.stop(taskOverdueKey);
@@ -87,7 +87,7 @@ public class SubscribeHolder {
         Runnable runnable = dynamicTask.get(taskOverdueKey);
         if (runnable instanceof ISubscribeTask) {
             ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
-            subscribeTask.stop();
+            subscribeTask.stop(null);
         }
         // 添加任务处理订阅过期
         dynamicTask.stop(taskOverdueKey);