OPC

懒羊羊

2023-12-13 21fde820e495c08cfa0ba277685468baa5bf9118

 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;