From eeb9c787c6d69242688c7c49891a145f17e111cb Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 28 Aug 2024 16:19:43 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TemperatureServiceImpl.java           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java
index 8905938..8137fae 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java
@@ -17,10 +17,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.time.Instant;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -50,12 +48,16 @@ public class TemperatureServiceImpl implements TemperatureService {
             throw new BusinessException("不存在输出侧监测点，无温度信息");
         }
         List<StatisticalDataDTO> topTemperature = commonService.getTopTemperature(collect.get(0).getLineId(), "apf_data", "Apf_Temp_Env",data1.get(0).getProcess()+"");
+        Instant time = topTemperature.stream().max(Comparator.comparing(StatisticalDataDTO::getTime)).get().getTime();
         List<StatisticalDataDTO> result = new ArrayList<>();
         for(int i = 0; i <=moduleNumber; i++){
             StatisticalDataDTO statisticalData = new StatisticalDataDTO();
             int finalI = i;
             StatisticalDataDTO statisticalDataDTO = topTemperature.stream().filter(tem -> Objects.equals(tem.getClDid(), finalI + "")).findFirst().orElse(new StatisticalDataDTO());
             statisticalDataDTO.setClDid(finalI+"");
+            if (!Objects.equals(time,statisticalDataDTO.getTime())) {
+                statisticalDataDTO.setValue(null);
+            }
             result.add(statisticalDataDTO);
         }
         return result;