~liusuyi/ruoyi-api.git

			@@ -2,6 +2,7 @@

			import java.util.*;

			import com.ruoyi.alarm.global.domain.GuidePoint;
			import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
			import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
			import com.ruoyi.common.utils.DateUtils;
			@@ -436,17 +437,13 @@
			if (!StringUtils.isNull(wellId)) {
			/获取井坐标/
			ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
			if(StringUtils.isNull(well))
			{
			if (StringUtils.isNull(well)) {
			log.debug("找不到井:" + well.getWellId());
			return;
			}
			log.debug("找到井:" + well.getWellId());
			double[] targetPositon = new double[3];
			targetPositon[0] = well.getLongitude();
			targetPositon[1] = well.getLatitude();
			//targetPositon[2] = well.getAltitude();
			log.debug("找到井坐标:" +well.getLongitude()+"-"+well.getLatitude()+"-"+well.getAltitude());
			GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());
			log.debug("找到井坐标:" + well.getLongitude() + "-" + well.getLatitude() + "-" + well.getAltitude());
			/获取相机坐标/
			ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
			if (StringUtils.isNull(cameras)) {
			@@ -454,16 +451,11 @@
			return;
			}
			log.debug("找到相机:" + cameraId);
			//double[] cameraPositon = new double[3];
			//cameraPositon[0] = cameras.getLongitude();
			//cameraPositon[1] = cameras.getLatitude();
			//cameraPositon[2] = cameras.getAltitude();

			/控制相机巡检/
			CameraCmd cmd = new CameraCmd();
			cmd.setCameraId(cameraId);
			cmd.setChanNo(channel);
			cmd.setTargetPosition(targetPositon);
			cmd.setTargetPosition(guidePoint);
			cmd.setOperator("sys_patrol_inspect");
			cmd.setExpired(step.getRecordingTime());//秒为单位
			boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
			@@ -502,25 +494,25 @@
			if (!StringUtils.isNull(wellId)) {
			/获取井坐标/
			ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
			double[] targetPositon = new double[2];
			targetPositon[0] = well.getLongitude();
			targetPositon[1] = well.getLatitude();
			//targetPositon[2] = well.getAltitude();
			if(StringUtils.isNull(well))
			{
			log.debug("找不到井:" + well.getWellId());
			return;
			}
			log.debug("找到井:" + well.getWellId());
			GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());
			/获取相机坐标/
			ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
			if (StringUtils.isNull(cameras)) {
			log.debug("找不到相机:" + cameraId);
			return;
			}
			double[] cameraPositon = new double[3];
			cameraPositon[0] = cameras.getLongitude();
			cameraPositon[1] = cameras.getLatitude();
			cameraPositon[2] = cameras.getAltitude();
			log.debug("找到相机:" + cameraId);
			/控制相机巡检/
			CameraCmd cmd = new CameraCmd();
			cmd.setCameraId(cameraId);
			cmd.setChanNo(channel);
			cmd.setTargetPosition(targetPositon);
			cmd.setTargetPosition(guidePoint);
			cmd.setOperator("sys_patrol_inspect");
			cmd.setExpired(step.getRecordingTime());//秒为单位
			boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
			@@ -561,7 +553,7 @@
			cmd.setChanNo(channel);
			cmd.setOperator("sys_patrol_inspect");
			cmd.setRecordBucketName("record");
			cmd.setRecordObjectName("inspectGuide/" + DateUtils.getDateYYYYMMDD()+"/"+ IdUtils.fastSimpleUUID());
			cmd.setRecordObjectName("inspectGuide/" + DateUtils.getDateYYYYMMDD() + "/" + IdUtils.fastSimpleUUID());
			String url = cameraSdkService.recordStopToMinio(cmd);
			/插入巡检记录/
			ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();