From eee6f62a797bc341e59fbb73a990795c64874a09 Mon Sep 17 00:00:00 2001
From: qiushui <wang.yiming@hzleaper.com>
Date: Mon, 11 Apr 2022 15:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java  | 3 +--
 web/src/main/java/com/zhehekeji/web/service/CameraService.java | 1 +
 web/src/main/java/com/zhehekeji/web/service/TestService.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java
index a37e232..4e4aca3 100644
--- a/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java
+++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java
@@ -15,8 +15,7 @@ public class CallBack {
         @Override
         public void invoke(NetSDKLib.LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser) {
             Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginID);
-            log.error("球机：{}掉线",cameraId);
-            CameraConnMap.disConn(cameraId);
+            log.error("cameraId：{}disConnect",cameraId);
         }
     }
 
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 5ca13ac..b75cbcf 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java
@@ -270,6 +270,7 @@ public class CameraService {
 
         NetSDKLib.LLong lLong = cameraControlLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword());
         if(lLong != null){
+            log.info("camera login success,cameraId:{},ip:{}",camera.getId(),camera.getIp());
             CameraConnMap.conn(camera.getId(),lLong);
         }
     }
diff --git a/web/src/main/java/com/zhehekeji/web/service/TestService.java b/web/src/main/java/com/zhehekeji/web/service/TestService.java
index b2b5ebe..25c22f1 100644
--- a/web/src/main/java/com/zhehekeji/web/service/TestService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/TestService.java
@@ -34,7 +34,7 @@ public class TestService {
             }
 
             for(int i = 1;i<=row;i++){
-                for(int j = 0; j<= column;j++){
+                for(int j = 1; j<= column;j++){
                     String code = "3224112150069";
                     String taskId = i +"-"+ j+"-"+LocalDateTime.now().format(DateTimeFormatter.ofPattern("hhmmss"));
                     PlcCmdInfo plcCmdInfo = new PlcCmdInfo(street.getPlcId(),taskId,1,leftRight,j,i,1,1,1,1,1,1);