上下行摄像头修改

zc-business/src/main/java/com/zc/business/controller/VideoController.java

@@ -337,26 +337,30 @@ public class VideoController extends BaseController {
         List<Map<String,Object>> upCameraList = datalist.stream()
                 .filter(item -> "0".equals(item.get("camOrientation")))
                 .map(item->{
-                    item.put("pileNumDistance",pileNumTransformMetre(item.get("pileNum").toString()));
+                    item.put("distance",Math.abs(pileNumTransformMetre(item.get("pileNum").toString()) - pileNumDistance));
                     return item;
                 })
-                .sorted(comparing(item -> Math.abs(Integer.parseInt(item.get("pileNumDistance").toString()) - pileNumDistance)))
+                .sorted(comparing(item -> Integer.parseInt(item.get("distance").toString())))
                 .collect(Collectors.toList());
-        if (upCameraList.size() > 0){
+        if (upCameraList.size() > 0 && Integer.parseInt(upCameraList.get(0).get("distance").toString()) < 2000){
             result.put("upCamera",upCameraList.get(0));
+        } else {
+            result.put("upCamera",new HashMap<>());
         }
 
         //下行列表
         List<Map<String,Object>> downCameraList = datalist.stream()
                 .filter(item -> "1".equals(item.get("camOrientation")))
                 .map(item->{
-                    item.put("pileNumDistance",pileNumTransformMetre(item.get("pileNum").toString()));
+                    item.put("distance",Math.abs(pileNumTransformMetre(item.get("pileNum").toString()) - pileNumDistance));
                     return item;
                 })
-                .sorted(comparing(item -> Math.abs(Integer.parseInt(item.get("pileNumDistance").toString()) - pileNumDistance)))
+                .sorted(comparing(item -> Integer.parseInt(item.get("distance").toString())))
                 .collect(Collectors.toList());
-        if (downCameraList.size() > 0){
+        if (downCameraList.size() > 0 && Integer.parseInt(downCameraList.get(0).get("distance").toString()) < 2000){
             result.put("downCamera",downCameraList.get(0));
+        } else {
+            result.put("downCamera",new HashMap<>());
         }