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