From 21fde820e495c08cfa0ba277685468baa5bf9118 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 13 十二月 2023 10:27:42 +0800
Subject: [PATCH] OPC
---
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/em/equipmentAlarm/controller/EquipmentAlarmController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/em/equipmentAlarm/controller/EquipmentAlarmController.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/em/equipmentAlarm/controller/EquipmentAlarmController.java
index 38feb55..78317b1 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/em/equipmentAlarm/controller/EquipmentAlarmController.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/em/equipmentAlarm/controller/EquipmentAlarmController.java
@@ -138,10 +138,15 @@
List arrayList = new ArrayList();
List<EquipmentAlarm> alarmTime = equipmentAlarmService.list(new QueryWrapper<EquipmentAlarm>().orderByDesc("alarm_time"));
for (int i = 0; i < 10; i++) {
+// List resultList = new ArrayList();
+// resultList.add(alarmTime.get(i).getWorkshopCode());
+// resultList.add(alarmTime.get(i).getEquipmentNo());
+// resultList.add(alarmTime.get(i).getLocationCode());
+// arrayList.add(resultList);
List resultList = new ArrayList();
- resultList.add(alarmTime.get(i).getWorkshopCode());
- resultList.add(alarmTime.get(i).getEquipmentNo());
+// resultList.add(alarmTime.get(i).getEquipmentNo());
resultList.add(alarmTime.get(i).getLocationCode());
+ resultList.add(alarmTime.get(i).getAlarmTime());
arrayList.add(resultList);
}
return arrayList;
--
Gitblit v1.9.3