From 53a8a9426f21c7f853c406e462486029c78018b2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 03 八月 2024 09:33:08 +0800
Subject: [PATCH] 电磁锁临时电子围栏加入主动操控失效提交

---
 ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
index 92642cd..24aa518 100644
--- a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
+++ b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -321,7 +321,13 @@
             if(listResult.size()>0){
                 for(int i = 0 ; i<listResult.size(); i++){
                     Map<String , Object> mapTemp = listResult.get(i);
-                    BigDecimal value = (BigDecimal)mapTemp.get("Value");  //鏁板��
+                    //BigDecimal value = (BigDecimal)mapTemp.get("Value");  //鏁板��
+                    BigDecimal value = null;  //鏁板��
+                    try{
+                        value = (BigDecimal)mapTemp.get("Value");
+                    }catch(Exception e){
+                        value = BigDecimal.valueOf(((Number)mapTemp.get("Value")).floatValue());
+                    }
                     String measureStr = (String)mapTemp.get("MeasureDate");  //娴嬮噺鏃堕棿
                     measureStr = measureStr.substring(measureStr.indexOf("(")+1, measureStr.indexOf(")",2));
                     SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

--
Gitblit v1.9.3