优化

liusuyi

2024-07-17 2ab35000026ccd58238e6a504b1b5f79f8c262c3

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

@@ -41,7 +41,7 @@
 * @Date: 2023年10月16日15:21:01

 **/

@Service

@Slf4j(topic = "SDK")

@Slf4j(topic = "sdk")

public class CameraSdkServiceImpl implements ICameraSdkService, ApplicationRunner {

    @Resource

    private IArdCamerasService ardCamerasService;

@@ -64,10 +64,10 @@
    @Override

    public void run(ApplicationArguments args) {

        try {

            log.info("初始化登录相机开始");

            ardCamerasService.resetCameraLoginId();

            List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());

            for (ArdCameras camera : ardCameras) {

                asyncLogin(camera);

            }

            ardCameras.stream().forEach(ardCamera -> asyncLogin(ardCamera));

        } catch (Exception ex) {

            log.error("初始化登录相机异常：" + ex.getMessage());

        }

@@ -586,17 +586,17 @@
                    case 1:

                        if (ardWellGuideCamera.getP1() != null) {

                            ptzMap = new HashMap<>();

                            ptzMap.put("p" , ardWellGuideCamera.getP1());

                            ptzMap.put("t" , ardWellGuideCamera.getT1());

                            ptzMap.put("z" , ardWellGuideCamera.getZ1());

                            ptzMap.put("p", ardWellGuideCamera.getP1());

                            ptzMap.put("t", ardWellGuideCamera.getT1());

                            ptzMap.put("z", ardWellGuideCamera.getZ1());

                        }

                        break;

                    case 2:

                        if (ardWellGuideCamera.getP2() != null) {

                            ptzMap = new HashMap<>();

                            ptzMap.put("p" , ardWellGuideCamera.getP2());

                            ptzMap.put("t" , ardWellGuideCamera.getT2());

                            ptzMap.put("z" , ardWellGuideCamera.getZ2());

                            ptzMap.put("p", ardWellGuideCamera.getP2());

                            ptzMap.put("t", ardWellGuideCamera.getT2());

                            ptzMap.put("z", ardWellGuideCamera.getZ2());

                        }

                        break;



@@ -624,9 +624,9 @@
        }

        //按井坐标开始引导

        if (!guideTargetPosition(cmd).get("code").equals(200)) {

            return AjaxResult.warn("井坐标引导失败" , "cameraId:" + cameraId);

            return AjaxResult.warn("井坐标引导失败", "cameraId:" + cameraId);

        }

        return AjaxResult.success("井坐标引导成功" , "cameraId:" + cameraId);

        return AjaxResult.success("井坐标引导成功", "cameraId:" + cameraId);



    }