From cc273f0fb102a905033641fdd4e9fc325c52e086 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 18 四月 2025 16:36:20 +0800
Subject: [PATCH] 报警代码优化
---
zhitan-system/src/main/java/com/zhitan/alarm/services/impl/AlarmAnalyisisServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/alarm/services/impl/AlarmAnalyisisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/alarm/services/impl/AlarmAnalyisisServiceImpl.java
index 53d8c83..b416f28 100644
--- a/zhitan-system/src/main/java/com/zhitan/alarm/services/impl/AlarmAnalyisisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/alarm/services/impl/AlarmAnalyisisServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.zhitan.alarm.domain.JkHistoryAlarm;
import com.zhitan.alarm.domain.dto.AlarmAnalysisDTO;
import com.zhitan.alarm.domain.vo.AlarmAnalysisVO;
@@ -53,7 +54,7 @@
private final SysEnergyMapper sysEnergyMapper;
/**
- * 鏍规嵁鑺傜偣id鑾峰彇鎶ヨ鍒嗘瀽淇℃伅(搴熷純)
+ * 鏍规嵁鑺傜偣id鑾峰彇鎶ヨ鍒嗘瀽淇℃伅
*
* @param alarmAnalysisDTO
* @return
@@ -198,23 +199,27 @@
AlarmAnalysisVO alarmAnalysisVO = new AlarmAnalysisVO();
+ ModelNode parentNode = modelNodeMapper.selectModelNodeById(alarmAnalysisDTO.getNodeId());
+ if(ObjectUtils.isEmpty(parentNode)){
+ return alarmAnalysisVO;
+ }
+
// 鏌ヨ妯″瀷涓嬬殑鐐逛綅鏁版嵁
- ModelNode modelNode = modelNodeMapper.selectModelNodeById(alarmAnalysisDTO.getNodeId());
- List<ModelNodeIndexInfo> nodeIndexInfoList = modelNodeMapper.getAllModelNodeIndexByAddress(modelNode.getModelCode(), modelNode.getAddress());
+ List<ModelNodeIndexInfo> nodeIndexInfoList = modelNodeMapper.getAllModelNodeIndexByAddress(parentNode.getModelCode(), parentNode.getAddress());
alarmAnalysisVO.setIndexCount(nodeIndexInfoList.size());
if (CollectionUtils.isEmpty(nodeIndexInfoList)) {
return alarmAnalysisVO;
}
// 鑾峰彇鏈堟姤璀︽暟銆佸勾鎶ヨ鏁�
- List<String> nodeIdList = nodeIndexInfoList.stream().map(ModelNodeIndexInfo::getIndexId).collect(Collectors.toList());
+ List<String> indexIdList = nodeIndexInfoList.stream().map(ModelNodeIndexInfo::getIndexId).collect(Collectors.toList());
DateTime beginOfMonth = DateUtil.beginOfMonth(new Date());
DateTime endOfMonth = DateUtil.endOfMonth(new Date());
DateTime beginOfYear = DateUtil.beginOfYear(new Date());
DateTime endOfYear = DateUtil.endOfYear(new Date());
- Integer monthCount = historyAlarmMapper.selectCountByTime(beginOfMonth,endOfMonth, nodeIdList);
- Integer yearCount = historyAlarmMapper.selectCountByTime(beginOfYear,endOfYear, nodeIdList);
+ Integer monthCount = historyAlarmMapper.selectCountByTime(beginOfMonth,endOfMonth, indexIdList);
+ Integer yearCount = historyAlarmMapper.selectCountByTime(beginOfYear,endOfYear, indexIdList);
alarmAnalysisVO.setMonthCount(monthCount);
alarmAnalysisVO.setYearCount(yearCount);
--
Gitblit v1.9.3