1

src/main/java/com/fdkankan/tk/request/SceneParam.java

@@ -12,4 +12,6 @@ public class SceneParam extends RequestBase {
     private String sceneName;
     private List<String> numList;
     private Integer status =2; //
+
+    private Integer haveVoid = 0;
 }

src/main/java/com/fdkankan/tk/service/impl/SceneServiceImpl.java

@@ -31,14 +31,22 @@ public class SceneServiceImpl implements ISceneService {
         param.setNumList(numList);
         param.setStatus(2);
         param.setPageNum(1);
+        param.setType(0);
         param.setPageSize(9999);
+        JSONArray list = fdkkList(param);
+        param.setType(1);
+        JSONArray list1 = fdkkList(param);
+        list.addAll(list1);
+        return overSceneVo(list);
+    }
+
+    private JSONArray fdkkList(SceneParam param ){
         FdkkResponse fdkkResponse = fdKKClient.sceneList(param);
         if (fdkkResponse.getCode() != 0) {
-            throw new BusinessException(fdkkResponse.getCode(), fdkkResponse.getMsg());
+            return new JSONArray();
         }
         PageInfo pageInfo = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData()), PageInfo.class);
-        JSONArray list = JSONArray.parseArray(JSONObject.toJSONString(pageInfo.getList()));
-        return overSceneVo(list);
+        return JSONArray.parseArray(JSONObject.toJSONString(pageInfo.getList()));
     }
 
     @Override

src/main/resources/application-local.yaml

@@ -31,7 +31,7 @@ spring:
 4dkk:
   fdService:
     #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://test.4dkankan.com
-    port: 80
-    #basePath: http://192.168.0.38/4dkankan_v2
-    #port: 8080
+   # basePath: http://test.4dkankan.com
+    #port: 80
+    basePath: http://192.168.0.38/4dkankan_v2
+    port: 8080