From 997c1d0eb7c694b6c30eee66427671b818a44a8f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 07 五月 2025 17:58:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
index 58625db..ae3e12e 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
@@ -119,7 +119,18 @@
queryDto.setEnd(endTime);
queryDto.setPointNo(dto.getMomentPoint());
log.info("queryDto=" + JSONObject.toJSONString(queryDto));
- List<ApiPointValueDTO> dataList = dataPointApi.queryPointHistoryValue(queryDto);
+ List<ApiPointValueDTO> dataList = new ArrayList<>();
+ List<ApiPointValueDTO> dataListTemp = dataPointApi.queryPointHistoryValue(queryDto);
+ if (dto.getIsCumuNeg() != null && dto.getIsCumuNeg().equals(0)) {
+ for(ApiPointValueDTO item : dataListTemp) {
+ if (item.getV() > 0) {
+ dataList.add(item);
+ }
+ }
+ } else {
+ dataList = dataListTemp;
+ }
+
if (CollectionUtils.isEmpty(dataList)) {
log.info("dataList is empty");
if (listGood != null) {
--
Gitblit v1.9.3