From 029eb334c84a12844406dfd56981cc362fbc66e6 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Fri, 9 Dec 2022 14:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E4=B8=9C=E5=BC=98=E6=B6=A6=E7=9F=B3?=
 =?UTF-8?q?=E5=8C=96=2044=E4=B8=AA=E7=90=83=E6=9C=BA=E5=88=862=E7=BB=84?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E6=8C=89=E7=85=A7rtcServer=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhehekeji/web/controller/RealTimeController.java |  4 ++--
 .../com/zhehekeji/web/service/CameraService.java     | 12 ++++++++++++
 .../java/com/zhehekeji/web/service/PlcService.java   |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java
index 5fd8d84..9e2b126 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java
@@ -36,8 +36,8 @@ public class RealTimeController {
     @GetMapping("/allCameras")
     @ApiOperation(value = "全部球机")
     //@SessionHandler
-    public Result<List<Camera>> allCameras() {
-        return Result.success(cameraService.allCameras());
+    public Result<List<Camera>> allCameras(Integer index) {
+        return Result.success(cameraService.allCameras(index));
     }
 
     @GetMapping("/wallStyle")
diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java
index 982e811..5ac22d5 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java
@@ -35,7 +35,10 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -163,6 +166,15 @@ public class CameraService {
         return cameraMapper.selectByMap(new HashMap<>());
     }
 
+    public List<Camera> allCameras(int index){
+        List<Camera> cameras = cameraMapper.selectByMap(new HashMap<>());
+        Map<String,List<Camera>> cameraMap = cameras.stream().collect(Collectors.groupingBy(Camera::getRtcServer));
+        Set<String> stringSet = cameraMap.keySet();
+
+        String[] strings =  stringSet.toArray(new String[2]);
+        String key = strings[index];
+        return cameraMap.get(key);
+    }
     /**
      * 导入IO配置
      *
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index 0b82413..768fb0b 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -584,7 +584,7 @@ public class PlcService {
             e.printStackTrace();
         }
         cameraCapture(cameraId,false,null,path);
-        //成都蜜雪冰城 只拍照人工核对
+        //山东弘润石化 只拍照人工核对
 
         OrderInfo orderInfo = new OrderInfo(street,plcCmdInfo,1,cmdCode);
         Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn());