From 5f8823cc114b6b33df0871f88578cbd236250633 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 20 Apr 2022 10:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E7=8F=80=E5=85=89=E6=BA=90=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/controller/StreetController.java | 2 +- .../main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java index bb98997..54df49c 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java @@ -116,7 +116,7 @@ public class StreetController { Integer status = JYDamHelper.ReadStatus(equip,obj.getInteger("num"),obj.getInteger("index")); log.info("ip:{},status:{}",lightSource.getIp(),status); }else if(configProperties.getLightSource().getType() == 2){ - HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),4,0); + HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),0); } }); diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java index 1d70c82..541f20a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java @@ -64,9 +64,6 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { } else if (Cmd.B2.name().equals(cmdName)) { plcService.gyrateCamera(plcCmdInfo,Cmd.C5.name()); plcService.orderStop(plcCmdInfo); - - - } } else if (Cmd.C.name().equals(ksecInfo.getType())) { tcpLogger.info("info:{}",body); @@ -114,6 +111,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { //找到该货位的最后一张照片与现在的照片比照 //plcService.recordStock(plcCmdInfo, dataInfo.getCode(), 0, 0); } + } in.release(); return null;