machunlei/springboot-xinda-dev
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

提交修改设备更新时关联组态更新

Browse Source
This commit is contained in:
LEED
2025-07-13 17:05:39 +08:00
parent ac40c5e5ec
commit 4c1521bda0
9 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/DeviceServiceImpl.java
View File

@@ -1304,9 +1304,11 @@ public class DeviceServiceImpl implements IDeviceService {
}
// 设备下不能有场景联动
List<SceneDeviceBindVO> sceneDeviceBindVOList = sceneDeviceMapper.listSceneDeviceBind(device.getSerialNumber());
if (null != sceneDeviceBindVOList.stream().filter(s -> s.getUserId().equals(sceneUserId)).findAny().orElse(null)) {
if (null != sceneDeviceBindVOList.stream().filter(s -> null != s.getUserId() && sceneUserId.equals(s.getUserId())).findAny().orElse(null)) {
return AjaxResult.error("删除失败，请先删除对应设备下的场景联动");
}
// 查绑定用户被分享用户配置的场景，需要把场景删掉
DeviceUser deviceUser = deviceUserMapper.selectDeviceUserByDeviceId(deviceId);
List<Long> userIdSceneList = new ArrayList<>();