From 7ce34339b3eb0c09f37ab58e5261635441aad453 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Thu, 25 Dec 2025 11:45:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=AE=BE=E5=A4=87=E7=9B=91?=
 =?UTF-8?q?=E8=A7=86=E7=82=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/back/dto/device/OptDeviceFieldParams.java  | 3 +++
 .../dashboard/back/service/impl/DeviceServiceImpl.java   | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/device/OptDeviceFieldParams.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/device/OptDeviceFieldParams.java
index 55307b3..19ae9d5 100644
--- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/device/OptDeviceFieldParams.java
+++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/device/OptDeviceFieldParams.java
@@ -14,4 +14,7 @@ public class OptDeviceFieldParams {
 	@Schema(description = "dashboard自动恢复告警时是否保留告警：0-不保留，1-保留", example = "1")
 	private Integer retainAlert;
 
+	@Schema(description = "dashboard自动恢复告警时是否保留告警：0-不保留，1-保留", example = "1")
+	private String monitoringPointName;
+
 }
diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceServiceImpl.java
index 8d3832b..aa9ff30 100644
--- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceServiceImpl.java
+++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceServiceImpl.java
@@ -59,13 +59,18 @@ public class DeviceServiceImpl implements DeviceService {
 	@Transactional
 	public SimpleDataResponse editField(OptDeviceFieldParams optDeviceFieldParams, Long companyId, Long userId, Integer languageType) {
 		try {
-			if (1 != optDeviceFieldParams.getRetainAlert() && 0 != optDeviceFieldParams.getRetainAlert()){
+			if (null != optDeviceFieldParams.getRetainAlert() && 1 != optDeviceFieldParams.getRetainAlert() && 0 != optDeviceFieldParams.getRetainAlert()){
 				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "Parameter [retainAlert] error");
 			}
 
 			DeviceInfo deviceInfo = new DeviceInfo();
 			deviceInfo.setId(optDeviceFieldParams.getId());
-			deviceInfo.setRetainAlert(optDeviceFieldParams.getRetainAlert());
+			if (null != optDeviceFieldParams.getRetainAlert()){
+				deviceInfo.setRetainAlert(optDeviceFieldParams.getRetainAlert());
+			}
+			if (StringUtils.isNotBlank(optDeviceFieldParams.getMonitoringPointName())){
+				deviceInfo.setMonitoringPointName(optDeviceFieldParams.getMonitoringPointName());
+			}
 
 			deviceInfoMapperExt.updateByPrimaryKeySelective(deviceInfo);