From 4e818e2aa272786be2a5b252d222595812d52c2b Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 04 八月 2025 14:58:32 +0800
Subject: [PATCH] 调整方法返回格式
---
cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 c717dd4..2801da1 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
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.utils.RedisUtil;
import com.ruoyi.device.constant.DCResistanceMqttConstants;
import com.ruoyi.device.dto.DeviceCollectionDto;
@@ -25,6 +26,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+
+import static com.ruoyi.framework.datasource.DynamicDataSourceContextHolder.log;
public class DataAcquisition {
@@ -180,25 +183,22 @@
List<Object> list = new ArrayList<>();
for (int config = 0; config < v.size(); config++) {
String refery = getRefer(v.get(config).getRefery());
- // 浠� Redis 涓幏鍙栧��
- Object value = RedisUtil.get(refery);
- if (ObjectUtils.isNotEmpty(value)) {
- if (value instanceof String && ((String) value).startsWith("[") && ((String) value).endsWith("]")) {
- try {
- // 瑙ｆ瀽 JSON 鏁扮粍瀛楃涓蹭负 List<BigDecimal>
- List<BigDecimal> values = JSONArray.parseArray((String) value, BigDecimal.class);
- list.addAll(values);
- numberOfDataEntries.addAndGet(values.size());
- } catch (Exception e) {
- // 瑙ｆ瀽澶辫触锛岃褰曢敊璇棩蹇楋紝浣跨敤鍘熷瓧绗︿覆鍊�
- System.err.println("瑙ｆ瀽 Redis 杩斿洖鐨� JSON 鏁扮粍澶辫触: " + value);
- list.add(value);
+ if (refery.equals(DCResistanceMqttConstants.NSDQCS_DQCS_DZZ)){
+ // 浠� Redis 涓幏鍙栦竴涓暟鎹�
+ Object value = RedisUtil.get(refery);
+ list.add(value);
+ numberOfDataEntries.addAndGet(1);
+ }else {
+ // 浠� Redis 涓幏鍙栧垪琛ㄦ暟鎹�
+ List<Object> objectList = RedisUtil.lGet(refery, 0, -1);
+ for (Object item : objectList) {
+// System.out.println(item);
+ String[] split = item.toString().replace("[","").replace("]","").split(",");
+ for (Object a :
+ split) {
+ list.add(a);
numberOfDataEntries.addAndGet(1);
}
- } else {
- numberOfDataEntries.addAndGet(1);
- list.add(value);
-
}
}
}
@@ -579,7 +579,7 @@
if (listResult.size() >= 1) {
hashMap.put("result", listResult);
} else {
- hashMap.put("result", listResult.get(0).toString());
+ hashMap.put("result", listResult);
}
hashMap.put("equipName", device.getDeviceName());
hashMap.put("equipValue", device.getManagementNumber());
--
Gitblit v1.9.3