From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
index a0387db..d89a644 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
@@ -140,7 +140,16 @@
                 JSONObject jsonObject1 = JSON.parseObject(dataList.get(y).toString());
                 Object o = jsonObject1.get(key);
                 if (ObjectUtils.isNotEmpty(o)) {
-                    list.add(o);
+                    // 灏忔暟鐐硅繘涓変綅
+                    double v1 = 0;
+                    try {
+                        v1 = Double.parseDouble(o.toString());
+                        double v2 = v1 / 1000;
+                        list.add(v2);
+                    } catch (NumberFormatException e) {
+                        list.add(o);
+                    }
+
                 }
             }
             // 杩涜鍏紡璁$畻

--
Gitblit v1.9.3