From f3ae77c5bd2f07f0171b014ed95092947a328d73 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Tue, 12 May 2026 13:19:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?retain=5Falert=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mappers/ex/DeviceInfoMapperExt.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml index 8f1793f..6b5aa8d 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml @@ -13,7 +13,7 @@ device_info.device_name, device_info.device_sn, type.device_category_id categoryId, - device_info.retain_alert, +# device_info.retain_alert, device_info.monitoring_point_name, basic_asset_class_big.id monitoringPointCategoryId, basic_asset_class_big.class_name as monitoringPointCategoryName, From ca3ba70945f824c0f68fa9acad01dc634ffff5fc Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Tue, 12 May 2026 13:42:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dongjian/dashboard/back/vo/data/DeviceBaStatusData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/DeviceBaStatusData.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/DeviceBaStatusData.java index e94be6f..5fd568d 100644 --- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/DeviceBaStatusData.java +++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/DeviceBaStatusData.java @@ -29,7 +29,7 @@ public class DeviceBaStatusData extends BaseData{ @Schema(description = "stop/running: 0-停止, 1-运行", example = "1") private Integer stopRun; - @Schema(description = "last stop time", example = "1720000000000", hidden = true) + @Schema(description = "", example = "1720000000000", hidden = true) private String latestTs; }