From eb0e29e72049bc65f943cc864929c332b07f25d0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:56:46 +0800
Subject: [PATCH] 导出osd问题 以及缺少小时改分钟

---
 ycl-server/src/main/java/com/ycl/api/YS/YSApi.java                              |    2 ++
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
index 03fc9d6..bb8fcdf 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
@@ -95,12 +95,14 @@
 
 
             String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8).trim();
+            log.error("YSname:{}" , name);
             if (StringUtils.isNotEmpty(name) && name.contains("|")){
                 String[] osdNames = name.split("\\|");
                 osdResult.setOSD1(osdNames[0]);
                 osdResult.setOSD2(osdNames[1]);
                 osdResult.setOSD3(osdNames[2]);
                 osdResult.setName(osdNames[3]);
+                osdResult.setOSD4(osdNames[4]);
             }else {
                 //鐪佷唤
                 osdResult.setOSD1(name);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 41b58a6..f527aad 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -67,6 +67,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -1425,7 +1426,7 @@
             field.setAccessible(true);
             //闃叉杞崲涓虹瀛﹁鏁版硶
             BigDecimal bigDecimal = BigDecimal.valueOf(recordResult.getMissDuration() == null ? 0 : (recordResult.getMissDuration()) * 60);
-            field.set(videoDailyExp, bigDecimal.toString());
+            field.set(videoDailyExp, bigDecimal.setScale(2, RoundingMode.HALF_UP).toString());
         }
     }
 }

--
Gitblit v1.8.0