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/HistoryAlarmServiceImpl.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/alarm/services/impl/HistoryAlarmServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/alarm/services/impl/HistoryAlarmServiceImpl.java
index 0a1f8ec..da5e081 100644
--- a/zhitan-system/src/main/java/com/zhitan/alarm/services/impl/HistoryAlarmServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/alarm/services/impl/HistoryAlarmServiceImpl.java
@@ -13,6 +13,7 @@
import com.zhitan.basicdata.mapper.MeterImplementMapper;
import com.zhitan.common.enums.TimeType;
import com.zhitan.common.utils.DateUtils;
+import com.zhitan.common.utils.PageUtils;
import com.zhitan.common.utils.StringUtils;
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.domain.ModelNode;
@@ -91,23 +92,6 @@
historyAlarmMapper.updateHistoryAlarm(alarmCode, historyAlarm);
}
- // 搴熷純
- @Override
- public Page<JkHistoryAlarm> selectJkHistoryAlarmPage(JkHistoryAlarm jkHistoryAlarm, Long pageNum, Long pageSize) {
- final Page<JkHistoryAlarm> jkHistoryAlarmPage = historyAlarmMapper.selectJkHistoryAlarmPage(jkHistoryAlarm, new Page<>(pageNum, pageSize));
- jkHistoryAlarmPage.getRecords().forEach(alarm -> {
- final String indexType = alarm.getIndexType();
- final String indexId = alarm.getIndexId();
- if ("COLLECT".equals(indexType) && StringUtils.isEmpty(alarm.getEnergyId())) {
- //鏍规嵁nodeId鍜宨ndexId 鍘绘煡璇㈣閲忓櫒鍏�
- EnergyIndex energyIndex = energyIndexMapper.selectEnergyIndexById(indexId);
- final MeterImplement meterImplement = meterImplementMapper.selectMeterImplementById(energyIndex.getMeterId());
- alarm.setEnergyId(meterImplement.getEnergyType());
- }
- });
- return jkHistoryAlarmPage;
- }
-
/**
* 鑾峰彇鍘嗗彶鎶ヨ鍒嗛〉鏁版嵁
*
@@ -115,7 +99,8 @@
* @return
*/
@Override
- public List<JkHistoryAlarm> selectHistoryAlarmPageList(JkHistoryAlarm historyAlarm) {
+ public Page<JkHistoryAlarm> selectHistoryAlarmPageList(JkHistoryAlarm historyAlarm) {
+ Page<JkHistoryAlarm> pageInfo = PageUtils.getPageInfo(JkHistoryAlarm.class);
List<String> indexIdList = new ArrayList<>();
if ("ALL".equals(historyAlarm.getEierarchyFlag())) {
@@ -154,7 +139,7 @@
}
if (ObjectUtils.isEmpty(indexIdList)) {
- return new ArrayList<>();
+ return pageInfo;
}
//鏃堕棿澶勭悊 濡傛灉涓嶄紶鏃堕棿榛樿鏌ヨ褰撳ぉ鐨勬暟鎹�
@@ -162,13 +147,12 @@
if (ObjectUtils.isEmpty(endTime)) {
endTime = DateUtil.endOfDay(DateUtils.getNowDate());
}
- Date beginTime = DateUtils.parseDate(historyAlarm.getEndTime());
+ Date beginTime = DateUtils.parseDate(historyAlarm.getBeginTime());
if (ObjectUtils.isEmpty(beginTime)) {
beginTime = DateUtil.beginOfDay(DateUtils.getNowDate());
}
- List<JkHistoryAlarm> historyAlarmList = historyAlarmMapper.getHistoryAlarmList(indexIdList, beginTime, endTime);
- return historyAlarmList;
+ return historyAlarmMapper.getHistoryAlarmList(beginTime, endTime,indexIdList, pageInfo);
}
}
--
Gitblit v1.9.3