新增根据摄像头经纬度查询半径内所有的摄像头
This commit is contained in:
parent
c84c322562
commit
bf10750ff5
|
@ -4,6 +4,7 @@ import com.hisense.monitormanage.dto.*;
|
||||||
import com.hisense.monitormanage.entity.*;
|
import com.hisense.monitormanage.entity.*;
|
||||||
import com.hisense.monitormanage.mapper.*;
|
import com.hisense.monitormanage.mapper.*;
|
||||||
import com.hisense.monitormanage.service.*;
|
import com.hisense.monitormanage.service.*;
|
||||||
|
import com.hisense.monitormanage.utils.LongLatUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
|
@ -207,25 +208,24 @@ public class Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据两个点查询范围内的摄像头
|
* 根据经纬度查询半径内所有的摄像头
|
||||||
* @param gpsX
|
* @param gpsX
|
||||||
* @param gpsX1
|
|
||||||
* @param gpsY
|
* @param gpsY
|
||||||
* @param gpsY1
|
* @param raidus
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping ("selectAllByGps")
|
@GetMapping ("selectAllByGps")
|
||||||
public Result selectAllByGps(String gpsX,String gpsX1,String gpsY,String gpsY1){
|
@ApiOperation("根据经纬度查询半径内所有的摄像头")
|
||||||
|
@ApiImplicitParams({
|
||||||
List<CameraChannelDto> gps = cameraChannelMapper.selectAllByGps(gpsX, gpsX1, gpsY, gpsY1);
|
@ApiImplicitParam(name = "gpsX", value = "经度", paramType = "query",required = true,dataType ="double"),
|
||||||
double gpsx = Double.parseDouble(gpsX);
|
@ApiImplicitParam(name = "gpsY", value = "纬度", paramType = "query",required = true,dataType ="double"),
|
||||||
double gpsx1 = Double.parseDouble(gpsX1);
|
@ApiImplicitParam(name = "raidus", value = "半径,米", paramType = "query",required = true,dataType ="Integer"),}
|
||||||
double gpsy = Double.parseDouble(gpsY);
|
)
|
||||||
double gpsy1 = Double.parseDouble(gpsY1);
|
public Result selectAllByGps(Double gpsX,Double gpsY,Integer raidus){
|
||||||
if (gpsx < gpsx1 || gpsy < gpsy1){
|
double[] around = LongLatUtil.getAround(gpsX, gpsY, raidus);
|
||||||
return Result.success(gps);
|
List<CameraChannel> c = cameraChannelMapper.selectAllByGps(around[0], around[2], around[1], around[3]);
|
||||||
}
|
Result success = Result.success(c);
|
||||||
return Result.error("请输入正确的精度范围");
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -44,12 +44,12 @@ public interface CameraChannelMapper extends BaseMapper<CameraChannel> {
|
||||||
"ON a.label_code = b.label_code AND b.channel_code = c.channel_code where c.`status`!= 0) m where m.label_code in (${labelCode}) ")
|
"ON a.label_code = b.label_code AND b.channel_code = c.channel_code where c.`status`!= 0) m where m.label_code in (${labelCode}) ")
|
||||||
List<ChannelLabelDto> selectLabelAndChannel(@Param("labelCode") String labelCode);
|
List<ChannelLabelDto> selectLabelAndChannel(@Param("labelCode") String labelCode);
|
||||||
|
|
||||||
@Select("select cc.channel_code,cc.gps_x,cc.gps_y from t_camera_channel cc " +
|
@Select("select cc.* from t_camera_channel cc " +
|
||||||
"where (gps_x between #{gpsX} and #{gpsX1}) and (gps_y between #{gpsY} and #{gpsY1} )")
|
"where (gps_x between #{gpsX} and #{gpsX1}) and (gps_y between #{gpsY} and #{gpsY1} )")
|
||||||
List<CameraChannelDto> selectAllByGps(@Param("gpsX") String gpsX,
|
List<CameraChannel> selectAllByGps(@Param("gpsX") Double gpsX,
|
||||||
@Param("gpsX1") String gpsX1,
|
@Param("gpsX1") Double gpsX1,
|
||||||
@Param("gpsY") String gpsY,
|
@Param("gpsY") Double gpsY,
|
||||||
@Param("gpsY1") String gpsY1);
|
@Param("gpsY1") Double gpsY1);
|
||||||
|
|
||||||
|
|
||||||
List<CameraChannelNLDto> selectNLAll(@Param("page") Integer page,@Param("pageSize") Integer pageSize);
|
List<CameraChannelNLDto> selectNLAll(@Param("page") Integer page,@Param("pageSize") Integer pageSize);
|
||||||
|
|
Loading…
Reference in New Issue