Merge branch 'master' into dev/springBoot3

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/MediaController.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java

web/src/api/device.js

@@ -47,14 +47,22 @@ export function updateDeviceTransport(deviceId, streamMode) {
 export function setGuard(deviceId) {
   return request({
     method: 'get',
-    url: `/api/device/control/guard/${deviceId}/SetGuard`
+    url: `/api/device/control/guard`,
+    params: {
+      deviceId: deviceId,
+      guardCmd: 'SetGuard'
+    }
   })
 }
 
 export function resetGuard(deviceId) {
   return request({
     method: 'get',
-    url: `/api/device/control/guard/${deviceId}/ResetGuard`
+    url: `/api/device/control/guard`,
+    params: {
+      deviceId: deviceId,
+      guardCmd: 'ResetGuard'
+    }
   })
 }
 
@@ -118,6 +126,19 @@ export function queryChannels(deviceId, params) {
   })
 }
 
+export function queryHasStreamChannels(params) {
+  const {page, count, query} = params
+  return request({
+    method: 'get',
+    url: `/api/device/query/streams`,
+    params: {
+      page: page,
+      count: count,
+      query: query
+    }
+  })
+}
+
 export function deviceRecord(params) {
   const { deviceId, channelId, recordCmdStr } = params
   return request({
@@ -172,12 +193,13 @@ export function changeChannelAudio(params) {
 }
 
 export function updateChannelStreamIdentification(params) {
-  const { deviceDbId, streamIdentification } = params
+  const { deviceDbId, streamIdentification, id } = params
   return request({
     method: 'post',
     url: `/api/device/query/channel/stream/identification/update/`,
     params: {
       deviceDbId: deviceDbId,
+      id: id,
       streamIdentification: streamIdentification
     }
   })