From d6a8d606cba0148cb1d9786a69b1ba7dd530dc5f Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Wed, 7 Jan 2026 17:56:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/back/service/common/CommonOpt.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java
index 2502776..6ca7fad 100644
--- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java
+++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java
@@ -572,13 +572,10 @@ public class CommonOpt {
 		return mapValue(mapper, dataMapping, deviceRawdataRealtime, ExtractStrategy.LAST);
 	}
 
-	public String mapValue(
-			ObjectMapper mapper,
-			String dataMapping,
-			DeviceRawdataRealtime deviceRawdataRealtime,
-			ExtractStrategy strategy) {
+	public String mapValue(ObjectMapper mapper, String dataMapping,
+						   DeviceRawdataRealtime deviceRawdataRealtime, ExtractStrategy strategy) {
 
-		if (StringUtils.isBlank(dataMapping) || deviceRawdataRealtime == null) {
+		if (deviceRawdataRealtime == null) {
 			return null;
 		}
 
@@ -591,6 +588,10 @@ public class CommonOpt {
 				statusValue = extractLastValue(mapper, deviceRawdataRealtime.getRawData());
 			}
 
+			if(StringUtils.isBlank(dataMapping)){
+				return statusValue;
+			}
+
 			JsonNode root = mapper.readTree(dataMapping);
 			JsonNode mappedNode = root.path("default").path(statusValue);