|
|
|
@ -199,16 +199,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { |
|
|
|
|
} |
|
|
|
|
for (PsdcSceneRes psr : sceneRes) { |
|
|
|
|
Long code = psr.getSceneCode(); |
|
|
|
|
List<SceneVo> listByCode = new ArrayList<>(); |
|
|
|
|
if (null != sceneCode && 0 != sceneCode){ |
|
|
|
|
for (SceneVo sv : list) { |
|
|
|
|
if (code == sv.getSceneCode()) { // 判断是否为同个策略
|
|
|
|
|
listByCode.add(sv); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, sceneName); |
|
|
|
|
} |
|
|
|
|
List<SceneVo> listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, sceneName); |
|
|
|
|
List<DeviceVo> ary = new ArrayList<>(); |
|
|
|
|
Integer deviceId = listByCode.get(0).getDeviceId(); |
|
|
|
|
DeviceVo deviceVo = new DeviceVo(); |
|
|
|
|