山东弘润石化 44个球机分2组,目前按照rtcServer分组

shandong-hongrunshihua
yiming 3 years ago
parent ab227a7155
commit 029eb334c8

@ -36,8 +36,8 @@ public class RealTimeController {
@GetMapping("/allCameras") @GetMapping("/allCameras")
@ApiOperation(value = "全部球机") @ApiOperation(value = "全部球机")
//@SessionHandler //@SessionHandler
public Result<List<Camera>> allCameras() { public Result<List<Camera>> allCameras(Integer index) {
return Result.success(cameraService.allCameras()); return Result.success(cameraService.allCameras(index));
} }
@GetMapping("/wallStyle") @GetMapping("/wallStyle")

@ -35,7 +35,10 @@ import java.io.IOException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.stream.Collectors;
@Service @Service
@Slf4j @Slf4j
@ -163,6 +166,15 @@ public class CameraService {
return cameraMapper.selectByMap(new HashMap<>()); 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 * IO
* *

@ -584,7 +584,7 @@ public class PlcService {
e.printStackTrace(); e.printStackTrace();
} }
cameraCapture(cameraId,false,null,path); cameraCapture(cameraId,false,null,path);
//成都蜜雪冰城 只拍照人工核对 //山东弘润石化 只拍照人工核对
OrderInfo orderInfo = new OrderInfo(street,plcCmdInfo,1,cmdCode); OrderInfo orderInfo = new OrderInfo(street,plcCmdInfo,1,cmdCode);
Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn()); Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn());

Loading…
Cancel
Save