|
@@ -197,12 +197,7 @@ public class ApiBrandController extends ApiBaseAction {
|
|
}
|
|
}
|
|
entity.setSceneUrl(entity.getLiveRoomUrl());
|
|
entity.setSceneUrl(entity.getLiveRoomUrl());
|
|
// 获取场景数据
|
|
// 获取场景数据
|
|
- RequestScene requestScene = new RequestScene();
|
|
|
|
- requestScene.setNums(entity.getSceneNum());
|
|
|
|
- requestScene.setToken(request.getHeader(AuthorizationInterceptor.LOGIN_TOKEN_KEY));
|
|
|
|
- JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);
|
|
|
|
- List<Object> mySceneList = mySceneJsonData.getJSONArray("list");
|
|
|
|
- JSONObject sceneRes = JSONObject.parseObject(JSONObject.toJSONString(mySceneList.get(0)));
|
|
|
|
|
|
+ JSONObject sceneRes = zhiHouseService.queryBySceneNum(entity.getSceneNum(),request.getHeader(AuthorizationInterceptor.LOGIN_TOKEN_KEY));
|
|
if(!ObjectUtils.isEmpty(sceneRes)){
|
|
if(!ObjectUtils.isEmpty(sceneRes)){
|
|
entity.setSceneName(sceneRes.getString("sceneName"));
|
|
entity.setSceneName(sceneRes.getString("sceneName"));
|
|
}
|
|
}
|