From a7e86d5e440fc333d3cd6d020cb176185d2eea15 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 21 七月 2025 14:31:53 +0800
Subject: [PATCH] .db采集代码调整
---
cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
index 5d55dc4..98c1942 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
@@ -136,8 +136,8 @@
}
break;
case ".db":
- map = analysisDb1(data, userMap, device);
-// map = analysisDb(data, userMap, device);
+// map = analysisDb1(data, userMap, device);
+ map = analysisDb(data, userMap, device);
break;
case ".png":
map = readPngString(data, userMap, device);
@@ -602,24 +602,7 @@
});
return map;
}
- public static Map<String, Object> analysisList1(String data, Map<String, List<DataConfig>> dataConfig,
- Device device, String entrustCode, String sampleCode) {
- Map<String, Object> map = new HashMap<>();
- dataConfig.forEach((k, v) -> {
- List<Object> list = new ArrayList<>();
- // 濮旀墭缂栧彿涓庢牱鍝佺紪鍙蜂笉瀛樺湪锛屽畾锛�1銆乊瀹氳寖鍥达紝X瀹氭í鍧愭爣锛�2銆佸彧瀛樺湪Y锛�3銆佸彧瀛樺湪X
- if (ObjectUtils.isEmpty(device.getEntrustCode()) && ObjectUtils.isEmpty(device.getSampleCode())) {
- list = analyzeData(data, v, k, splitIdentifier);
- // 濮旀墭缂栧彿涓庢牱鍝佺紪鍙峰瓨鍦�
- } else if (ObjectUtils.isNotEmpty(device.getEntrustCode()) && ObjectUtils.isNotEmpty(device.getSampleCode())) {
- list = analyzeDataEntrustCodAndSampleCode(data, v, k, splitIdentifier, device, entrustCode, sampleCode);
- }
- // 杩涜鍏紡璁＄畻
- Object resultValue = calculationFormula(list, v.get(0), k, device);
- map.put(k, resultValue);
- });
- return map;
- }
+
private static List<Object> analyzeDataEntrustCodAndSampleCode(String data, List<DataConfig> v, String k, String splitIdentifier,
Device device, String entrustCodeValue, String sampleCodeValue) {
entrustCodeValue = entrustCodeValue.replaceAll(" ", "");
--
Gitblit v1.9.3