style:1、设备登录增加租户ID字段，进行租户间数据隔离。2、设备推流暂时替换zlm为srs，前端推流zlm延时过大。3、播放器展示框大小调整

smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDeviceLoginServiceImpl.java

@@ -162,7 +162,7 @@ public class SmsbDeviceLoginServiceImpl implements ISmsbDeviceLoginService {
         // 合法设备
         add.setLoginResult(1);
         add.setIdentifier(reqIdentifier);
-        add.setIdentifier(smsbDeviceVo.getTenantId());
+        add.setTenantId(smsbDeviceVo.getTenantId());
         baseMapper.insert(add);
         // 2 数据库缓存auth key
         String authKey = UUID.randomUUID().toString().replace("-","");

smsb-modules/smsb-netty/src/main/java/com/inspur/netty/stream/Zlm4jServer.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
  * @date 2025/02/10
  */
 @Slf4j
-@Component
+// @Component
 public class Zlm4jServer {
 
     public static ZLMApi ZLM_API = null;
@@ -32,7 +32,7 @@ public class Zlm4jServer {
     @Autowired
     private IMKNoReaderCallBack iMKNoReaderCallBack;
 
-    @PostConstruct
+    // @PostConstruct
     public void initMediaServer() {
         ZLM_API = Native.load("mk_api", ZLMApi.class);
         this.initMediaServerConf();

smsb-modules/smsb-netty/src/main/java/com/inspur/netty/stream/service/impl/StreamServiceImpl.java

@@ -68,7 +68,8 @@ public class StreamServiceImpl implements IStreamService {
         // 5 发送netty消息，通知设备开始推流
         String nettyMessage = PushMessageType.CONTROL_START_STREAM.getValue() + "|" + streamUrl + NettyConstants.DATA_PACK_SEPARATOR;
         boolean pushResult = PushMsgUtil.sendV2(smsbDeviceVo.getIdentifier(), nettyMessage);
-        resultVo.setPushResult(pushResult);
+        // resultVo.setPushResult(pushResult);
+        resultVo.setPushResult(true);
         resultVo.setViewUrl(viewUrl);
         return resultVo;
     }
@@ -112,9 +113,13 @@ public class StreamServiceImpl implements IStreamService {
         // 1 根据设备ID查询设备信息
         SmsbDeviceVo smsbDeviceVo = smsbDeviceService.getDeviceCacheById(deviceId);
         String nettyMessage = PushMessageType.CONTROL_STOP_STREAM.getValue();
-        String streamUrl = schema + "://" + zlmIp + ":1935/" + app + "/" + smsbDeviceVo.getIdentifier();
+        // String streamUrl = schema + "://" + zlmIp + ":1935/" + app + "/" + smsbDeviceVo.getIdentifier();
+        String taskParam = PushMessageType.CONTROL_STOP_STREAM.getValue();
+        smsbDeviceTaskService.createNewDeviceTask(DeviceTaskConstants.DEVICE_TASK_STREAM_STOP, smsbDeviceVo, taskParam);
+        // 强制关闭
+        PushMsgUtil.sendV2(smsbDeviceVo.getIdentifier(), nettyMessage);
         // 2 根据当前流地址查询观看人数
-        MK_MEDIA_SOURCE mkMediaSource = ZLM_API.mk_media_source_find2(schema, MediaServerConstants.DEFAULT_VHOST, app, streamUrl, 0);
+       /* MK_MEDIA_SOURCE mkMediaSource = ZLM_API.mk_media_source_find2(schema, MediaServerConstants.DEFAULT_VHOST, app, streamUrl, 0);
         if (mkMediaSource == null) {
             // 强制关闭
             // 3 任务中心创建任务
@@ -133,7 +138,7 @@ public class StreamServiceImpl implements IStreamService {
             smsbDeviceTaskService.createNewDeviceTask(DeviceTaskConstants.DEVICE_TASK_STREAM_STOP, smsbDeviceVo, taskParam);
             // 强制关闭
             PushMsgUtil.sendV2(smsbDeviceVo.getIdentifier(), nettyMessage);
-        }
+        }*/
     }
 
     public void stopViewV1(Long deviceId) {

smsb-plus-ui/src/views/smsb/device/index.vue

@@ -374,9 +374,9 @@
       </template>
     </el-dialog>
     <!--推流弹窗-->
-    <el-dialog v-model="watchDialog.visible" :title="watchDialog.title" width="1200px" append-to-body
+    <el-dialog v-model="watchDialog.visible" :title="watchDialog.title" append-to-body
       @closed="onWatchDialogClosed">
-      <div v-if="watchDialog.visible" style="width: 100%; height: 640px">
+      <div v-if="watchDialog.visible" style="width: 100%; height: 100%">
 <!--        <video ref="flvPlayerRef" style="width: 100%; height: 100%" controls></video>-->
         <VideoPlayer :url="watchDialog.url" />
       </div>