From 341a5b36a230ac7215d6e820cdc5a012956e80d7 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 09:18:33 +0800
Subject: [PATCH] 数采调整
---
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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..d4e249a 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
@@ -84,24 +84,15 @@
}
// 濡傛灉瀛樺湪瀛樺偍鍦板潃锛屽垯绉诲姩鍦板潃
if (ObjectUtils.isNotEmpty(device.getStorageUrl())) {
- String s = HTTP + ip + MOVEFILE + "?startFilePath=" + device.getCollectUrl() + "&endFilePath=" + device.getStorageUrl();
+ String s = HTTP + ip + MOVEFILE + "?startFilePath=" + device.getCollectUrl() + "&endFilePath=" + device.getStorageUrl() + "&fileType=" + device.getFileType();
String storageUrlResult = HttpUtil.get(s);
JSONObject storageUrlResultJson = JSON.parseObject(storageUrlResult);
- if (Objects.equals(storageUrlResultJson.get("code"), 1)) {
- if (ObjectUtils.isEmpty(storageUrlResultJson.get("msg"))) {
- throw new ErrorException("瀛樺偍鍦板潃閿欒锛屽彲鑳芥枃浠惰矾寰勯厤缃敊璇紒");
- } else {
- throw new ErrorException("鏈煡閿欒锛岃鑱旂郴绠＄悊鍛橈紒");
- }
- }
}
- 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 +133,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