~liusuyi/ruoyi-api.git

			@@ -130,20 +130,15 @@

			//云台控制
			@Override
			public boolean pTZControl(CameraCmd cmd) {
			try {
			boolean result = false;
			String cameraId = cmd.getCameraId();
			ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
			if (ardCamera != null) {
			String factory = ardCamera.getFactory();
			CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
			result = cameraSDK.pTZControl(cmd);
			}
			return result;
			} catch (Exception ex) {
			log.error("ptz控制异常：" + ex.getMessage());
			return false;
			public AjaxResult pTZControl(CameraCmd cmd) {
			String cameraId = cmd.getCameraId();
			ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
			if (ardCamera != null) {
			String factory = ardCamera.getFactory();
			CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
			return cameraSDK.pTZControl(cmd);
			} else {
			return AjaxResult.error("摄像头不存在");
			}
			}

			@@ -403,9 +398,7 @@
			String gdtype = ardCamera.getGdtype();
			if (gdtype.equals("1")) {
			map = cameraSDK.getPtz(cmd);
			}
			else
			{
			} else {
			map = cameraSDK.getPtz1(cmd);
			}
			}
			@@ -435,27 +428,27 @@

			//设置ptz
			@Override
			public boolean setPtz(CameraCmd cmd) {
			boolean result = false;
			public AjaxResult setPtz(CameraCmd cmd) {
			try {
			String cameraId = cmd.getCameraId();
			ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
			if (ardCamera != null) {
			String factory = ardCamera.getFactory();
			CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
			String gdtype = ardCamera.getGdtype();
			if (gdtype.equals("1")) {
			//大光电使用高精度ptz设置
			result = cameraSDK.setPtz(cmd);
			} else {
			result = cameraSDK.setPtz1(cmd);
			}

			if (ardCamera == null) {
			return AjaxResult.error("摄像头不存在");
			}
			CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(ardCamera.getFactory());
			String gdtype = ardCamera.getGdtype();
			if (gdtype.equals("1")) {
			//大光电使用高精度ptz设置
			return cameraSDK.setPtz(cmd);
			} else {
			return cameraSDK.setPtz1(cmd);
			}

			} catch (Exception ex) {
			log.error("设置ptz异常：" + ex.getMessage());
			AjaxResult.error("设置ptz异常:" + ex.getMessage());
			}
			return result;
			return AjaxResult.success();
			}

			//设置零方位角
			@@ -529,8 +522,7 @@
			cmd.setCameraId(cameraId);
			//获取最近相机的对象
			Optional<ArdWellGuideCamera> first = ardWellGuideCameraList.stream().filter(s -> s.getCameraId().equals(cameraId)).findFirst();
			if(first.isPresent())
			{
			if (first.isPresent()) {
			ArdWellGuideCamera ardWellGuideCamera = first.get();
			Map<String, Double> ptzMap = null;
			//通过通道获取预置位
			@@ -557,11 +549,7 @@
			if (ptzMap != null) {
			//使用ptz引导
			cmd.setPtzMap(ptzMap);
			boolean res = setPtz(cmd);
			if (!res) {
			return AjaxResult.error("ptz引导失败", "cameraId:" + cameraId);
			}
			return AjaxResult.success("ptz引导成功", "cameraId:" + cameraId);
			return setPtz(cmd);
			}
			}