From ec33a306d97e52eb725b47f48d337ce357a8ef6a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 22 四月 2024 14:09:10 +0800
Subject: [PATCH] 设备告警接口全改为stationId
---
src/main/java/com/whyc/util/SubTablePageInfoUtils.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
index eab9744..7fa17b7 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java
@@ -359,7 +359,8 @@
param.setAlmStartTime1(queryTime.get(1));
param.setRecordYear(tableName);
//int currentCount = devAlarmDataHistoryMapper.getCount(param);
- int currentCount = subService.getCount(param);
+ //int currentCount = subService.getCount(param);
+ int currentCount = subService.getCount_stationId(param);
queryCountMap.put(tableYear, currentCount);
} else if (pojo instanceof PwrdevAlarmHistory) {
@@ -477,7 +478,8 @@
data.setLimitEnd(limitList.get(1));
data.setRecordYear(recordYear);
//List<DevalarmDataHistory> list = devAlarmDataHistoryMapper.getList2(data);
- List<DevalarmDataHistory> list = subService.getList2(data);
+ //List<DevalarmDataHistory> list = subService.getList2(data);
+ List<DevalarmDataHistory> list = subService.getList2_stationId(data);
dataList.addAll(list);
}
else if (pojo instanceof PwrdevAlarmHistory) {
--
Gitblit v1.9.1