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/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 96 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 47 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 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);
--
Gitblit v1.9.3