From eb7b98bc580c23ae94b2cec3778c024a0be52197 Mon Sep 17 00:00:00 2001
From: htjcAdmin <qinyanlei@ht-atia.com>
Date: Wed, 21 May 2025 15:25:51 +0800
Subject: [PATCH] =?UTF-8?q?/*=E8=A1=A8=E8=AE=A1=E5=B7=A1=E8=A7=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=8F=8F=E8=BF=B0"=E4=B8=8E=E6=A0=B7=E6=9C=AC?=
 =?UTF-8?q?=E5=9B=BE=E6=9C=89=E5=B7=AE=E5=BC=82"=E6=94=B9=E6=88=90"?=
 =?UTF-8?q?=E8=AF=BB=E6=95=B0=E5=A4=B1=E8=B4=A5"*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/inspect/ivs/domain/ZlmConvertUrl.java     | 15 +++++++++++----
 .../com/inspect/ivs/service/ZlMediaComponent.java |  2 ++
 .../analysis/utils/ResultAnalysisUtils.java       |  4 ++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/domain/ZlmConvertUrl.java b/inspect-ivs/src/main/java/com/inspect/ivs/domain/ZlmConvertUrl.java
index 9a176a8..3489a77 100644
--- a/inspect-ivs/src/main/java/com/inspect/ivs/domain/ZlmConvertUrl.java
+++ b/inspect-ivs/src/main/java/com/inspect/ivs/domain/ZlmConvertUrl.java
@@ -1,6 +1,11 @@
 package com.inspect.ivs.domain;
 
+import com.inspect.ivs.controller.IvsStreamController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ZlmConvertUrl {
+   private static final Logger log = LoggerFactory.getLogger(ZlmConvertUrl.class);
    private String flv;
    private String m3u8;
    private String mp4;
@@ -8,10 +13,12 @@ public class ZlmConvertUrl {
    private String hls;
 
    public ZlmConvertUrl(String baseAddress, String webrtcPrefix, String streamId) {
-      this.flv = String.format("%s/live/%s.live.flv", new Object[]{baseAddress, streamId});
-      this.m3u8 = String.format("%s/live/%s.m3u8", new Object[]{baseAddress, streamId});
-      this.mp4 = String.format("%s/live/%s.live.mp4", new Object[]{baseAddress, streamId});
-      this.webrtc = String.format("%s/index/api/webrtc?app=live&stream=%s&type=play", new Object[]{webrtcPrefix, streamId});
+      log.info("baseAddress: {}, webrtcPrefix: {}, streamId: {}", baseAddress, webrtcPrefix, streamId);
+      this.flv = String.format("%s/live/%s.live.flv", baseAddress, streamId);
+      this.m3u8 = String.format("%s/live/%s.m3u8", baseAddress, streamId);
+      this.mp4 = String.format("%s/live/%s.live.mp4", baseAddress, streamId);
+      this.webrtc = String.format("%s/index/api/webrtc?app=live&stream=%s&type=play", webrtcPrefix, streamId);
+
    }
 
    public String getFlv() {
diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/ZlMediaComponent.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/ZlMediaComponent.java
index a693f06..5318f78 100644
--- a/inspect-ivs/src/main/java/com/inspect/ivs/service/ZlMediaComponent.java
+++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/ZlMediaComponent.java
@@ -1,5 +1,6 @@
 package com.inspect.ivs.service;
 
+import com.inspect.base.core.constant.Color;
 import com.inspect.ivs.config.ZlMediaConfig;
 import com.inspect.ivs.constant.ZlMediaConst;
 import com.inspect.ivs.domain.ZlmConvertUrl;
@@ -25,6 +26,7 @@ public class ZlMediaComponent extends IvsCommonService {
 
    public void convert(String rtspUrl, String streamId, IvsVideoRtspView ivsVideoRtspView) {
       if(zlMediaConfig.isEnable()) {
+         log.info(Color.YELLOW + "zlMediaConfig: {}" + Color.END, zlMediaConfig);
          ZlMediaRtspVo rtspVo = new ZlMediaRtspVo(zlMediaConfig.getSecret(),
                  streamId,
                  rtspUrl);
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
index 7674ba9..3ce784c 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
@@ -66,6 +66,10 @@ public class ResultAnalysisUtils {
             resultAnalysis.setResultType("2");
             resultAnalysis.setResStatus("0");
             if ("meter".equals(algType)) {
+<<<<<<< Updated upstream
+=======
+                //defaultDesc = messageUtils.get("与样本有差异");
+>>>>>>> Stashed changes
                 defaultDesc = messageUtils.get("读数失败");
             } else {
                 defaultDesc = messageUtils.get("算法内部异常");