From e84e330db08200d2128551931718733061b92036 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Tue, 19 Mar 2024 23:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E8=A1=8C=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zc/business/controller/VideoController.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/VideoController.java b/zc-business/src/main/java/com/zc/business/controller/VideoController.java index 32620133..d63f8cbe 100644 --- a/zc-business/src/main/java/com/zc/business/controller/VideoController.java +++ b/zc-business/src/main/java/com/zc/business/controller/VideoController.java @@ -337,26 +337,30 @@ public class VideoController extends BaseController { List> 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> 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<>()); }