From 36de05a5caf9050c49b15a9ef9487f35518b208a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 08 十一月 2023 11:06:45 +0800
Subject: [PATCH] sdk切换更改为工厂模式
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 114 ++++++++++++++++++++++++++++----------------------------
1 files changed, 57 insertions(+), 57 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 bd6a533..ef9e57d 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
@@ -7,8 +7,8 @@
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.camera.service.ICameraSdkService;
-import com.ruoyi.device.camera.strategy.SdkStrategy;
-import com.ruoyi.device.camera.strategy.SdkStrategyFactory;
+import com.ruoyi.device.camera.factory.CameraSDK;
+import com.ruoyi.device.camera.factory.CameraSDKFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -34,7 +34,7 @@
@Resource
private RedisCache redisCache;
@Resource
- private SdkStrategyFactory sdkStrategyFactory;
+ private CameraSDKFactory cameraSDKFactory;
/**
* 鍚姩绾跨▼鏂规硶锛岀敤浜庢墽琛屽垵濮嬪寲鐧诲綍鐩告満鐨勯�昏緫
@@ -64,9 +64,9 @@
try {
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
//sdkStrategy.login(ardCamera);//鍚屾鐧诲綍
- sdkStrategy.asyncLogin(ardCamera);//寮傛鐧诲綍
+ cameraSDK.asyncLogin(ardCamera);//寮傛鐧诲綍
result=true;
}
} catch (Exception ex) {
@@ -84,8 +84,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.logout(cameraId);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.logout(cameraId);
}
} catch (Exception ex) {
log.error("娉ㄩ攢寮傚父锛�" + ex.getMessage());
@@ -103,8 +103,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- onLine = sdkStrategy.isOnLine(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ onLine = cameraSDK.isOnLine(cmd);
}
return onLine;
} catch (Exception ex) {
@@ -123,8 +123,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.pTZControl(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.pTZControl(cmd);
}
return result;
} catch (Exception ex) {
@@ -142,8 +142,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.setFocusPos(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.setFocusPos(cmd);
}
} catch (Exception ex) {
log.error("璁剧疆鑱氱劍鍊煎紓甯革細" + ex.getMessage());
@@ -161,8 +161,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.getFocusPos(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.getFocusPos(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍鍊煎紓甯革細" + ex.getMessage());
@@ -180,8 +180,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.setPreset(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.setPreset(cmd);
}
} catch (Exception ex) {
log.error("璁剧疆棰勭疆浣嶅紓甯革細" + ex.getMessage());
@@ -199,8 +199,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.gotoPreset(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.gotoPreset(cmd);
}
} catch (Exception ex) {
log.error("璋冪敤棰勭疆浣嶅紓甯革細" + ex.getMessage());
@@ -217,8 +217,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- map = sdkStrategy.getVideoCompressionCfg(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getVideoCompressionCfg(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇鐮佹祦鍘嬬缉鍙傛暟寮傚父锛�" + ex.getMessage());
@@ -235,8 +235,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlDefogcfg(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlDefogcfg(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶閫忛浘寮傚父锛�" + ex.getMessage());
@@ -253,8 +253,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlInfrarecfg(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlInfrarecfg(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶绾㈠寮傚父锛�" + ex.getMessage());
@@ -271,8 +271,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlFocusMode(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlFocusMode(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
@@ -289,8 +289,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.getFocusMode(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.getFocusMode(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
@@ -307,8 +307,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlPTHeateRpwron(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlPTHeateRpwron(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
@@ -325,8 +325,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlCameraDeicing(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlCameraDeicing(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
@@ -343,8 +343,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.getPTZLockInfo(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.getPTZLockInfo(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父锛�" + ex.getMessage());
@@ -370,8 +370,8 @@
if (ardCamera != null) {
//鑾峰彇鎽勫儚澶村伐鍘�
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- url = sdkStrategy.picCutCate(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ url = cameraSDK.picCutCate(cmd);
}
} catch (Exception ex) {
log.error("鎶撳浘寮傚父锛�" + ex.getMessage());
@@ -388,8 +388,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- map = sdkStrategy.getPtz(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getPtz(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇ptz寮傚父锛�" + ex.getMessage());
@@ -406,8 +406,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- map = sdkStrategy.getPtzScope(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getPtzScope(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇ptz鑼冨洿寮傚父锛�" + ex.getMessage());
@@ -425,8 +425,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.setPtz(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.setPtz(cmd);
}
} catch (Exception ex) {
log.error("璁剧疆ptz寮傚父锛�" + ex.getMessage());
@@ -444,8 +444,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.setZeroPtz(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.setZeroPtz(cmd);
}
} catch (Exception ex) {
log.error("璁剧疆闆舵柟浣嶈寮傚父锛�" + ex.getMessage());
@@ -463,8 +463,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.guideTargetPosition(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.guideTargetPosition(cmd);
}
} catch (Exception ex) {
log.error("寮曞鎸囧悜鐩爣寮傚父锛�" + ex.getMessage());
@@ -527,8 +527,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- url = sdkStrategy.record(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ url = cameraSDK.record(cmd);
}
} catch (Exception ex) {
log.error("褰曞儚寮傚父锛�" + ex.getMessage());
@@ -545,8 +545,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.recordStart(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.recordStart(cmd);
}
} catch (Exception ex) {
log.error("寮�濮嬪綍鍍忓紓甯革細" + ex.getMessage());
@@ -563,8 +563,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- url = sdkStrategy.recordStopToMinio(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ url = cameraSDK.recordStopToMinio(cmd);
}
} catch (Exception ex) {
log.error("鍋滄褰曞儚寮傚父锛�" + ex.getMessage());
@@ -581,8 +581,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.recordStopNotToMinio(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.recordStopNotToMinio(cmd);
}
} catch (Exception ex) {
log.error("鍋滄褰曞儚寮傚父锛�" + ex.getMessage());
@@ -599,8 +599,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- map = sdkStrategy.getGisInfo(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getGisInfo(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇鐩告満鏋惰鍙傛暟寮傚父锛�" + ex.getMessage());
--
Gitblit v1.9.3