From 44ff584e5dcb3a066d70e4eaaf9f098440a1a5f7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 12:07:43 +0800
Subject: [PATCH] 钥匙柜大屏
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
index f26758f..4f566db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
@@ -384,8 +384,8 @@
List<WarningEvent> warningEventList = warningEventMapper.selectJoinList(WarningEvent.class,
new MPJLambdaWrapper<WarningEvent>().
selectAll(WarningEvent.class)
- .selectAs(Warning::getCode,WarningEvent::getWarningId)
- .leftJoin(Warning.class,Warning::getId,WarningEvent::getWarningCode)
+ .selectAs(Warning::getCode,WarningEvent::getWarningCode)
+ .leftJoin(Warning.class,Warning::getId,WarningEvent::getWarningId)
.eq(WarningEvent::getIsdeleted,Constants.ZERO)
.in(Warning::getCode,Constants.WarningConfig.KEY_TIME_OUT_BACK.getKey(),Constants.WarningConfig.ALARM_TEST.getKey(),Constants.WarningConfig.GRID_TIME_OUT_INFO.getKey())
.like(Objects.nonNull(type)&&Constants.equalsInteger(Constants.ZERO,type),WarningEvent::getCreateDate,DateUtil.getCurrDate())
@@ -395,15 +395,15 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(warningEventList)){
vo.setAlcoholNum(
warningEventList.stream().filter(i->StringUtils.isNotBlank(i.getWarningCode())&&
- i.getWarningCode().equals(Constants.WarningConfig.ALARM_TEST.getKey())).collect(Collectors.toList()).size()
+ i.getWarningCode().equals(Constants.WarningConfig.ALARM_TEST.getKey()+"")).collect(Collectors.toList()).size()
);
vo.setUnCloseNum(
warningEventList.stream().filter(i->StringUtils.isNotBlank(i.getWarningCode())&&
- i.getWarningCode().equals(Constants.WarningConfig.GRID_TIME_OUT_INFO.getKey())).collect(Collectors.toList()).size()
+ i.getWarningCode().equals(Constants.WarningConfig.GRID_TIME_OUT_INFO.getKey()+"")).collect(Collectors.toList()).size()
);
vo.setTimeOutNum(
warningEventList.stream().filter(i->StringUtils.isNotBlank(i.getWarningCode())&&
- i.getWarningCode().equals(Constants.WarningConfig.KEY_TIME_OUT_BACK.getKey())).collect(Collectors.toList()).size()
+ i.getWarningCode().equals(Constants.WarningConfig.KEY_TIME_OUT_BACK.getKey()+"")).collect(Collectors.toList()).size()
);
}
--
Gitblit v1.9.3