取消坐标数组改为实体类

‘liusuyi’

2024-03-11 7dfd5f52332212d2f2c111cc11147469a68b7bdb

取消坐标数组改为实体类

 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java

@@ -5,6 +5,7 @@
import com.ruoyi.alarm.access.service.IArdAlarmAccessService;
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
import com.ruoyi.alarm.global.domain.GuidePoint;
import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
@@ -119,7 +120,8 @@
                cmd.setPtzMap(ptzMap);
            }
            cmd.setRecordBucketName("record");
            cmd.setTargetPosition(guideTask.getTargetPosition());
            GuidePoint targetPosition = guideTask.getTargetPosition();
            cmd.setTargetPosition(new double[]{targetPosition.getLongitude(),targetPosition.getLatitude()});
            cmd.setRecordObjectName("alarmGuide/" + DateUtils.getDateYYYYMMDD() + "/" + guideTask.getAlarmType() + "/" + guideTask.getAlarmId());
            ICameraSdkService cameraSdkService = SpringUtils.getBean(ICameraSdkService.class);
            log.debug("开始引导");

 ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java

@@ -109,7 +109,7 @@
                        cmd.setOperator("sys_radar_follow");
                        cmd.setCameraId(camera.getId());
                        cmd.setChanNo(1);
                        cmd.setTargetPosition(guidePoint);
                        cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
                        boolean res = iCameraSdkService.guideTargetPosition(cmd);
                        if (res) {
                            log.debug("雷达追踪引导成功");

 ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java

@@ -194,8 +194,8 @@
                    point.setLatitude(Double.valueOf(parts[i + 1]));

                    pointList.add(point);

                }

                double lon = cmd.getTargetPosition().getLongitude();

                double lat = cmd.getTargetPosition().getLatitude();

                double lon = cmd.getTargetPosition()[0];

                double lat = cmd.getTargetPosition()[1];

                Point targetPoint = new Point(lon, lat);

                //判断引导目标是否在坐标集合组成的多边形内

                boolean inPolygon = GisUtil.isInPolygon(targetPoint, pointList);


 ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java

@@ -38,7 +38,7 @@
    Map<String, Double> ptzMap;

    /*目标经纬度*/
    GuidePoint targetPosition;
    double[]  targetPosition;
    /*目标井*/
    String wellId;


 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java

@@ -403,8 +403,8 @@
    @Override
    public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
        try {
            GuidePoint guidePoint = cmd.getTargetPosition();
            if (guidePoint == null) {
            double[] targetPosition = cmd.getTargetPosition();
            if (targetPosition == null) {
                log.debug("目标位置为空");
                return new TreeMap<>();
            }
@@ -419,7 +419,6 @@
                    continue;
                }
                double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
                double[] targetPosition = new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()};
                double distance = GisUtil.getDistance(targetPosition, camPosition);
                if (camera.getCamMaxVisibleDistance() == null) {
                    continue;

 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java

@@ -502,7 +502,7 @@
            return AjaxResult.error("井不存在");

        }

        GuidePoint guidePoint=new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());

        cmd.setTargetPosition(guidePoint);

        cmd.setTargetPosition(new double[]{guidePoint.getLongitude(),guidePoint.getLatitude()});



        //获取井配置的引导相机列表

        List<ArdWellGuideCamera> ardWellGuideCameraList = well.getArdWellGuideCameraList();


 ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java

@@ -455,7 +455,7 @@
                    CameraCmd cmd = new CameraCmd();

                    cmd.setCameraId(cameraId);

                    cmd.setChanNo(channel);

                    cmd.setTargetPosition(guidePoint);

                    cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});

                    cmd.setOperator("sys_patrol_inspect");

                    cmd.setExpired(step.getRecordingTime());//秒为单位

                    boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);

@@ -512,7 +512,7 @@
                    CameraCmd cmd = new CameraCmd();

                    cmd.setCameraId(cameraId);

                    cmd.setChanNo(channel);

                    cmd.setTargetPosition(guidePoint);

                    cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});

                    cmd.setOperator("sys_patrol_inspect");

                    cmd.setExpired(step.getRecordingTime());//秒为单位

                    boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);


 ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java

@@ -690,7 +690,7 @@
        try {
            ArdCameras cameras = ardCamerasService.selectArdCamerasById(cameraId);
            double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
            double[] targetPositions = new double[]{cmd.getTargetPosition().getLongitude(),cmd.getTargetPosition().getLatitude()};
            double[] targetPositions = cmd.getTargetPosition();
            double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
            int p = (int) (cameraPTZ[0] * 10);
            int t = (int) (cameraPTZ[1] * 10);

 ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java

@@ -1104,7 +1104,7 @@
        try {
            ArdCameras cameras = ardCamerasService.selectArdCamerasById(cameraId);
            double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
            double[] targetPositions = new double[]{cmd.getTargetPosition().getLongitude(), cmd.getTargetPosition().getLatitude()};
            double[] targetPositions = cmd.getTargetPosition();
            double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
            String p = String.valueOf((int) (cameraPTZ[0] * 10));
            String t = String.valueOf((int) (cameraPTZ[1] * 10));