|
@@ -37,6 +37,9 @@ public class SceneServiceImpl implements ISceneService {
|
|
|
param.setType(1);
|
|
|
JSONArray list1 = fdkkList(param);
|
|
|
list.addAll(list1);
|
|
|
+ param.setType(4);
|
|
|
+ JSONArray list2 = fdkkList(param);
|
|
|
+ list.addAll(list2);
|
|
|
return overSceneVo(list);
|
|
|
}
|
|
|
|
|
@@ -56,7 +59,7 @@ public class SceneServiceImpl implements ISceneService {
|
|
|
}
|
|
|
List<SceneVo> sceneVoList = new ArrayList<>();
|
|
|
long total = 0;
|
|
|
- if (param.getType() == 0 || param.getType() == 1) { //看看,看见
|
|
|
+ if (param.getType() == 0 || param.getType() == 1 || param.getType() == 4) { //看看,看见
|
|
|
//获取四维(看看,看见)场景数据
|
|
|
FdkkResponse fdkkResponse = null;
|
|
|
if (param.getNumList() == null || param.getNumList().size() <= 0) {
|