bug处理

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