From 560c232fa045dbe2779198b8c423e5504ebaa8f8 Mon Sep 17 00:00:00 2001 From: mi9688 Date: Mon, 2 Dec 2024 11:16:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/aaScreenAgricultural/DeviceAlarmController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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){ //对列表进行排序