From fff75000a34b23041a19cacbdb62265f36e0e2c3 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 15 三月 2024 11:12:20 +0800
Subject: [PATCH] 测试
---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 253 ++++++++++++++++++++++++++++----------------------
1 files changed, 142 insertions(+), 111 deletions(-)
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 2eb90d2..4ffb4d8 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
@@ -3,6 +3,8 @@
import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.alarm.global.service.impl.QueueHandler;
+import com.ruoyi.common.annotation.SdkOperate;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -18,9 +20,12 @@
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.minio.MinioUtil;
import com.ruoyi.utils.sdk.common.GlobalVariable;
+import com.ruoyi.utils.sdk.common.SdkErrorCodeEnum;
+import com.ruoyi.utils.sdk.dhsdk.common.ErrorCode;
import com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib;
import com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NEW_CONFIG;
import com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE;
+import com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_INFRARED_INFO;
import com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_VIDEO_IN_FOCUS;
import com.ruoyi.utils.sdk.dhsdk.lib.structure.DH_OUT_PTZ_VIEW_RANGE_STATUS;
import com.ruoyi.utils.sdk.dhsdk.module.*;
@@ -315,14 +320,15 @@
* 2023/10/17 8:28:13
*/
@Override
- public boolean pTZControl(CameraCmd cmd) {
+ @SdkOperate
+ public AjaxResult pTZControl(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
boolean enable = cmd.isEnable();
Integer chanNo = cmd.getChanNo();
Integer speed = cmd.getSpeed();
Integer code = cmd.getCode();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
int dwStop;
@@ -389,8 +395,9 @@
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 bool;
+ return AjaxResult.success("浜戝彴鎺у埗鎴愬姛");
}
/**
@@ -399,31 +406,44 @@
* 2023/10/17 8:28:13
*/
@Override
- public Map<String, Object> getPtz(CameraCmd cmd) {
+ public AjaxResult getPtz(CameraCmd cmd) {
Map<String, Object> ptzMap = new HashMap<>();
String cameraId = cmd.getCameraId();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return null;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
NetSDKLib.NET_PTZ_LOCATION_INFO dh_ptz_location_info = new NetSDKLib.NET_PTZ_LOCATION_INFO();
boolean b = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_LOCATION, dh_ptz_location_info);
- if (b) {
- DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
- String nPTZPan = df.format((float) dh_ptz_location_info.nPTZPan / 10);
- float t = (float) dh_ptz_location_info.nPTZTilt / 10 * -1;
- String nPTZTilt = df.format(t < 0 ? t + 360 : t);
- String nPTZZoom = df.format((float) dh_ptz_location_info.nPTZZoom);
- ptzMap.put("p", nPTZPan);
- ptzMap.put("t", nPTZTilt);
- ptzMap.put("z", nPTZZoom);
+ if (!b) {
+ int code = netsdk.CLIENT_GetLastError();
+ log.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
+ return AjaxResult.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
}
- return ptzMap;
+ DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
+ String nPTZPan = df.format((float) dh_ptz_location_info.nPTZPan / 10);
+ float t = (float) dh_ptz_location_info.nPTZTilt / 10 * -1;
+ String nPTZTilt = df.format(t < 0 ? t + 360 : t);
+ String nPTZZoom = df.format((float) dh_ptz_location_info.nPTZZoom);
+ ptzMap.put("p", nPTZPan);
+ ptzMap.put("t", nPTZTilt);
+ ptzMap.put("z", nPTZZoom);
+ return AjaxResult.success(ptzMap);
}
@Override
- public Map<String, Object> getPtzScope(CameraCmd cmd) {
- return null;
+ public AjaxResult getPtzHigh(CameraCmd cmd) {
+ return getPtz(cmd);
+ }
+
+ @Override
+ public AjaxResult getPtzScope(CameraCmd cmd) {
+ return AjaxResult.success("鏈疄鐜拌鍔熻兘");
+ }
+
+ @Override
+ public AjaxResult setPtzHigh(CameraCmd cmd) {
+ return setPtz(cmd);
}
/**
@@ -435,15 +455,19 @@
* @淇敼浜哄拰鍏跺畠淇℃伅 娉ㄦ剰淇话瑙掑害璐熷�奸渶瑕佸姞涓�360寰楀埌鐨勬鍊艰繘琛岃缃�
*/
@Override
- public boolean setPtz(CameraCmd cmd) {
+ @SdkOperate
+ public AjaxResult setPtz(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
Map<String, Double> ptz = cmd.getPtzMap();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
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鍙傛暟涓嶈兘涓虹┖");
+ }
int p = (int) (ptz.get("p") * 10);
int t = (int) (ptz.get("t") * 10);
t = t > 900 ? 3600 - t : t * -1;
@@ -451,12 +475,13 @@
int z = ptz.get("z").intValue() == 0 ? 1 : ptz.get("z").intValue();
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
if (!bool) {
- log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ log.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
+ return AjaxResult.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("璁剧疆ptz鎴愬姛");
} catch (Exception ex) {
- log.error(ex.getMessage());
- return false;
+ log.error("璁剧疆ptz寮傚父:" + ex.getMessage());
+ return AjaxResult.error("璁剧疆ptz寮傚父:" + ex.getMessage());
}
}
@@ -469,18 +494,20 @@
* @淇敼浜哄拰鍏跺畠淇℃伅 娉ㄦ剰淇话瑙掑害璐熷�奸渶瑕佸姞涓�360寰楀埌鐨勬鍊艰繘琛岃缃�
*/
@Override
- public boolean setZeroPtz(CameraCmd cmd) {
+ @SdkOperate
+ public AjaxResult setZeroPtz(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
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());
+ log.error("璁剧疆闆舵柟浣嶈澶辫触:" + getErrorCodePrint());
+ return AjaxResult.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("璁剧疆闆舵柟浣嶈鎴愬姛");
}
/**
@@ -511,6 +538,7 @@
return picUrl;
}
+
/**
* @鎻忚堪 鐭椂褰曞儚
@@ -662,11 +690,11 @@
* 2023/10/17 8:27:48
*/
@Override
- public boolean guideTargetPosition(CameraCmd cmd) {
+ public AjaxResult guideTargetPosition(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -679,69 +707,71 @@
int z = (int) (cameraPTZ[2]);
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
if (!bool) {
- log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ log.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
+ return AjaxResult.error("璁剧疆ptz澶辫触:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("寮曞鐩爣浣嶇疆鎴愬姛");
} catch (Exception ex) {
- log.error("寮曞寮傚父:" + ex.getMessage());
- return false;
+ log.error("寮曞鐩爣浣嶇疆寮傚父:" + ex.getMessage());
+ return AjaxResult.error("寮曞鐩爣浣嶇疆寮傚父:" + ex.getMessage());
}
}
//杞嚦棰勭疆鐐�
@Override
- public boolean gotoPreset(CameraCmd cmd) {
+ public AjaxResult gotoPreset(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
Integer PresetIndex = cmd.getPresetIndex();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
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());
+ log.error("杞嚦棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
+ return AjaxResult.error("杞嚦棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("杞嚦棰勭疆鐐规垚鍔�");
} catch (Exception ex) {
log.error("杞嚦棰勭疆鐐瑰紓甯�:" + ex.getMessage());
- return false;
+ return AjaxResult.error("杞嚦棰勭疆鐐瑰紓甯�:" + ex.getMessage());
}
}
@Override
//璁剧疆棰勭疆浣�
- public boolean setPreset(CameraCmd cmd) {
+ public AjaxResult setPreset(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
Integer PresetIndex = cmd.getPresetIndex();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
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());
+ log.error("璁剧疆棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
+ return AjaxResult.error("璁剧疆棰勭疆鐐瑰け璐�:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("璁剧疆棰勭疆鐐规垚鍔�");
} catch (Exception ex) {
log.error("璁剧疆棰勭疆鐐瑰紓甯�:" + ex.getMessage());
- return false;
+ return AjaxResult.error("璁剧疆棰勭疆鐐瑰紓甯�:" + ex.getMessage());
}
}
//鍒囨崲鑱氱劍妯″紡
@Override
- public boolean controlFocusMode(CameraCmd cmd) {
+ public AjaxResult controlFocusMode(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -765,22 +795,24 @@
cfg_video_in_focus.nChannelIndex = chanNo - 1;
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, NetSDKLib.CFG_CMD_VIDEOIN_FOCUS, cfg_video_in_focus);
if (!bool) {
- log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ log.error("鍒囨崲鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
+ return AjaxResult.error("鍒囨崲鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("鍒囨崲鑱氱劍妯″紡鎴愬姛");
} catch (Exception ex) {
log.error("鍒囨崲鑱氱劍妯″紡寮傚父:" + ex.getMessage());
- return false;
+ return AjaxResult.error("鍒囨崲鑱氱劍妯″紡寮傚父:" + ex.getMessage());
}
}
+ //鑾峰彇鑱氱劍妯″紡
@Override
- public String getFocusMode(CameraCmd cmd) {
+ public AjaxResult getFocusMode(CameraCmd cmd) {
String mode = "";
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return "";
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -788,10 +820,11 @@
int emCfgOpType = NET_EM_CFG_OPERATE_TYPE.NET_EM_CFG_VIDEOIN_FOCUSMODE;
boolean bool = ConfigModule.GetConfig(loginId, chanNo - 1, emCfgOpType, focusModeInfo);
if (!bool) {
- log.error("鑾峰彇澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ log.error("鑾峰彇鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
+ return AjaxResult.error("鑾峰彇鑱氱劍妯″紡澶辫触:" + getErrorCodePrint());
}
- System.out.println("閰嶇疆绫诲瀷:" + focusModeInfo.emCfgType); // 鍏蜂綋淇℃伅锛屽弬鑰冨簱閲岀殑鏋氫妇
- System.out.println("鑱氱劍妯″紡:" + focusModeInfo.emFocusMode);
+ //System.out.println("閰嶇疆绫诲瀷:" + focusModeInfo.emCfgType); // 鍏蜂綋淇℃伅锛屽弬鑰冨簱閲岀殑鏋氫妇
+ //System.out.println("鑱氱劍妯″紡:" + focusModeInfo.emFocusMode);
switch (focusModeInfo.emFocusMode) {
case 0:
mode = "鍏抽棴";
@@ -809,119 +842,114 @@
mode = "鎵嬪姩鑱氱劍";
break;
}
-
+ return AjaxResult.success(mode);
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍妯″紡寮傚父:" + ex.getMessage());
-
+ return AjaxResult.error("鑾峰彇鑱氱劍妯″紡寮傚父:" + ex.getMessage());
}
- return mode;
}
@Override
- public boolean controlPTHeateRpwron(CameraCmd cmd) {
- return false;
+ public AjaxResult controlPTHeateRpwron(CameraCmd cmd) {
+ return AjaxResult.success("璇ュ姛鑳芥湭瀹炵幇");
}
@Override
- public boolean controlCameraDeicing(CameraCmd cmd) {
- return false;
+ public AjaxResult controlCameraDeicing(CameraCmd cmd) {
+ return AjaxResult.success("璇ュ姛鑳芥湭瀹炵幇");
}
@Override
- public int getPTZLockInfo(CameraCmd cmd) {
- return 0;
+ public AjaxResult getPTZLockInfo(CameraCmd cmd) {
+ return AjaxResult.success("璇ュ姛鑳芥湭瀹炵幇");
}
@Override
- public String captureJPEGPicture(CameraCmd cmd) {
- return null;
+ public AjaxResult captureJPEGPicture(CameraCmd cmd) {
+ return AjaxResult.success("璇ュ姛鑳芥湭瀹炵幇");
}
- //閫忛浘
+ //鍒囨崲閫忛浘
@Override
- public boolean controlDefogcfg(CameraCmd cmd) {
+ public AjaxResult controlDefogcfg(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
String command = EM_NEW_CONFIG.CFG_CMD_VIDEOINDEFOG.getValue();
- //CFG_VIDEOINDEFOG_LIST cfg_videoindefog_list=new CFG_VIDEOINDEFOG_LIST();
- boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, command, null);
+ NET_VIDEOIN_DEFOG_INFO netVideoinDefogInfo = new NET_VIDEOIN_DEFOG_INFO();
+ boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, command, netVideoinDefogInfo);
if (!bool) {
- log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ log.error("鍒囨崲閫忛浘澶辫触:" + getErrorCodePrint());
+ return AjaxResult.error("鍒囨崲閫忛浘澶辫触:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("鍒囨崲閫忛浘鎴愬姛");
} catch (Exception ex) {
- log.error("鍒囨崲閫忛浘寮傚父:" + ex.getMessage());
- return false;
+ return AjaxResult.error("鍒囨崲閫忛浘寮傚父:" + ex.getMessage());
}
}
- //绾㈠
+ //鍒囨崲绾㈠
@Override
- public boolean controlInfrarecfg(CameraCmd cmd) {
+ public AjaxResult controlInfrarecfg(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
- boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
- CFG_LIGHTING_INFO cfg_lighting_info = new CFG_LIGHTING_INFO();
- cfg_lighting_info.nLightingDetailNum = 1;
- if (enable) {
- cfg_lighting_info.stuLightingDetail[0].emMode = EM_CFG_LIGHTING_MODE.EM_CFG_LIGHTING_MODE_MANUAL;
- } else {
- cfg_lighting_info.stuLightingDetail[0].emMode = EM_CFG_LIGHTING_MODE.EM_CFG_LIGHTING_MODE_OFF;
- }
- boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_LIGHTING, cfg_lighting_info);
+ CFG_INFRARED_INFO cfg_infrared_info = new CFG_INFRARED_INFO();
+ boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_INFRARED_CONFIG, cfg_infrared_info);
if (!bool) {
- log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ log.error("鍒囨崲绾㈠澶辫触:" + getErrorCodePrint());
+ return AjaxResult.error("鍒囨崲绾㈠澶辫触:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("鍒囨崲绾㈠鎴愬姛");
} catch (Exception ex) {
- log.error("鍒囨崲绾㈠寮傚父:" + ex.getMessage());
- return false;
+ return AjaxResult.error("鍒囨崲绾㈠寮傚父:" + getErrorCodePrint());
}
}
//鑾峰彇鑱氱劍鍊�
@Override
- public int getFocusPos(CameraCmd cmd) {
+ public AjaxResult getFocusPos(CameraCmd cmd) {
int result = 0;
try {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return result;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
NET_PTZ_LOCATION_INFO net_ptz_location_info = new NET_PTZ_LOCATION_INFO();
net_ptz_location_info.nChannelID = chanNo - 1;
boolean bool = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_LOCATION, net_ptz_location_info);
if (!bool) {
- log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ log.error("鑾峰彇鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
+ return AjaxResult.error("鑾峰彇鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
}
result = net_ptz_location_info.nFocusMapValue;
+ return AjaxResult.success(result);
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍鍊煎紓甯�:" + ex.getMessage());
+ return AjaxResult.error("鑾峰彇鑱氱劍鍊煎紓甯�:" + getErrorCodePrint());
}
- return result;
+
}
//璁剧疆鑱氱劍鍊�
@Override
- public boolean setFocusPos(CameraCmd cmd) {
+ public AjaxResult setFocusPos(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return false;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -934,12 +962,13 @@
}
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_LIGHTING, cfg_lighting_info);
if (!bool) {
- log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ log.error("璁剧疆鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
+ return AjaxResult.error("璁剧疆鑱氱劍鍊煎け璐�:" + getErrorCodePrint());
}
- return bool;
+ return AjaxResult.success("璁剧疆鑱氱劍鍊兼垚鍔�");
} catch (Exception ex) {
log.error("璁剧疆鑱氱劍鍊煎紓甯�:" + ex.getMessage());
- return false;
+ return AjaxResult.error("璁剧疆鑱氱劍鍊煎け璐�:" + ex.getMessage());
}
}
@@ -1011,30 +1040,32 @@
return map;
}
- //鑾峰彇GIS淇℃伅鏁版嵁
+ //鑾峰彇浜戝彴鍙鍩�
@Override
- public Map<String, Object> getGisInfo(CameraCmd cmd) {
- Map<String, Object> map = new HashMap<>();
+ public AjaxResult getGisInfo(CameraCmd cmd) {
try {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return null;
+ return AjaxResult.error("璁惧鏈櫥褰�");
}
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) {
- float nAngelH = (float) dh_out_ptz_view_range_status.nAngelH / 10;
- float nAngelV = (float) dh_out_ptz_view_range_status.nAngelV / 10;
- map = getPtz(cmd);//鑾峰彇ptz
- map.put("fHorFieldAngle", nAngelH);// 姘村钩瑙嗗満瑙�
- map.put("fVerFieldAngle", nAngelV);// 鍨傜洿瑙嗗満瑙�
+ if (!b) {
+ log.error("鑾峰彇浜戝彴鍙鍩熷け璐�:" + getErrorCodePrint());
+ return AjaxResult.error("鑾峰彇浜戝彴鍙鍩熷け璐�:" + getErrorCodePrint());
}
+ float nAngelH = (float) dh_out_ptz_view_range_status.nAngelH / 10;
+ float nAngelV = (float) dh_out_ptz_view_range_status.nAngelV / 10;
+ Map<String, Object> map = getPtz(cmd);//鑾峰彇ptz
+ map.put("fHorFieldAngle", nAngelH);// 姘村钩瑙嗗満瑙�
+ map.put("fVerFieldAngle", nAngelV);// 鍨傜洿瑙嗗満瑙�
+ return AjaxResult.success(map);
} catch (Exception ex) {
log.error("鑾峰彇浜戝彴鍙鍩熷紓甯�" + ex.getMessage());
+ return AjaxResult.error("鑾峰彇浜戝彴鍙鍩熷紓甯�:" + getErrorCodePrint());
}
- return map;
}
// 璁惧鏂嚎鍥炶皟: 褰撹澶囧嚭鐜版柇绾挎椂锛孲DK浼氳皟鐢ㄨ鍑芥暟
@@ -1083,4 +1114,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3