Explorar o código

app云端场景列表,深光展示bug

lyhzzz hai 1 ano
pai
achega
41b3ddf32e

+ 4 - 2
src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -357,16 +357,18 @@ public class LaserService {
     }
 
 
-    public HashMap<String, JSONObject> list(List<String> sceneNumList) {
+    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer sceneSource) {
         LaserSceneParam newParam = new LaserSceneParam();
         newParam.setPageNum(1);
+        newParam.setSceneSource(sceneSource);
         newParam.setPageSize(sceneNumList.size());
         newParam.setSceneCodes(sceneNumList);
         return this.list(newParam);
     }
-    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer status) {
+    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer status,Integer sceneSource) {
         LaserSceneParam newParam = new LaserSceneParam();
         newParam.setPageNum(1);
+        newParam.setSceneSource(sceneSource);
         newParam.setPageSize(sceneNumList.size());
         newParam.setSceneCodes(sceneNumList);
         newParam.setStatus(status);

+ 2 - 0
src/main/java/com/fdkankan/ucenter/httpClient/vo/LaserSceneParam.java

@@ -10,4 +10,6 @@ public class LaserSceneParam {
     private  Integer pageSize;
     private  Integer status;
     private List<String> sceneCodes;
+    private  Integer sceneSource;
+
 }

+ 5 - 2
src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -108,8 +108,11 @@ public class AppSceneService {
         List<String> numList = page.getRecords().stream().map(AppSceneVo::getNum).collect(Collectors.toList());
 
         HashMap<String, JSONObject> ssSceneMap = new HashMap<>();
-        if(param.getCameraType() == 10 || param.getCameraType() == 11){  //深时
-            ssSceneMap = laserService.list(numList);
+        if(param.getCameraType() == 10 ){  //深时
+            ssSceneMap = laserService.list(numList,4);
+        }
+        if( param.getCameraType() == 11){  //深光
+            ssSceneMap = laserService.list(numList,5);
         }
 
 //        Set<Long> cameraIdSet = page.getRecords().stream().map(AppSceneVo::getCameraId).collect(Collectors.toSet());