From e6ed5230c8cdebc3effd2512c587ceb36b61687b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 22 四月 2024 14:02:03 +0800
Subject: [PATCH] sdk返回前端信息error改为warn
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 267 +++++++++++++----------------
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 119 ++++++------
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/lib/ToolKits.java | 5
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 96 +++++-----
4 files changed, 231 insertions(+), 256 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 e3aac54..f379d10 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
@@ -61,24 +61,21 @@
@Override
public void run(ApplicationArguments args) {
try {
- // 浠巃rdCamerasService涓幏鍙朅rdCameras鍒楄〃
List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
for (ArdCameras camera : ardCameras) {
asyncLogin(camera);
}
} catch (Exception ex) {
- // 鍒濆鍖栫櫥褰曠浉鏈哄紓甯革紝璁板綍閿欒鏃ュ織
log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
}
}
-
//鍚屾鐧诲綍
@Override
public AjaxResult login(ArdCameras ardCamera) {
try {
if (ardCamera == null) {
- return AjaxResult.error("鐧诲綍鐩告満澶辫触锛岀浉鏈轰笉瀛樺湪");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
String factory = ardCamera.getFactory();
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
@@ -93,7 +90,7 @@
public AjaxResult asyncLogin(ArdCameras ardCamera) {
try {
if (ardCamera == null) {
- return AjaxResult.error("鐧诲綍鐩告満澶辫触锛岀浉鏈轰笉瀛樺湪");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
String factory = ardCamera.getFactory();
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
@@ -146,13 +143,12 @@
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("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.pTZControl(cmd);
}
//璁剧疆鑱氱劍鍊�
@@ -161,13 +157,12 @@
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);
- return cameraSDK.setFocusPos(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.setFocusPos(cmd);
} catch (Exception ex) {
log.error("璁剧疆鑱氱劍鍊煎紓甯革細" + ex.getMessage());
return AjaxResult.error("璁剧疆鑱氱劍鍊煎紓甯革細" + ex.getMessage());
@@ -180,13 +175,12 @@
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);
- return cameraSDK.getFocusPos(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getFocusPos(cmd);
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍鍊煎紓甯革細" + ex.getMessage());
return AjaxResult.error("鑾峰彇鑱氱劍鍊煎紓甯�:" + ex.getMessage());
@@ -199,13 +193,12 @@
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);
- return cameraSDK.setPreset(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.setPreset(cmd);
} catch (Exception ex) {
log.error("璁剧疆棰勭疆浣嶅紓甯革細" + ex.getMessage());
return AjaxResult.error("璁剧疆棰勭疆浣嶅紓甯�" + ex.getMessage());
@@ -218,13 +211,12 @@
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);
- return cameraSDK.gotoPreset(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.gotoPreset(cmd);
} catch (Exception ex) {
log.error("璋冪敤棰勭疆浣嶅紓甯革細" + ex.getMessage());
return AjaxResult.error("璋冪敤棰勭疆浣嶅紓甯�" + ex.getMessage());
@@ -238,11 +230,12 @@
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.getVideoCompressionCfg(cmd);
+ if (ardCamera == null) {
+ return new HashMap<>();
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getVideoCompressionCfg(cmd);
} catch (Exception ex) {
log.error("鑾峰彇鐮佹祦鍘嬬缉鍙傛暟寮傚父锛�" + ex.getMessage());
}
@@ -255,13 +248,12 @@
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);
- return cameraSDK.controlDefogcfg(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlDefogcfg(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶閫忛浘寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶閫忛浘寮傚父" + ex.getMessage());
@@ -274,13 +266,12 @@
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);
- return cameraSDK.controlInfrarecfg(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlInfrarecfg(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶绾㈠寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶绾㈠寮傚父:" + ex.getMessage());
@@ -293,13 +284,12 @@
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);
- return cameraSDK.controlFocusMode(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlFocusMode(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶鑱氱劍妯″紡寮傚父:" + ex.getMessage());
@@ -312,13 +302,12 @@
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);
- return cameraSDK.getFocusMode(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getFocusMode(cmd);
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鑾峰彇鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
@@ -328,38 +317,33 @@
//浜戝彴鍔犵儹
@Override
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);
- return cameraSDK.controlPTHeateRpwron(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlPTHeateRpwron(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶浜戝彴鍔犵儹寮傚父:" + ex.getMessage());
}
-
}
//闀滃ご鍔犵儹
@Override
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);
- return cameraSDK.controlCameraDeicing(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlCameraDeicing(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
@@ -372,13 +356,12 @@
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);
- return cameraSDK.getPTZLockInfo(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getPTZLockInfo(cmd);
} catch (Exception ex) {
log.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父:" + ex.getMessage());
return AjaxResult.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父:" + ex.getMessage());
@@ -391,15 +374,12 @@
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);
- return cameraSDK.localCapture(cmd);
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
- else
- {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
- }
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.localCapture(cmd);
} catch (Exception ex) {
log.error("鎵嬪姩鎶撳浘寮傚父:" + ex.getMessage());
return AjaxResult.error("鎵嬪姩鎶撳浘寮傚父:" + ex.getMessage());
@@ -434,17 +414,16 @@
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")) {
- return cameraSDK.getPtzHigh(cmd);
- } else {
- return cameraSDK.getPtz(cmd);
- }
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
+ }
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ String gdtype = ardCamera.getGdtype();
+ if (gdtype.equals("1")) {
+ return cameraSDK.getPtzHigh(cmd);
} else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ return cameraSDK.getPtz(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇ptz寮傚父锛�" + ex.getMessage());
@@ -458,13 +437,12 @@
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);
- return cameraSDK.getPtzScope(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getPtzScope(cmd);
} catch (Exception ex) {
log.error("鑾峰彇ptz鑼冨洿寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鑾峰彇ptz鑼冨洿寮傚父锛�" + ex.getMessage());
@@ -478,7 +456,7 @@
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera == null) {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(ardCamera.getFactory());
String gdtype = ardCamera.getGdtype();
@@ -488,7 +466,6 @@
} else {
return cameraSDK.setPtz(cmd);
}
-
} catch (Exception ex) {
log.error("璁剧疆ptz寮傚父锛�" + ex.getMessage());
return AjaxResult.error("璁剧疆ptz寮傚父:" + ex.getMessage());
@@ -501,13 +478,12 @@
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);
- return cameraSDK.setZeroPtz(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.setZeroPtz(cmd);
} catch (Exception ex) {
log.error("璁剧疆闆舵柟浣嶈寮傚父锛�" + ex.getMessage());
return AjaxResult.error("璁剧疆闆舵柟浣嶈寮傚父锛�" + ex.getMessage());
@@ -520,13 +496,12 @@
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);
- return cameraSDK.guideTargetPosition(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.guideTargetPosition(cmd);
} catch (Exception ex) {
log.error("寮曞鎸囧悜鐩爣寮傚父:" + ex.getMessage());
return AjaxResult.error("寮曞鎸囧悜鐩爣寮傚父:" + ex.getMessage());
@@ -544,7 +519,7 @@
//鑾峰彇浜�
ArdAlarmpointsWell well = ardAlarmpointsWellService.selectArdAlarmpointsWellById(cmd.getWellId());
if (well == null) {
- return AjaxResult.error("浜曚笉瀛樺湪");
+ return AjaxResult.warn("浜曚笉瀛樺湪");
}
GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());
cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
@@ -607,15 +582,15 @@
String cameraId = getCameraByNear(new double[]{well.getLongitude(), well.getLatitude()});
cmd.setCameraId(cameraId);
if ("".equals(cameraId)) {
- return AjaxResult.error("鏈壘鍒板紩瀵肩浉鏈�");
+ return AjaxResult.warn("鏈壘鍒板紩瀵肩浉鏈�");
}
//鍒ゆ柇绂佸紩鍖�
if (isInPolygon(cameraId, new Double[]{well.getLongitude(), well.getLatitude()})) {
- return AjaxResult.error("浜曚綅缃睘浜庣浉鏈虹姝㈠紩瀵煎尯鍩�");
+ return AjaxResult.warn("浜曚綅缃睘浜庣浉鏈虹姝㈠紩瀵煎尯鍩�");
}
//鎸変簳鍧愭爣寮�濮嬪紩瀵�
if (!guideTargetPosition(cmd).get("code").equals(200)) {
- return AjaxResult.error("浜曞潗鏍囧紩瀵煎け璐�", "cameraId:" + cameraId);
+ return AjaxResult.warn("浜曞潗鏍囧紩瀵煎け璐�", "cameraId:" + cameraId);
}
return AjaxResult.success("浜曞潗鏍囧紩瀵兼垚鍔�", "cameraId:" + cameraId);
@@ -718,7 +693,7 @@
String cameraId = cmd.getCameraId();//鐢宠閿佺殑鐩告満
ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
if (ardCameras == null) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
Date now = new Date();
now.setTime(now.getTime() + cmd.getExpired() * 1000);
@@ -741,7 +716,7 @@
String operator = cmd.getOperator();//鐢宠鑰�
ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
if (ardCameras == null) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
if (ardCameras.getOperatorId().equals(operator)) {
//濡傛灉瑙ｉ攣鐩告満鐨勫綋鍓嶇敤鎴锋槸鐢宠鑰咃紝鍒欐竻绌鸿鐩告満鐨勮繃鏈熸椂闂�
@@ -834,13 +809,12 @@
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);
- return cameraSDK.getGisInfo(cmd);
- } else {
- return AjaxResult.error("鐩告満涓嶅瓨鍦�");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getGisInfo(cmd);
} catch (Exception ex) {
log.error("鑾峰彇鐩告満鏋惰鍙傛暟寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鑾峰彇鐩告満鏋惰鍙傛暟寮傚父锛�" + ex.getMessage());
@@ -853,33 +827,30 @@
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);
- return cameraSDK.localRecordStart(cmd);
- } else {
- return AjaxResult.error("鐩告満涓嶅瓨鍦�");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.localRecordStart(cmd);
} catch (Exception ex) {
log.error("鏈湴褰曞儚寮�濮嬪紓甯革細" + ex.getMessage());
return AjaxResult.error("鏈湴褰曞儚寮�濮嬪紓甯革細" + ex.getMessage());
}
}
+
//鏈湴褰曞儚鍋滄
@Override
public AjaxResult localRecordStop(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);
- return cameraSDK.localRecordStop(cmd);
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
- else
- {
- return AjaxResult.error("鐩告満涓嶅瓨鍦�");
- }
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.localRecordStop(cmd);
} catch (Exception ex) {
log.error("鏈湴褰曞儚鍋滄寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鏈湴褰曞儚鍋滄寮傚父锛�" + ex.getMessage());
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/lib/ToolKits.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/lib/ToolKits.java
index a8a2d28..e1326a9 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/lib/ToolKits.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/lib/ToolKits.java
@@ -469,8 +469,9 @@
* @return
*/
public static String getErrorCodePrint() {
- return "Error Code: (0x80000000|" + (LoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff) +")"
- + " Error Info:" + ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()) + "";
+ return ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()) + "("+(LoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff)+")";
+ //return "Error Code: (0x80000000|" + (LoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff) +")"
+ // + " Error Info:" + ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()) + "";
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
index fd31780..15cd216 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
@@ -103,7 +103,7 @@
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触:" + getErrorCodePrint());
- return AjaxResult.error(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
+ return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
}
if (GlobalVariable.loginMap.containsKey(camera.getId())) {
GlobalVariable.loginMap.remove(camera.getId());
@@ -197,7 +197,7 @@
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触:" + getErrorCodePrint());
- return AjaxResult.error(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
+ return AjaxResult.warn(getErrorCodePrint());
}
if (GlobalVariable.loginMap.containsKey(camera.getId())) {
GlobalVariable.loginMap.remove(camera.getId());
@@ -339,7 +339,7 @@
Integer speed = cmd.getSpeed();
Integer code = cmd.getCode();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
int dwStop;
@@ -406,7 +406,7 @@
boolean bool = PtzControlModule.ptzControl(loginId, chanNo - 1, dwPTZCommand, speed, speed, 0, dwStop);
if (!bool) {
log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
- return AjaxResult.error(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
+ return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
}
return AjaxResult.success("浜戝彴鎺у埗鎴愬姛");
}
@@ -421,7 +421,7 @@
Map<String, Object> ptzMap = new HashMap<>();
String cameraId = cmd.getCameraId();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
NetSDKLib.NET_PTZ_LOCATION_INFO dh_ptz_location_info = new NetSDKLib.NET_PTZ_LOCATION_INFO();
@@ -429,7 +429,7 @@
if (!b) {
int code = netsdk.CLIENT_GetLastError();
log.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
- return AjaxResult.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
+ return AjaxResult.warn("璁剧疆ptz澶辫触:" + getErrorCodePrint());
}
DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
String nPTZPan = df.format((float) dh_ptz_location_info.nPTZPan / 10);
@@ -472,12 +472,12 @@
Integer chanNo = cmd.getChanNo();
Map<String, Double> ptz = cmd.getPtzMap();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
if (ptz.get("p") == null || ptz.get("t") == null || ptz.get("z") == null) {
- return AjaxResult.error("ptz鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("ptz鍙傛暟涓嶈兘涓虹┖");
}
int p = (int) (ptz.get("p") * 10);
int t = (int) (ptz.get("t") * 10);
@@ -487,7 +487,7 @@
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
if (!bool) {
log.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
- return AjaxResult.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
+ return AjaxResult.warn("璁剧疆ptz澶辫触:" + getErrorCodePrint());
}
return AjaxResult.success("璁剧疆ptz鎴愬姛");
} catch (Exception ex) {
@@ -510,13 +510,13 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
boolean bool = NetSDKLib.NETSDK_INSTANCE.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RESETZERO, 0, 0, 0, 0);
if (!bool) {
log.error("璁剧疆闆舵柟浣嶈澶辫触:" + getErrorCodePrint());
- return AjaxResult.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
+ return AjaxResult.warn("璁剧疆ptz澶辫触:" + getErrorCodePrint());
}
return AjaxResult.success("璁剧疆闆舵柟浣嶈鎴愬姛");
}
@@ -556,26 +556,25 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
String imagePath = FileUtils.createFile("D:/LocalCaptureTemp/" + cameraId + ".jpeg");
fCaptureReceiveCB1 m_CaptureReceiveCB = new fCaptureReceiveCB1(imagePath);
CapturePictureModule.setSnapRevCallBack(m_CaptureReceiveCB);
boolean b = CapturePictureModule.remoteCapturePicture(loginId, chanNo - 1);
- if (b) {
- Thread.sleep(200);
- byte[] imageBytes = Files.readAllBytes(Paths.get(imagePath));
- //OutputStream outputStream = response.getOutputStream();
- //outputStream.write(imageBytes);
- // 鍒涘缓ByteBuffer骞跺皢瀛楄妭鏁扮粍鍐欏叆鍏朵腑
- //ByteBuffer jpegBuffer = ByteBuffer.wrap(imageBytes);
- //Base64.Encoder decoder = Base64.getEncoder();
- //String png_base64 = decoder.encodeToString(jpegBuffer.array());//杞崲鎴恇ase64涓�
- return AjaxResult.success(imageBytes);
- } else {
- return AjaxResult.error("鏈湴鎶撳浘澶辫触");
+ if (!b) {
+ return AjaxResult.warn("鏈湴鎶撳浘澶辫触");
}
+ Thread.sleep(200);
+ byte[] imageBytes = Files.readAllBytes(Paths.get(imagePath));
+ //OutputStream outputStream = response.getOutputStream();
+ //outputStream.write(imageBytes);
+ // 鍒涘缓ByteBuffer骞跺皢瀛楄妭鏁扮粍鍐欏叆鍏朵腑
+ //ByteBuffer jpegBuffer = ByteBuffer.wrap(imageBytes);
+ //Base64.Encoder decoder = Base64.getEncoder();
+ //String png_base64 = decoder.encodeToString(jpegBuffer.array());//杞崲鎴恇ase64涓�
+ return AjaxResult.success(imageBytes);
} catch (Exception ex) {
return AjaxResult.error("鏈湴鎶撳浘寮傚父:" + ex);
}
@@ -589,7 +588,7 @@
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
//if (GlobalVariable.previewMap.containsKey(cameraId)) {
@@ -611,12 +610,13 @@
// return false;
//}
log.debug("鏈湴褰曞儚寮�濮�");
- return AjaxResult.success("鏈湴褰曞儚寮�濮�",lRealHandle);
+ return AjaxResult.success("鏈湴褰曞儚寮�濮�", lRealHandle);
} catch (Exception ex) {
log.error("鏈湴褰曞儚寮�濮嬪紓甯�" + ex.getMessage());
return AjaxResult.error("鏈湴褰曞儚寮�濮嬪紓甯�" + ex.getMessage());
}
}
+
//鏈湴褰曞儚鍋滄
@Override
public AjaxResult localRecordStop(CameraCmd cmd) {
@@ -624,7 +624,7 @@
String cameraId = cmd.getCameraId();
LLong lRealHandle = new LLong(cmd.getRecordId());
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
RealPlayModule.stopRealPlay(lRealHandle);
@@ -808,7 +808,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -822,7 +822,7 @@
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
if (!bool) {
log.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
- return AjaxResult.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
+ return AjaxResult.warn("璁剧疆ptz澶辫触:" + getErrorCodePrint());
}
return AjaxResult.success("寮曞鐩爣浣嶇疆鎴愬姛");
} catch (Exception ex) {
@@ -838,14 +838,14 @@
Integer chanNo = cmd.getChanNo();
Integer PresetIndex = cmd.getPresetIndex();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NET_PTZ_POINT_MOVE_CONTROL, 0, PresetIndex, 0, 0);
if (!bool) {
log.error("杞嚦棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
- return AjaxResult.error("杞嚦棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
+ return AjaxResult.warn("杞嚦棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
}
return AjaxResult.success("杞嚦棰勭疆鐐规垚鍔�");
} catch (Exception ex) {
@@ -861,14 +861,14 @@
Integer chanNo = cmd.getChanNo();
Integer PresetIndex = cmd.getPresetIndex();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NET_PTZ_POINT_SET_CONTROL, 0, PresetIndex, 0, 0);
if (!bool) {
log.error("璁剧疆棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
- return AjaxResult.error("璁剧疆棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
+ return AjaxResult.warn("璁剧疆棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
}
return AjaxResult.success("璁剧疆棰勭疆鐐规垚鍔�");
} catch (Exception ex) {
@@ -884,7 +884,7 @@
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -909,7 +909,7 @@
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, NetSDKLib.CFG_CMD_VIDEOIN_FOCUS, cfg_video_in_focus);
if (!bool) {
log.error("鍒囨崲鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
- return AjaxResult.error("鍒囨崲鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
+ return AjaxResult.warn("鍒囨崲鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
}
return AjaxResult.success("鍒囨崲鑱氱劍妯″紡鎴愬姛");
} catch (Exception ex) {
@@ -925,7 +925,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -934,7 +934,7 @@
boolean bool = ConfigModule.GetConfig(loginId, chanNo - 1, emCfgOpType, focusModeInfo);
if (!bool) {
log.error("鑾峰彇鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
- return AjaxResult.error("鑾峰彇鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
+ return AjaxResult.warn("鑾峰彇鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
}
//System.out.println("閰嶇疆绫诲瀷:" + focusModeInfo.emCfgType); // 鍏蜂綋淇℃伅锛屽弬鑰冨簱閲岀殑鏋氫妇
//System.out.println("鑱氱劍妯″紡:" + focusModeInfo.emFocusMode);
@@ -985,7 +985,7 @@
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -994,7 +994,7 @@
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, command, netVideoinDefogInfo);
if (!bool) {
log.error("鍒囨崲閫忛浘澶辫触:" + getErrorCodePrint());
- return AjaxResult.error("鍒囨崲閫忛浘澶辫触:" + getErrorCodePrint());
+ return AjaxResult.warn("鍒囨崲閫忛浘澶辫触:" + getErrorCodePrint());
}
return AjaxResult.success("鍒囨崲閫忛浘鎴愬姛");
} catch (Exception ex) {
@@ -1008,7 +1008,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -1016,7 +1016,7 @@
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_INFRARED_CONFIG, cfg_infrared_info);
if (!bool) {
log.error("鍒囨崲绾㈠澶辫触:" + getErrorCodePrint());
- return AjaxResult.error("鍒囨崲绾㈠澶辫触:" + getErrorCodePrint());
+ return AjaxResult.warn("鍒囨崲绾㈠澶辫触:" + getErrorCodePrint());
}
return AjaxResult.success("鍒囨崲绾㈠鎴愬姛");
} catch (Exception ex) {
@@ -1032,7 +1032,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
NET_PTZ_LOCATION_INFO net_ptz_location_info = new NET_PTZ_LOCATION_INFO();
@@ -1040,7 +1040,7 @@
boolean bool = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_LOCATION, net_ptz_location_info);
if (!bool) {
log.error("鑾峰彇鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
- return AjaxResult.error("鑾峰彇鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
+ return AjaxResult.warn("鑾峰彇鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
}
result = net_ptz_location_info.nFocusMapValue;
return AjaxResult.success(result);
@@ -1058,7 +1058,7 @@
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -1072,7 +1072,7 @@
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_LIGHTING, cfg_lighting_info);
if (!bool) {
log.error("璁剧疆鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
- return AjaxResult.error("璁剧疆鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
+ return AjaxResult.warn("璁剧疆鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
}
return AjaxResult.success("璁剧疆鑱氱劍鍊兼垚鍔�");
} catch (Exception ex) {
@@ -1156,14 +1156,14 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
DH_OUT_PTZ_VIEW_RANGE_STATUS dh_out_ptz_view_range_status = new DH_OUT_PTZ_VIEW_RANGE_STATUS();
boolean b = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_VIEW_RANGE, dh_out_ptz_view_range_status);
if (!b) {
log.error("鑾峰彇浜戝彴鍙鍩熷け璐�:" + getErrorCodePrint());
- return AjaxResult.error("鑾峰彇浜戝彴鍙鍩熷け璐�:" + getErrorCodePrint());
+ return AjaxResult.warn("鑾峰彇浜戝彴鍙鍩熷け璐�:" + getErrorCodePrint());
}
float nAngelH = (float) dh_out_ptz_view_range_status.nAngelH / 10;
float nAngelV = (float) dh_out_ptz_view_range_status.nAngelV / 10;
@@ -1226,9 +1226,11 @@
// 鎶撳浘鎺ユ敹鍥炶皟:褰撴姄鍥炬垚鍔燂紝sdk浼氳皟鐢ㄨ鍑芥暟
public static class fCaptureReceiveCB1 implements NetSDKLib.fSnapRev {
private String picPath;
+
public fCaptureReceiveCB1(String picPath) {
this.picPath = picPath;
}
+
public void invoke(LLong lLoginID, Pointer pBuf, int RevLen, int EncodeType, int CmdSerial, Pointer dwUser) {
if (pBuf != null && RevLen > 0) {
byte[] buf = pBuf.getByteArray(0, RevLen);
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
index 77f2a33..5c9587f 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
@@ -80,7 +80,7 @@
try {
// 鍒濆鍖�
if (!hCNetSDK.NET_DVR_Init()) {
- log.error("SDK鍒濆鍖栧け璐�");
+ log.debug("SDK鍒濆鍖栧け璐�");
}
//鎵撳嵃娴峰悍sdk鏃ュ織
if (Platform.isWindows()) {
@@ -123,8 +123,8 @@
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
ardCamerasService.updateArdCameras(camera);
- log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
- return AjaxResult.error("璁惧鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ log.debug("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
+ return AjaxResult.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
}
log.debug("Login Success [ " + camera.getIp() + ":" + camera.getPort() + " ]");
@@ -191,7 +191,7 @@
// 鍒濆鍖�
if (!hCNetSDK.NET_DVR_Init()) {
log.error("SDK鍒濆鍖栧け璐�");
- return AjaxResult.error("SDK鍒濆鍖栧け璐�");
+ return AjaxResult.warn("SDK鍒濆鍖栧け璐�");
}
//鎵撳嵃娴峰悍sdk鏃ュ織
if (Platform.isWindows()) {
@@ -234,8 +234,8 @@
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
ardCamerasService.updateArdCameras(camera);
- log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
- return AjaxResult.error("璁惧鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
+ return AjaxResult.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
}
log.debug("Login Success 銆� " + camera.getIp() + ":" + camera.getPort() + " 銆�");
synchronized (_lock) {
@@ -387,7 +387,7 @@
Integer speed = cmd.getSpeed();
Integer code = cmd.getCode();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
int dwStop;
@@ -456,7 +456,7 @@
if (!bool) {
int errorCode = hCNetSDK.NET_DVR_GetLastError();
log.error("鎺у埗澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
- return AjaxResult.error("鎺у埗澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ return AjaxResult.warn("鎺у埗澶辫触:" + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
}
return AjaxResult.success("鎺у埗鎴愬姛");
}
@@ -472,7 +472,7 @@
Integer channelNum = cmd.getChanNo();
Integer dwFocusPos = cmd.getDwFocusPos();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
// 鑾峰彇鍙傛暟
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
@@ -490,7 +490,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆GIS淇℃伅鏁版嵁澶辫触,璇风◢鍚庨噸璇�" + code);
- return AjaxResult.error("璁剧疆GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆GIS淇℃伅鏁版嵁澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("璁剧疆GIS淇℃伅鏁版嵁鎴愬姛");
}
@@ -522,7 +522,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鑱氱劍鍊煎け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鑱氱劍鍊煎け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鑱氱劍鍊煎け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struGisInfo.read();
int result = struGisInfo.struPtzPosEx.dwFocus;
@@ -547,7 +547,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("棰勭疆鐐硅缃け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("棰勭疆鐐硅缃け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("棰勭疆鐐硅缃け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("棰勭疆鐐硅缃垚鍔�");
}
@@ -570,7 +570,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璋冪敤棰勭疆鐐瑰け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("璋冪敤棰勭疆鐐瑰け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璋冪敤棰勭疆鐐瑰け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("璋冪敤棰勭疆鐐规垚鍔�");
}
@@ -899,7 +899,7 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
@@ -911,7 +911,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇ptz澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
m_ptzPosCurrent.read();
// DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
@@ -949,7 +949,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
IntByReference pchannel = new IntByReference(chanNo);
Pointer pChannelNum = pchannel.getPointer();
@@ -966,8 +966,8 @@
boolean res = hCNetSDK.NET_DVR_GetSTDConfig(lUserID, HCNetSDK.NET_DVR_GET_PTZABSOLUTEEX, lpConfigParam6696);
if (!res) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鑾峰彇楂樼簿搴TZ缁濆浣嶇疆閰嶇疆澶辫触: errorCde" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇楂樼簿搴TZ缁濆浣嶇疆閰嶇疆澶辫触: errorCde" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鑾峰彇楂樼簿搴TZ澶辫触: errorCode" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇楂樼簿搴TZ澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
lpPTZAbsoluteEX_cfg.read();
//log.debug("P锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fPan + " T锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fTilt + " Z锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fZoom
@@ -1002,7 +1002,7 @@
Integer channelNum = cmd.getChanNo();
Map<String, Double> ptz = cmd.getPtzMap();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
@@ -1018,9 +1018,9 @@
m_ptzPosCurrent.write();
boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_PTZPOS, channelNum, point, m_ptzPosCurrent.size());
if (!bool) {
- int errorCode = hCNetSDK.NET_DVR_GetLastError();
- log.error("璁剧疆PTZ鍙傛暟澶辫触:" + errorCode);
- return AjaxResult.error("璁剧疆PTZ鍙傛暟澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ int code = hCNetSDK.NET_DVR_GetLastError();
+ log.error("璁剧疆PTZ鍙傛暟澶辫触: errorCode" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆PTZ鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("璁剧疆PTZ鍙傛暟鎴愬姛");
} catch (Exception ex) {
@@ -1045,7 +1045,7 @@
Integer chanNo = cmd.getChanNo();
Map<String, Double> ptz = cmd.getPtzMap();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer lUserID = (Integer) GlobalVariable.loginMap.get(cameraId);
IntByReference pchannel = new IntByReference(chanNo);
@@ -1077,9 +1077,9 @@
lpConfigParam6697.write();
boolean bool = hCNetSDK.NET_DVR_SetSTDConfig(lUserID, NET_DVR_SET_PTZABSOLUTEEX, lpConfigParam6697);
if (!bool) {
- int errorCode = hCNetSDK.NET_DVR_GetLastError();
- log.error("璁剧疆楂樼簿搴TZ鍙傛暟澶辫触:" + errorCode);
- return AjaxResult.error("璁剧疆楂樼簿搴TZ鍙傛暟澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ int code = hCNetSDK.NET_DVR_GetLastError();
+ log.error("璁剧疆楂樼簿搴TZ澶辫触:" + code);
+ return AjaxResult.warn("璁剧疆楂樼簿搴TZ澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("璁剧疆楂樼簿搴TZ鍙傛暟鎴愬姛");
@@ -1095,7 +1095,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
@@ -1117,7 +1117,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
- return AjaxResult.error("璁剧疆ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆ptz澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("寮曞鍧愭爣鎴愬姛");
} catch (Exception ex) {
@@ -1139,7 +1139,7 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZ_LOCKCFG netDvrPtzLockcfg = new NET_DVR_PTZ_LOCKCFG();
@@ -1149,8 +1149,8 @@
boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_PTZLOCKCFG, channelNum, point, netDvrPtzLockcfg.size(), ibrBytesReturned);
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鑾峰彇ptz閿佸畾淇℃伅澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇ptz閿佸畾淇℃伅澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鑾峰彇ptz閿佸畾澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇ptz閿佸畾澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
} else {
netDvrPtzLockcfg.read();
int byWorkMode = netDvrPtzLockcfg.byWorkMode;
@@ -1187,7 +1187,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆闆舵柟浣嶈澶辫触:" + code);
- return AjaxResult.error("璁剧疆闆舵柟浣嶈澶辫触: errorCode:" + code + "errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆闆舵柟浣嶈澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success();
}
@@ -1216,7 +1216,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇ptz鑼冨洿澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇ptz鑼冨洿澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇ptz鑼冨洿澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
} else {
m_ptzPosCurrent.read();
DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
@@ -1252,7 +1252,7 @@
boolean enable = cmd.isEnable();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_CAMERAPARAMCFG_EX struCameraParam = new NET_DVR_CAMERAPARAMCFG_EX();
@@ -1262,7 +1262,7 @@
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struCameraParam.read();
log.debug("鏄惁寮�鍚�忛浘锛�" + struCameraParam.struDefogCfg.byMode);
@@ -1280,7 +1280,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鍒囨崲閫忛浘澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鍒囨崲閫忛浘澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鍒囨崲閫忛浘澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鍒囨崲閫忛浘鎴愬姛");
return AjaxResult.success("鍒囨崲閫忛浘鎴愬姛");
@@ -1300,7 +1300,7 @@
boolean enable = cmd.isEnable();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_CAMERAPARAMCFG_EX struDayNigh = new NET_DVR_CAMERAPARAMCFG_EX();
@@ -1310,7 +1310,7 @@
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struDayNigh.read();
String current = struDayNigh.struDayNight.byDayNightFilterType == 1 ? "寮�鍚�" : "鍏抽棴";
@@ -1330,7 +1330,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鍒囨崲绾㈠澶辫触 ErrorCode:{},ErrorInfo:{}", code, SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鍒囨崲绾㈠澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鍒囨崲绾㈠澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鍒囨崲绾㈠鎴愬姛");
return AjaxResult.success("鍒囨崲绾㈠鎴愬姛");
@@ -1350,7 +1350,7 @@
boolean enable = cmd.isEnable();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
@@ -1360,7 +1360,7 @@
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struFocusMode.read();
log.debug("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
@@ -1378,7 +1378,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("璁剧疆鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆鑱氱劍妯″紡澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("璁剧疆鑱氱劍妯″紡鎴愬姛");
return AjaxResult.success("璁剧疆鑱氱劍妯″紡鎴愬姛");
@@ -1396,7 +1396,7 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
@@ -1405,8 +1405,8 @@
boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, struFocusMode.size(), ibrBytesReturned);
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鑾峰彇鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鑱氱劍妯″紡澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struFocusMode.read();
log.debug("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
@@ -1427,7 +1427,7 @@
boolean enable = cmd.isEnable();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
int dwStop;
@@ -1440,7 +1440,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆浜戝彴鍔犵儹澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("璁剧疆浜戝彴鍔犵儹澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆浜戝彴鍔犵儹澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("璁剧疆浜戝彴鍔犵儹鎴愬姛");
return AjaxResult.success("璁剧疆浜戝彴鍔犵儹鎴愬姛");
@@ -1460,7 +1460,7 @@
boolean enable = cmd.isEnable();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_DEVSERVER_CFG struDeicing = new NET_DVR_DEVSERVER_CFG();
@@ -1470,7 +1470,7 @@
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struDeicing.read();
log.debug("鏄惁寮�鍚櫎鍐帮細" + struDeicing.byEnableDeicing);
@@ -1485,7 +1485,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆闀滃ご闄ゅ啺澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("璁剧疆闀滃ご闄ゅ啺澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆闀滃ご闄ゅ啺澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("璁剧疆闀滃ご闄ゅ啺鎴愬姛");
return AjaxResult.success("璁剧疆闀滃ご闄ゅ啺鎴愬姛");
@@ -1502,14 +1502,14 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_WORKSTATE_V30 devwork = new NET_DVR_WORKSTATE_V30();
if (!hCNetSDK.NET_DVR_GetDVRWorkState_V30(userId, devwork)) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
//鍥剧墖璐ㄩ噺
NET_DVR_JPEGPARA jpeg = new NET_DVR_JPEGPARA();
@@ -1695,7 +1695,8 @@
netDvrIFrame.dwSize = netDvrIFrame.size();
netDvrIFrame.write();
if (!hCNetSDK.NET_DVR_RemoteControl(userId, 3402, netDvrIFrame.getPointer(), netDvrIFrame.dwSize)) {
- log.error("寮哄埗I甯� 閿欒鐮佷负: " + hCNetSDK.NET_DVR_GetLastError());
+ int code = hCNetSDK.NET_DVR_GetLastError();
+ log.error("璁剧疆寮哄埗I甯ч敊璇�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
//棰勮鍙傛暟
NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
@@ -1904,7 +1905,7 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
// 鑾峰彇鍙傛暟
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
@@ -1921,7 +1922,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇GIS淇℃伅鏁版嵁澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struGisInfo.read();
Map<String, Object> map = new HashMap<>();
@@ -1942,7 +1943,7 @@
Integer channelNum = cmd.getChanNo();
String path = FileUtils.createFile("D:/LocalRecordTemp/" + cameraId + ".mp4");
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
//寮哄埗I甯х粨鏋勪綋瀵硅薄
@@ -1975,7 +1976,7 @@
if (lRealHandle == -1) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鏈湴褰曞儚鍙栨祦澶辫触" + hCNetSDK.NET_DVR_GetLastError());
- return AjaxResult.error("鏈湴褰曞儚鍙栨祦澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鏈湴褰曞儚鍙栨祦澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鏈湴褰曞儚鍙栨祦鎴愬姛");
//GlobalVariable.threadMap.put(cameraId, Thread.currentThread().getName());
@@ -1983,7 +1984,7 @@
if (!hCNetSDK.NET_DVR_SaveRealData_V30(lRealHandle, 2, path)) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负: " + hCNetSDK.NET_DVR_GetLastError());
- return AjaxResult.error("鏈湴褰曞儚鍙栨祦澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鏈湴褰曞儚鍙栨祦澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鏈湴褰曞儚寮�濮�");
return AjaxResult.success("褰曞儚寮�濮�", lRealHandle);
@@ -2002,7 +2003,7 @@
Integer lRealHandle = cmd.getRecordId().intValue();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
//region 寮哄埗I甯�
--
Gitblit v1.9.3