From 6a26b1d539576a556d0f8682af7ae4317de78c7a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 02 四月 2024 13:35:35 +0800
Subject: [PATCH] 修复相机密码脱敏导致的bug

---
 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java |  275 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 150 insertions(+), 125 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
index b5b4ad5..de2805a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.device.camera.service.impl;
 
+import com.ruoyi.alarm.global.domain.GuidePoint;
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
 import com.ruoyi.alarmpoints.well.domain.ArdWellGuideCamera;
 import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
@@ -58,12 +59,11 @@
      */
     @Override
     public void run(ApplicationArguments args) {
-
         try {
             // 浠巃rdCamerasService涓幏鍙朅rdCameras鍒楄〃
             List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
             for (ArdCameras camera : ardCameras) {
-                login(camera);
+                asyncLogin(camera);
             }
         } catch (Exception ex) {
             // 鍒濆鍖栫櫥褰曠浉鏈哄紓甯革紝璁板綍閿欒鏃ュ織
@@ -72,23 +72,35 @@
     }
 
 
-    //鐧诲綍
+    //鍚屾鐧诲綍
     @Override
-    public Boolean login(ArdCameras ardCamera) {
-        boolean result = false;
+    public AjaxResult login(ArdCameras ardCamera) {
         try {
-            if (ardCamera != null) {
-                String factory = ardCamera.getFactory();
-                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                //sdkStrategy.login(ardCamera);//鍚屾鐧诲綍
-                cameraSDK.asyncLogin(ardCamera);//寮傛鐧诲綍
-                result = true;
+            if (ardCamera == null) {
+                return AjaxResult.error("鐧诲綍鐩告満澶辫触锛岀浉鏈轰笉瀛樺湪");
             }
+            String factory = ardCamera.getFactory();
+            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+            return cameraSDK.login(ardCamera);//鍚屾鐧诲綍
         } catch (Exception ex) {
             log.error("鐧诲綍寮傚父锛�" + ex.getMessage());
-            return false;
+            return AjaxResult.error("鐧诲綍寮傚父锛�" + ex.getMessage());
         }
-        return result;
+    }
+
+    @Override
+    public AjaxResult asyncLogin(ArdCameras ardCamera) {
+        try {
+            if (ardCamera == null) {
+                return AjaxResult.error("鐧诲綍鐩告満澶辫触锛岀浉鏈轰笉瀛樺湪");
+            }
+            String factory = ardCamera.getFactory();
+            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+            return cameraSDK.asyncLogin(ardCamera);//寮傛鐧诲綍
+        } catch (Exception ex) {
+            log.error("鐧诲綍寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鐧诲綍寮傚父锛�" + ex.getMessage());
+        }
     }
 
     //娉ㄩ攢
@@ -130,94 +142,92 @@
 
     //浜戝彴鎺у埗
     @Override
-    public boolean pTZControl(CameraCmd cmd) {
-        try {
-            boolean result = false;
-            String cameraId = cmd.getCameraId();
-            ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
-            if (ardCamera != null) {
-                String factory = ardCamera.getFactory();
-                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.pTZControl(cmd);
-            }
-            return result;
-        } catch (Exception ex) {
-            log.error("ptz鎺у埗寮傚父锛�" + ex.getMessage());
-            return false;
+    public AjaxResult pTZControl(CameraCmd cmd) {
+        String cameraId = cmd.getCameraId();
+        ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
+        if (ardCamera != null) {
+            String factory = ardCamera.getFactory();
+            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+            return cameraSDK.pTZControl(cmd);
+        } else {
+            return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
         }
     }
 
     //璁剧疆鑱氱劍鍊�
     @Override
-    public boolean setFocusPos(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult setFocusPos(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.setFocusPos(cmd);
+                return cameraSDK.setFocusPos(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("璁剧疆鑱氱劍鍊煎紓甯革細" + ex.getMessage());
-
+            return AjaxResult.error("璁剧疆鑱氱劍鍊煎紓甯革細" + ex.getMessage());
         }
-        return result;
     }
 
     //鑾峰彇鑱氱劍鍊�
     @Override
-    public int getFocusPos(CameraCmd cmd) {
-        int result = 0;
+    public AjaxResult getFocusPos(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.getFocusPos(cmd);
+                return cameraSDK.getFocusPos(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鑾峰彇鑱氱劍鍊煎紓甯革細" + ex.getMessage());
+            return AjaxResult.error("鑾峰彇鑱氱劍鍊煎紓甯�:" + ex.getMessage());
         }
-        return result;
     }
 
     //璁剧疆棰勭疆浣�
     @Override
-    public boolean setPreset(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult setPreset(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.setPreset(cmd);
+                return cameraSDK.setPreset(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("璁剧疆棰勭疆浣嶅紓甯革細" + ex.getMessage());
+            return AjaxResult.error("璁剧疆棰勭疆浣嶅紓甯�" + ex.getMessage());
         }
-        return result;
     }
 
     //璋冪敤棰勭疆浣�
     @Override
-    public boolean gotoPreset(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult gotoPreset(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.gotoPreset(cmd);
+                return cameraSDK.gotoPreset(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("璋冪敤棰勭疆浣嶅紓甯革細" + ex.getMessage());
+            return AjaxResult.error("璋冪敤棰勭疆浣嶅紓甯�" + ex.getMessage());
         }
-        return result;
     }
 
     //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
@@ -240,128 +250,138 @@
 
     //閫忛浘寮�鍏�
     @Override
-    public boolean controlDefogcfg(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult controlDefogcfg(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.controlDefogcfg(cmd);
+                return cameraSDK.controlDefogcfg(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鎿嶆帶閫忛浘寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鎿嶆帶閫忛浘寮傚父" + ex.getMessage());
         }
-        return result;
     }
 
     //绾㈠寮�鍏�
     @Override
-    public boolean controlInfrarecfg(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult controlInfrarecfg(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.controlInfrarecfg(cmd);
+                return cameraSDK.controlInfrarecfg(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鎿嶆帶绾㈠寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鎿嶆帶绾㈠寮傚父:" + ex.getMessage());
         }
-        return result;
     }
 
     //鎵嬪姩/鑷姩鑱氱劍
     @Override
-    public boolean controlFocusMode(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult controlFocusMode(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.controlFocusMode(cmd);
+                return cameraSDK.controlFocusMode(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鎿嶆帶鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鎿嶆帶鑱氱劍妯″紡寮傚父:" + ex.getMessage());
         }
-        return result;
     }
 
     //鑾峰彇鑱氱劍妯″紡
     @Override
-    public String getFocusMode(CameraCmd cmd) {
-        String result = "";
+    public AjaxResult getFocusMode(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.getFocusMode(cmd);
+                return cameraSDK.getFocusMode(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鑾峰彇鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鑾峰彇鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
         }
-        return result;
     }
 
     //浜戝彴鍔犵儹
     @Override
-    public boolean controlPTHeateRpwron(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult controlPTHeateRpwron(CameraCmd cmd) {
+
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.controlPTHeateRpwron(cmd);
+                return cameraSDK.controlPTHeateRpwron(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鎿嶆帶浜戝彴鍔犵儹寮傚父:" + ex.getMessage());
         }
-        return result;
+
     }
 
     //闀滃ご鍔犵儹
     @Override
-    public boolean controlCameraDeicing(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult controlCameraDeicing(CameraCmd cmd) {
+
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.controlCameraDeicing(cmd);
+                return cameraSDK.controlCameraDeicing(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
         }
-        return result;
     }
 
     //鑾峰彇浜戝彴閿佸畾淇℃伅
     @Override
-    public int getPTZLockInfo(CameraCmd cmd) {
-        int result = 99;
+    public AjaxResult getPTZLockInfo(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.getPTZLockInfo(cmd);
+                return cameraSDK.getPTZLockInfo(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
-            log.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父锛�" + ex.getMessage());
+            log.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父:" + ex.getMessage());
+            return AjaxResult.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父:" + ex.getMessage());
         }
-        return result;
     }
 
     @Override
@@ -392,7 +412,7 @@
 
     //鑾峰彇ptz
     @Override
-    public Map<String, Object> getPtz(CameraCmd cmd) {
+    public AjaxResult getPtz(CameraCmd cmd) {
         Map<String, Object> map = new HashMap<>();
         try {
             String cameraId = cmd.getCameraId();
@@ -402,96 +422,98 @@
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
                 String gdtype = ardCamera.getGdtype();
                 if (gdtype.equals("1")) {
-                    map = cameraSDK.getPtz(cmd);
+                    return cameraSDK.getPtzHigh(cmd);
+                } else {
+                    return cameraSDK.getPtz(cmd);
                 }
-                else
-                {
-                    map = cameraSDK.getPtz1(cmd);
-                }
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鑾峰彇ptz寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鑾峰彇ptz寮傚父锛�" + ex.getMessage());
         }
-        return map;
     }
 
     //鑾峰彇ptz鑼冨洿
     @Override
-    public Map<String, Object> getPtzScope(CameraCmd cmd) {
-        Map<String, Object> map = new HashMap<>();
+    public AjaxResult getPtzScope(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                map = cameraSDK.getPtzScope(cmd);
+                return cameraSDK.getPtzScope(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("鑾峰彇ptz鑼冨洿寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鑾峰彇ptz鑼冨洿寮傚父锛�" + ex.getMessage());
         }
-        return map;
     }
 
     //璁剧疆ptz
     @Override
-    public boolean setPtz(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult setPtz(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
-            if (ardCamera != null) {
-                String factory = ardCamera.getFactory();
-                CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                String gdtype = ardCamera.getGdtype();
-                if (gdtype.equals("1")) {
-                    //澶у厜鐢典娇鐢ㄩ珮绮惧害ptz璁剧疆
-                    result = cameraSDK.setPtz(cmd);
-                } else {
-                    result = cameraSDK.setPtz1(cmd);
-                }
-
+            if (ardCamera == null) {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
+            CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(ardCamera.getFactory());
+            String gdtype = ardCamera.getGdtype();
+            if (gdtype.equals("1")) {
+                //澶у厜鐢典娇鐢ㄩ珮绮惧害ptz璁剧疆
+                return cameraSDK.setPtzHigh(cmd);
+            } else {
+                return cameraSDK.setPtz(cmd);
+            }
+
         } catch (Exception ex) {
             log.error("璁剧疆ptz寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("璁剧疆ptz寮傚父:" + ex.getMessage());
         }
-        return result;
     }
 
     //璁剧疆闆舵柟浣嶈
     @Override
-    public boolean setZeroPtz(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult setZeroPtz(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.setZeroPtz(cmd);
+                return cameraSDK.setZeroPtz(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
             log.error("璁剧疆闆舵柟浣嶈寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("璁剧疆闆舵柟浣嶈寮傚父锛�" + ex.getMessage());
         }
-        return result;
     }
 
     //寮曞鎸囧悜鐩爣
     @Override
-    public boolean guideTargetPosition(CameraCmd cmd) {
-        boolean result = false;
+    public AjaxResult guideTargetPosition(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                result = cameraSDK.guideTargetPosition(cmd);
+                return cameraSDK.guideTargetPosition(cmd);
+            } else {
+                return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
             }
         } catch (Exception ex) {
-            log.error("寮曞鎸囧悜鐩爣寮傚父锛�" + ex.getMessage());
+            log.error("寮曞鎸囧悜鐩爣寮傚父:" + ex.getMessage());
+            return AjaxResult.error("寮曞鎸囧悜鐩爣寮傚父:" + ex.getMessage());
         }
-        return result;
     }
 
     //寮曞鎸囧悜浜�
@@ -507,7 +529,8 @@
         if (well == null) {
             return AjaxResult.error("浜曚笉瀛樺湪");
         }
-        cmd.setTargetPosition(new double[]{well.getLongitude(), well.getLatitude()});
+        GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());
+        cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
 
         //鑾峰彇浜曢厤缃殑寮曞鐩告満鍒楄〃
         List<ArdWellGuideCamera> ardWellGuideCameraList = well.getArdWellGuideCameraList();
@@ -529,8 +552,7 @@
             cmd.setCameraId(cameraId);
             //鑾峰彇鏈�杩戠浉鏈虹殑瀵硅薄
             Optional<ArdWellGuideCamera> first = ardWellGuideCameraList.stream().filter(s -> s.getCameraId().equals(cameraId)).findFirst();
-            if(first.isPresent())
-            {
+            if (first.isPresent()) {
                 ArdWellGuideCamera ardWellGuideCamera = first.get();
                 Map<String, Double> ptzMap = null;
                 //閫氳繃閫氶亾鑾峰彇棰勭疆浣�
@@ -557,11 +579,7 @@
                 if (ptzMap != null) {
                     //浣跨敤ptz寮曞
                     cmd.setPtzMap(ptzMap);
-                    boolean res = setPtz(cmd);
-                    if (!res) {
-                        return AjaxResult.error("ptz寮曞澶辫触", "cameraId:" + cameraId);
-                    }
-                    return AjaxResult.success("ptz寮曞鎴愬姛", "cameraId:" + cameraId);
+                    return setPtz(cmd);
                 }
             }
 
@@ -579,7 +597,7 @@
             return AjaxResult.error("浜曚綅缃睘浜庣浉鏈虹姝㈠紩瀵煎尯鍩�");
         }
         //鎸変簳鍧愭爣寮�濮嬪紩瀵�
-        if (!guideTargetPosition(cmd)) {
+        if (!guideTargetPosition(cmd).get("code").equals(200)) {
             return AjaxResult.error("浜曞潗鏍囧紩瀵煎け璐�", "cameraId:" + cameraId);
         }
         return AjaxResult.success("浜曞潗鏍囧紩瀵兼垚鍔�", "cameraId:" + cameraId);
@@ -679,14 +697,17 @@
      */
     @Override
     @SdkOperate
-    public boolean controlLock(CameraCmd cmd) {
+    public AjaxResult controlLock(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();//鐢宠閿佺殑鐩告満
         ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
+        if (ardCameras == null) {
+            return AjaxResult.error("璁惧鏈櫥褰�");
+        }
         Date now = new Date();
         now.setTime(now.getTime() + cmd.getExpired() * 1000);
         ardCameras.setOperatorExpired(now);//璁剧疆褰撳墠杩囨湡鏃堕棿
         ardCamerasService.updateArdCameras(ardCameras);
-        return true;
+        return AjaxResult.success("鎿嶆帶閿佸畾鎴愬姛");
     }
 
     /**
@@ -698,10 +719,13 @@
      * @淇敼浜哄拰鍏跺畠淇℃伅
      */
     @Override
-    public boolean controlUnLock(CameraCmd cmd) {
+    public AjaxResult controlUnLock(CameraCmd cmd) {
         String cameraId = cmd.getCameraId();//鐢宠瑙ｉ攣鐨勭浉鏈�
         String operator = cmd.getOperator();//鐢宠鑰�
         ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
+        if (ardCameras == null) {
+            return AjaxResult.error("璁惧鏈櫥褰�");
+        }
         if (ardCameras.getOperatorId().equals(operator)) {
             //濡傛灉瑙ｉ攣鐩告満鐨勫綋鍓嶇敤鎴锋槸鐢宠鑰咃紝鍒欐竻绌鸿鐩告満鐨勮繃鏈熸椂闂�
             ardCameras.setOperatorExpired(null);
@@ -710,7 +734,8 @@
                 log.debug(cameraId + "--瑙ｉ攣鎴愬姛");
             }
         }
-        return true;
+
+        return AjaxResult.success("鎿嶆帶瑙ｉ攣鎴愬姛");
     }
 
     //褰曞儚
@@ -788,20 +813,20 @@
 
     //鑾峰彇鐩告満鏋惰鍙傛暟
     @Override
-    public Map<String, Object> getGisInfo(CameraCmd cmd) {
-        Map<String, Object> map = new HashMap<>();
+    public AjaxResult getGisInfo(CameraCmd cmd) {
         try {
             String cameraId = cmd.getCameraId();
             ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
             if (ardCamera != null) {
                 String factory = ardCamera.getFactory();
                 CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
-                map = cameraSDK.getGisInfo(cmd);
+                return cameraSDK.getGisInfo(cmd);
+            } else {
+                return AjaxResult.error("鐩告満涓嶅瓨鍦�");
             }
         } catch (Exception ex) {
             log.error("鑾峰彇鐩告満鏋惰鍙傛暟寮傚父锛�" + ex.getMessage());
+            return AjaxResult.error("鑾峰彇鐩告満鏋惰鍙傛暟寮傚父锛�" + ex.getMessage());
         }
-        return map;
     }
-
 }

--
Gitblit v1.9.3