From b5a0f2ed3ca776bb508a75575685f1613bfd04fe Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Mon, 14 Jul 2025 19:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E8=AE=A1=E7=AE=9711?=
 =?UTF-8?q?11=202025=E5=B9=B47=E6=9C=8814=E6=97=A516:33:01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calculation/handler/CalcExecuteHandler.java    | 14 ++++++++------
 .../service/impl/CalcLogServiceImpl.java           | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/calculation/src/main/java/com/thing/calculation/handler/CalcExecuteHandler.java b/modules/calculation/src/main/java/com/thing/calculation/handler/CalcExecuteHandler.java
index 93d3087..a7bbb30 100644
--- a/modules/calculation/src/main/java/com/thing/calculation/handler/CalcExecuteHandler.java
+++ b/modules/calculation/src/main/java/com/thing/calculation/handler/CalcExecuteHandler.java
@@ -1,6 +1,7 @@
 package com.thing.calculation.handler;
 
 import cn.hutool.core.map.MapUtil;
+import com.google.common.collect.Lists;
 import com.thing.calculation.dto.CalcTargetConfigDTO;
 import com.thing.calculation.dto.ExecuteCalcRequest;
 import com.thing.calculation.dto.LogSourceInfoValue;
@@ -83,7 +84,7 @@ public class CalcExecuteHandler {
             return;
         }
         // 算出结果后批量推送
-        List<QueueProto.DataProto> protoList = new ArrayList<>();
+       // List<QueueProto.DataProto> protoList = new ArrayList<>();
         // 遍历计算日志
         for (CalcLogEntity log : logs) {
             try {
@@ -110,16 +111,17 @@ public class CalcExecuteHandler {
                                 .setTs(log.getTime())
                                 .setVal(log.getResult())
                                 .build();
-                protoList.add(
-                        QueueProto.DataProto.newBuilder().setTskvProto(tsKvProto).build());
+                // 批量推送
+                publisher.publishEvent(
+                        new QueueConsumerEvent(Topics.V1_TSKV_HISTORY.getValue(), Lists.newArrayList(QueueProto.DataProto.newBuilder().setTskvProto(tsKvProto).build())));
+//                protoList.add(
+//                        );
             }catch (Exception e){
                 //计算异常
                 log.setStatus(CalcStatus.CALCULATE_EXCEPTION.getCode());
             }
+
         }
-        // 批量推送
-        publisher.publishEvent(
-                new QueueConsumerEvent(Topics.V1_TSKV_HISTORY.getValue(), protoList));
         // 批量更新状态
         calcLogService.batchUpdate(logs);
     }
diff --git a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java
index 19d2306..eb5726b 100644
--- a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java
+++ b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java
@@ -145,7 +145,7 @@ public class CalcLogServiceImpl extends BaseServiceImpl<CalcLogMapper, CalcLogEn
         if (CollectionUtils.isEmpty(configIds)) {
             return Collections.emptyList();
         }
-        return mapper.selectListByQuery(
+       /* return mapper.selectListByQuery(
                 QueryWrapper.create()
                         .in(CalcLogEntity::getCalcTargetConfigId, configIds)
                         .ge(CalcLogEntity::getTime, startTs, Objects.nonNull(startTs))
@@ -155,7 +155,17 @@ public class CalcLogServiceImpl extends BaseServiceImpl<CalcLogMapper, CalcLogEn
                         .or(CALC_LOG_ENTITY
                                         .STATUS
                                         .ne(CalcStatus.CALCULATE_EXCEPTION.getCode())
-                                        .and(CALC_LOG_ENTITY.CALC_COUNT.le(MAX_CALC_COUNT))));
+                                        .and(CALC_LOG_ENTITY.CALC_COUNT.le(MAX_CALC_COUNT))));*/
+        List<CalcLogEntity> calcLogEntities = mapper.selectListByQuery(QueryWrapper.create()
+                .in(CalcLogEntity::getCalcTargetConfigId, configIds)
+                .ge(CalcLogEntity::getTime, startTs, Objects.nonNull(startTs))
+                .le(CalcLogEntity::getTime, endTs, Objects.nonNull(endTs))
+//                        .eq(CalcLogEntity::getStatus, CalcStatus.UN_CALCULATED.getCode())
+                .ne(CalcLogEntity::getStatus, CalcStatus.CALCULATED.getCode())
+                .le(CalcLogEntity::getCalcCount,MAX_CALC_COUNT).orderBy(CalcLogEntity::getTime).asc());
+
+        return calcLogEntities;
+
     }
 
     @Override