编辑设备监视点名称

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;
+
 }

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);