diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java index 2816266..73154a0 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java @@ -99,7 +99,7 @@ public class CameraController { @ApiOperation(value = "球机IO配置") public Result ptz(@RequestBody CameraIOPtz req) { validatorUtil.validate(req); - return Result.success(cameraService.ptz(req.getCameraIOId(),req.getCameraId(),req.getName(),req.getType())); + return Result.success(cameraService.ptz(req.getCameraIOId(),req.getCameraId(),req.getName(),req.getType(),req.getCode())); } @PostMapping("/io/toPtz") diff --git a/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraIOPtz.java b/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraIOPtz.java index 21c17f3..186e234 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraIOPtz.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/camera/CameraIOPtz.java @@ -22,4 +22,6 @@ public class CameraIOPtz { @ApiModelProperty(" 0: 位置 1:对焦 2:倍数 3:光圈") private Integer type; + + private String code; } 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 82b80d8..e705faf 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -151,7 +151,7 @@ public class CameraService { * @param IOId 存在修改,不存在 新增 * @param cameraId */ - public synchronized Integer ptz(Integer IOId, Integer cameraId, String name,Integer type) { + public synchronized Integer ptz(Integer IOId, Integer cameraId, String name,Integer type,String code) { Camera camera = cameraMapper.selectById(cameraId); Assert.notNull(camera, "球机不存在"); Integer cameraPtzId = camera.getPtzId() == null ? 0 : camera.getPtzId(); @@ -164,6 +164,7 @@ public class CameraService { cameraIO.setUpdateTime(LocalDateTime.now()); cameraIO.setName(name); cameraIO.setPtzId(ptzId); + cameraIO.setCode(code); conver(cameraIO,type); ioMapper.insert(cameraIO); camera.setPtzId(ptzId); diff --git a/web/src/main/java/com/zhehekeji/web/service/NettyClient.java b/web/src/main/java/com/zhehekeji/web/service/NettyClient.java index 90ab614..d485c44 100644 --- a/web/src/main/java/com/zhehekeji/web/service/NettyClient.java +++ b/web/src/main/java/com/zhehekeji/web/service/NettyClient.java @@ -20,7 +20,7 @@ public class NettyClient { @Resource private PlcService plcService; - public void createClient(Street street){ + public void createClient(Street street) throws InterruptedException { if(StringUtils.isEmpty(street.getPlcIp()) || street.getPlcPort() == null){ return; } @@ -33,11 +33,7 @@ public class NettyClient { SendHeart sendHeart = new SendHeart(street.getPlcId()); client.handler(new HeartNettyClientFilter(street.getId(),sendHeart,plcService)); // 连接服务端 - try { client.connect(street.getPlcIp(), street.getPlcPort()).sync().channel(); - } catch (InterruptedException e) { - log.error("plc连接异常:{}",e); - } } public static void close() { diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetService.java b/web/src/main/java/com/zhehekeji/web/service/StreetService.java index 0e97b88..df7b840 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StreetService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StreetService.java @@ -44,7 +44,11 @@ public class StreetService { } StreetConn.init(street.getId(),street.getPlcId()); //连接 - nettyClient.createClient(street); + try { + nettyClient.createClient(street); + } catch (InterruptedException e) { + log.error("新增巷道,连接异常"); + } return street.getId(); }