From e1579f61f35be4dad324c43415a89ee315c9f538 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 07 三月 2025 14:06:11 +0800
Subject: [PATCH] 指标 最近24小时
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java
index 5775d02..6f78ab8 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/CalItemHandler.java
@@ -10,11 +10,12 @@
import com.iailab.module.data.ind.item.service.IndItemService;
import com.iailab.module.data.ind.item.vo.IndItemCalVO;
import com.iailab.module.data.ind.item.vo.IndItemValueVO;
-import com.iailab.module.data.ind.value.service.IndItemValueService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
@@ -27,7 +28,7 @@
@Component
public class CalItemHandler {
- @Autowired
+ @Resource
private JavaScriptHandler javaScriptHandler;
public static final String regex = "[+\\-\\*\\/\\(\\)\\&\\|\\>\\<]";
@@ -62,16 +63,23 @@
}
IndItemEntity subItem = indItemService.getInfoByNo(s);
ItemTypeEnum itemType = ItemTypeEnum.getEumByCode(subItem.getItemType());
+ List<IndItemValueVO> vl = new ArrayList<>();
switch (itemType) {
case ATOM:
- valueMix.add(atomItemHandler.queryValue(subItem.getId()));
+ vl = atomItemHandler.queryValue(subItem.getId());
break;
case DER:
- valueMix.add(derItemHandler.queryValue(subItem.getId()));
+ vl = derItemHandler.queryValue(subItem.getId());
break;
default:
break;
}
+ if (!CollectionUtils.isEmpty(vl)) {
+ vl.forEach(vi -> {
+ vi.setItemNo(s);
+ });
+ }
+ valueMix.add(vl);
}
dataLength = valueMix.get(0).size();
@@ -109,16 +117,21 @@
}
IndItemEntity subItem = indItemService.getInfoByNo(s);
ItemTypeEnum itemType = ItemTypeEnum.getEumByCode(subItem.getItemType());
+ List<IndItemValueVO> vl = new ArrayList<>();
switch (itemType) {
case ATOM:
- valueMix.add(atomItemHandler.queryValue(subItem.getId()));
+ vl = atomItemHandler.queryValue(subItem.getId());
break;
case DER:
- valueMix.add(derItemHandler.queryValue(subItem.getId(), startTime, endTime));
+ vl = derItemHandler.queryValue(subItem.getId(), startTime, endTime);
break;
default:
break;
}
+ if (!CollectionUtils.isEmpty(vl)) {
+ vl.forEach(vi -> vi.setItemNo(s));
+ }
+ valueMix.add(vl);
}
dataLength = valueMix.get(0).size();
@@ -128,6 +141,7 @@
IndItemValueVO valueDTO = valueMix.get(j).get(i);
dataMap.put(valueDTO.getItemNo(), valueDTO);
}
+ log.info("dataMap:" + dataMap);
IndItemValueVO itemValue = this.singleCompute(indItem, dataMap);
result.add(itemValue);
}
--
Gitblit v1.9.3