球机修改

web/src/main/java/com/zhehekeji/web/lib/TaskDelayExecutor.java

@@ -63,10 +63,7 @@ public class TaskDelayExecutor {
 
 
                         } else if (cameraDelayTask.getType() == 1) {
-//
-//                            if (cameraControlModule.pic(cameraDelayTask.getCameraId(), 0, cameraDelayTask.getPath())) {
-//                                log.info("拍照成功");
-//                            }
+
                             foreach(s->{
                                 return cameraControlModule.pic(cameraDelayTask.getCameraId(), 0, cameraDelayTask.getPath());
                             });

web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java

@@ -467,6 +467,9 @@ public class HikCameraControlModuleImpl implements CameraControlModule {
         int dwPTZCommand = HCNetSDK.GOTO_PRESET;
         Boolean ok = false;
         try {
+            if (CameraConnMap.getConnId(cameraId) == null){
+                log.error("toPtz camera is logout, cameraId:{}", cameraId);
+            }
 
             ok  = HikLoginModuleImpl.hcNetsdk.NET_DVR_PTZPreset_Other(CameraConnMap.getConnId(cameraId).intValue(), 1, dwPTZCommand, ptzId);
         }catch (NullPointerException e){

web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java

@@ -23,7 +23,7 @@ public class HikLoginModuleImpl implements CameraControlLoginModule {
 
 	public static HCNetSDK hcNetsdk = HCNetSDK.INSTANCE;
 
-	private static int MAX_RECONNET_TIME = 100;
+	private static final int MAX_RECONNET_TIME = -1;
 
 	private static boolean hasInit = Boolean.FALSE;
 
@@ -114,10 +114,10 @@ public class HikLoginModuleImpl implements CameraControlLoginModule {
 
 
 		int tryTimes = 0;
-		while(m_lUserID < 0 && tryTimes < MAX_RECONNET_TIME){
+		while(m_lUserID < 0 && (tryTimes < MAX_RECONNET_TIME||MAX_RECONNET_TIME<0)){
 			log.error("hik login error,ip:{},port:{},errorCode:{}",m_strIp,m_nPort,hcNetsdk.NET_DVR_GetLastError());
 			try {
-				Thread.sleep(500);
+				Thread.sleep(5000);
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}

web/src/main/java/com/zhehekeji/web/service/CronTab.java

@@ -117,12 +117,13 @@ public class CronTab {
         List<Camera> cameras = cameraMapper.selectList(new QueryWrapper<>());
         for (Camera camera : cameras){
             Boolean ok = false;
-            if(configProperties.getCameraConfig().getCameraType() == ConfigProperties.HIK_CAMERA ){
-                ok = HikLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()).intValue());
-            }else {
-                ok = JoywareLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()));
+            if( CameraConnMap.getConnId(camera.getId()) != null) {
+                if (configProperties.getCameraConfig().getCameraType() == ConfigProperties.HIK_CAMERA ) {
+                    ok = HikLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()).intValue());
+                } else {
+                    ok = JoywareLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()));
+                }
             }
-
             if(ok){
                 cameraControlModule.setCameraTime(camera.getId());
             }