From 771623fe17658cc988445a031df6ed3e6edb76bc Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Jun 2021 10:43:50 +0800
Subject: [PATCH] screen-manage 修复因子删除bug
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 55f62ee..9e06f36 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -76,6 +76,8 @@
@Autowired
private VersionSensorUnitMapper versionSensorUnitMapper;
+
+
/*
* ���redis������������������
* */
@@ -163,6 +165,11 @@
public void update(Device device) {
Integer deviceId = device.getId();
Device oldDevice = deviceMapper.selectById(deviceId);
+ //���������������������������������������������������������������������������������id������������
+ if(!ObjectUtils.isEmpty(device.getMonitorPointId())){
+ MonitorPoint monitorPoint = monitorPointMapper.selectById(device.getMonitorPointId());
+ device.setOrganizationId(monitorPoint.getOrganizationId());
+ }
deviceMapper.updateById(device);
Device updateDevice = deviceMapper.selectById(deviceId);
String mac = updateDevice.getMac();
@@ -438,6 +445,7 @@
organizationUnitAlarm.setVersionId(versionId);
organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarm.setShowUnitKey(versionSensorUnit.getUnitKey());
organizationUnitAlarmMapper.insert(organizationUnitAlarm);
}
}
--
Gitblit v1.8.0