From 54d7eb1bc5f141b2f7ac6d9dbf85086efa54f81c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 17:26:50 +0800
Subject: [PATCH] 温度循环调整
---
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 505a27f..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
@@ -95,13 +95,11 @@
}
}
}
- String frequency = createFrequency(entrustCode, sampleCode);
- map.put("frequency", frequency);
return map;
}
}
- private static String createFrequency(String entrustCode, String sampleCode) {
+ public static String createFrequency(String entrustCode, String sampleCode) {
String key = frequency + ":" + entrustCode + ":" + sampleCode;
boolean b = RedisUtil.hasKey(key);
String frequencyValue;
@@ -142,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