~liusuyi/ruoyi-api.git

			@@ -13,14 +13,14 @@
			import com.ruoyi.device.channel.domain.ArdChannel;
			import com.ruoyi.device.channel.mapper.ArdChannelMapper;
			import com.ruoyi.scheduling.domian.SchedulingParam;
			import com.ruoyi.utils.gis.GisUtil;
			import com.ruoyi.utils.tools.ArdTool;
			import com.ruoyi.device.camera.domain.ArdCameras;
			import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
			import com.ruoyi.device.camera.service.IArdCamerasService;
			import com.ruoyi.common.annotation.DataScope;
			import com.ruoyi.system.mapper.SysDeptMapper;
			import com.ruoyi.utils.tools.GisTool;
			import com.ruoyi.utils.tools.Point;
			import com.ruoyi.utils.gis.Point;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.stereotype.Service;

			@@ -259,7 +259,7 @@
			continue;
			}
			double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
			double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
			double distance = GisUtil.getDistance(cmd.getTargetPosition(), camPosition);
			if (camera.getCamMaxVisibleDistance() == null) {
			continue;
			}
			@@ -309,7 +309,7 @@
			continue;
			}
			double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
			double distance = GisTool.getDistance(new double[]{longitude, latitude}, camPosition);
			double distance = GisUtil.getDistance(new double[]{longitude, latitude}, camPosition);
			if (distance <= radius) {
			/获取通道列表/
			ArdChannel ardChannel=new ArdChannel();
			@@ -356,7 +356,7 @@
			}
			/判断坐标是否在多边形范围内/
			Point camPosition=new Point(camera.getLongitude(),camera.getLatitude());
			boolean inPolygon = GisTool.isInPolygon(camPosition, partitionLocation);
			boolean inPolygon = GisUtil.isInPolygon(camPosition, partitionLocation);
			if (inPolygon) {
			/获取通道列表/
			ArdChannel ardChannel=new ArdChannel();