Commit 2837e7731c8f6dec4425de52ed29e4818ee0f526
Merge branch '20220310' into 'master'
fix: 启动第二个场景联动时，第一个场景联动的触发器信息丢失的问题 See merge request huang/thingsboard3.3.2!63
Showing
1 changed file
with
3 additions
and
3 deletions
| @@ -428,9 +428,9 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap | @@ -428,9 +428,9 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap | ||
| 428 | for (Trigger item : triggers) { | 428 | for (Trigger item : triggers) { |
| 429 | String deviceId = item.getEntityId(); | 429 | String deviceId = item.getEntityId(); |
| 430 | List<String> scenes = devices.computeIfAbsent(deviceId, k -> new ArrayList<String>()); | 430 | List<String> scenes = devices.computeIfAbsent(deviceId, k -> new ArrayList<String>()); |
| 431 | - String scenId = item.getSceneLinkageId(); | ||
| 432 | - if (!scenes.contains(scenId)) { | ||
| 433 | - scenes.add(sceneId); | 431 | + String triggerScenId = item.getSceneLinkageId(); |
| 432 | + if (!scenes.contains(triggerScenId)) { | ||
| 433 | + scenes.add(triggerScenId); | ||
| 434 | } | 434 | } |
| 435 | if (scenes.isEmpty()) { | 435 | if (scenes.isEmpty()) { |
| 436 | devices.remove(deviceId); | 436 | devices.remove(deviceId); |