This commit is contained in:
wr
2025-04-07 13:37:52 +08:00
parent af59a427f1
commit b8c3f4d08c
6 changed files with 21 additions and 41 deletions

View File

@@ -104,6 +104,21 @@
<artifactId>pq-device-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>common-event</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>event-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>supervision-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>

View File

@@ -242,11 +242,11 @@ public class SpecialAnalysisServiceImpl implements ISpecialAnalysisService {
minTime.set(dto, "[]");
} else {
List<String> mins = min[i].stream().distinct().collect(Collectors.toList());
minTime.set(dto, JSON.toJSONString(mins));
List<String> limitTime = dataLimitRateDetailFeignClient.getLimitRateDetailTime(lineId, calculatedParam.getDataDate()).getData();
if (CollUtil.isNotEmpty(limitTime)) {
List<String> collect = mins.stream().filter(x -> limitTime.contains(x)).collect(Collectors.toList());
List<String> collect = mins.stream().filter(x -> limitTime.contains(x)).sorted().collect(Collectors.toList());
if (CollUtil.isNotEmpty(collect)) {
minTime.set(dto, JSON.toJSONString(collect));
isOrNot.set(dto, 1);
}
}