diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java index 94e5f9a..2a9aa0a 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceAlarmController.java @@ -39,7 +39,6 @@ public class DeviceAlarmController extends BaseController { @Autowired private AlertLogMapper alertLogMapper; - @Autowired private DeviceInformationManager deviceInformationManager; @@ -384,7 +383,7 @@ public class DeviceAlarmController extends BaseController { @GetMapping("/alarmList") public AjaxResult getAlarmList(@Param("sort")Integer sort ){ List list = new LambdaQueryChainWrapper<>(alertLogMapper) - .select(AlertLog::getAlertLogId,AlertLog::getCreateTime,AlertLog::getAlertName,AlertLog::getSerialNumber) + .select(AlertLog::getAlertLogId,AlertLog::getCreateTime,AlertLog::getAlertName,AlertLog::getSerialNumber,AlertLog::getDeviceName) .list(); if(sort != null){ //对列表进行排序