~liusuyi/ruoyi-api.git

			@@ -1,7 +1,5 @@
			package com.ruoyi.device.camera.service.impl;

			import java.awt.geom.Point2D;
			import java.time.LocalTime;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -14,20 +12,15 @@
			import com.ruoyi.device.camera.domain.CameraCmd;
			import com.ruoyi.device.channel.domain.ArdChannel;
			import com.ruoyi.device.channel.mapper.ArdChannelMapper;
			import com.ruoyi.device.channel.service.IArdChannelService;
			import com.ruoyi.device.hiksdk.common.GlobalVariable;
			import com.ruoyi.device.hiksdk.service.IHikClientService;
			import com.ruoyi.scheduling.domian.SchedulingParam;
			import com.ruoyi.system.domain.SysConfig;
			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.sun.org.apache.bcel.internal.generic.NEW;
			import com.ruoyi.utils.gis.Point;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.stereotype.Service;

			@@ -266,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;
			}
			@@ -316,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();
			@@ -363,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();