~liusuyi/ruoyi-api.git

			@@ -8,6 +8,7 @@
			import com.ruoyi.device.camera.domain.ArdCameras;
			import com.ruoyi.device.camera.domain.CameraCmd;
			import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
			import com.ruoyi.device.camera.service.ICameraSdkService;
			import com.ruoyi.device.hiksdk.service.IHikClientService;
			import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
			import com.ruoyi.inspect.mapper.ArdVideoInspectRecordMapper;
			@@ -44,7 +45,7 @@
			@Resource
			private ArdCamerasMapper ardCamerasMapper;
			@Resource
			private IHikClientService hikClientService;
			private ICameraSdkService cameraSdkService;
			@Resource
			private ArdCamerasMapper camerasMapper;

			@@ -455,10 +456,10 @@
			cmd.setTargetPosition(targetPositon);
			cmd.setOperator("sys_patrol_inspect");
			cmd.setExpired(step.getRecordingTime() * 60);
			boolean setTargetPosition = hikClientService.guideTargetPosition(cmd);
			boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
			if (setTargetPosition) {
			/控制相机巡检成功，开始录像/
			hikClientService.recordStart(cmd);
			cameraSdkService.recordStart(cmd);
			} else {
			/控制失败,当前步骤启动时间置null/
			ardVideoInspectTask.setCurrentStepStartTime("");
			@@ -513,7 +514,7 @@
			cmd.setTargetPosition(targetPositon);
			cmd.setOperator("sys_patrol_inspect");
			cmd.setExpired(step.getRecordingTime() * 60);
			boolean setTargetPosition = hikClientService.guideTargetPosition(cmd);
			boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
			if (!setTargetPosition) {
			/控制失败,当前步骤启动时间置null/
			ardVideoInspectTask.setCurrentStepStartTime("");
			@@ -552,7 +553,7 @@
			cmd.setOperator("sys_patrol_inspect");
			cmd.setRecordBucketName("record");
			cmd.setRecordObjectName("inspect_" + IdUtils.fastSimpleUUID());
			String url = hikClientService.recordStopToMinio(cmd);
			String url = cameraSdkService.recordStopToMinio(cmd);
			/插入巡检记录/
			ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();
			ardVideoInspectRecord.setStepId(step.getId());