/*表计巡视结果描述"与样本图有差异"改成"读数失败"*/

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() {

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

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("算法内部异常");