From aaa07634fa899b7346dfd61c6f70962adbc1dca5 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期五, 20 十月 2023 08:55:02 +0800 Subject: [PATCH] 1. 增加聚焦值和获取接口。 2. 增加视频编码获取接口。 3. 流媒体通过编码自动切换是否转码。 --- ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java | 316 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 269 insertions(+), 47 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java index b7aadfb..ed12a00 100644 --- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java @@ -13,17 +13,21 @@ import com.ruoyi.device.dhsdk.common.Res; import com.ruoyi.device.dhsdk.lib.NetSDKLib; import com.ruoyi.device.dhsdk.lib.NetSDKLib.LLong; +import com.ruoyi.device.dhsdk.lib.enumeration.EM_FOCUS_LIMIT_SELECT_MODE; +import com.ruoyi.device.dhsdk.lib.enumeration.EM_NEW_CONFIG; import com.ruoyi.device.dhsdk.lib.structure.CFG_VIDEO_IN_FOCUS; import com.ruoyi.device.dhsdk.lib.structure.CFG_VIDEO_IN_FOCUS_UNIT; -import com.ruoyi.device.dhsdk.module.CapturePictureModule; -import com.ruoyi.device.dhsdk.module.ConfigModule; -import com.ruoyi.device.dhsdk.module.LoginModule; -import com.ruoyi.device.dhsdk.module.RealPlayModule; +import com.ruoyi.device.dhsdk.lib.structure.NET_ENCODE_VIDEO_INFO; +import com.ruoyi.device.dhsdk.module.*; import com.ruoyi.device.dhsdk.service.IDhClientService; import com.ruoyi.device.hiksdk.common.GlobalVariable; import com.ruoyi.device.hiksdk.sdk.HCNetSDK; +import com.ruoyi.media.domain.Vtdu; +import com.ruoyi.media.service.IVtduService; +import com.ruoyi.media.service.impl.VtduServiceImpl; import com.ruoyi.utils.gis.GisUtil; import com.ruoyi.utils.minio.MinioUtil; +import com.ruoyi.utils.tools.ArdTool; import com.sun.jna.Pointer; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -31,20 +35,15 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.text.DecimalFormat; import java.util.*; -import static com.ruoyi.device.dhsdk.lib.NetSDKLib.NET_DEVSTATE_ONLINE; -import static com.ruoyi.device.dhsdk.lib.NetSDKLib.NET_DEVSTATE_PTZ_LOCATION; +import static com.ruoyi.device.dhsdk.lib.NetSDKLib.*; import static com.ruoyi.device.dhsdk.lib.NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL; import static com.ruoyi.device.dhsdk.lib.NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL; import static com.ruoyi.device.dhsdk.lib.ToolKits.getErrorCodePrint; import static com.ruoyi.device.dhsdk.module.LoginModule.netsdk; -import static com.ruoyi.device.hiksdk.sdk.HCNetSDK.NET_DVR_SET_PTZPOS; /** @@ -61,10 +60,11 @@ private IArdCamerasService ardCamerasService; @Resource private IArdChannelService ardChannelService; + @Resource + private IVtduService vtduService; @Value("${minio.endpoint}") private String minioEndPoint; - private Vector<String> chnlist = new Vector<String>(); // 璁惧鏂嚎閫氱煡鍥炶皟 private static DisConnect disConnect = new DisConnect(); // 缃戠粶杩炴帴鎭㈠ @@ -125,13 +125,39 @@ GlobalVariable.loginMap.put(camera.getId(), loginId); //鑾峰彇鏈�鏂伴�氶亾 for (int i = 1; i < LoginModule.m_stDeviceInfo.byChanNum + 1; i++) { - chnlist.add(Res.string().getChannel() + " " + String.valueOf(i)); ArdChannel channel = new ArdChannel(); + AV_CFG_ChannelName av_cfg_channelName = new AV_CFG_ChannelName(); + boolean b = ConfigModule.GetNewDevConfig(loginId, i - 1, CFG_CMD_CHANNELTITLE, av_cfg_channelName); + if (b) { + String chanName = null; + try { + chanName = new String(av_cfg_channelName.szName, "GBK").trim(); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + channel.setName(chanName); + } else { + channel.setName("閫氶亾" + i); + } channel.setDeviceId(camera.getId()); - channel.setName("閫氶亾" + i); - channel.setId(IdUtils.simpleUUID()); channel.setChanNo(i); ardChannelService.insertArdChannel(channel); + + //閰嶇疆鍒版祦濯掍綋 + String name = camera.getId() + "_" + channel.getChanNo(); + String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/cam/realmonitor?channel=" + channel.getChanNo() + "&subtype=0"; + Vtdu vtdu = vtduService.selectVtduByName(name); + if (vtdu != null) { + vtduService.deleteVtduByName(name); + } + //娣诲姞鍒版祦濯掍綋 + vtdu = new Vtdu(); + vtdu.setRtspSource(rtspSource); + vtdu.setName(camera.getId() + "_" + channel.getChanNo()); + vtdu.setIsCode("0");//榛樿涓嶈浆鐮� + vtdu.setMode("1");//榛樿CPU杞В鐮� + vtdu.setCameraId(camera.getId()); + vtduService.insertVtdu(vtdu); } } else { //log.debug(camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触"); @@ -210,58 +236,58 @@ switch (code) { /*鏂瑰悜*/ case 1: - dwPTZCommand = NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP; + dwPTZCommand = NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP; break; case 2: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_UP_CONTROL; break; case 3: - dwPTZCommand = NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP; + dwPTZCommand = NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP; break; case 4: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL; break; case 5: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_LOOP_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_POINT_LOOP_CONTROL; break; case 6: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL; break; case 7: - dwPTZCommand = NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN; + dwPTZCommand = NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN; break; case 8: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL; break; case 9: - dwPTZCommand = NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN; + dwPTZCommand = NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN; break; /*鐒﹁窛*/ case 10: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL; break; case 11: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL; break; /*鐒︾偣*/ case 12: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL; break; case 13: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL; break; /*鍏夊湀*/ case 14: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL; break; case 15: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL; break; case 16: - dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LAMP_CONTROL; + dwPTZCommand = NET_PTZ_ControlType.NET_PTZ_LAMP_CONTROL; break; } - boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, dwPTZCommand, speed, speed, 0, dwStop); + boolean bool = PtzControlModule.ptzControl(loginId, chanNo - 1, dwPTZCommand, speed, speed, 0, dwStop); if (!bool) { log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint()); } @@ -409,7 +435,7 @@ if (enable) { LLong lRealHandle = new LLong(0); if (!GlobalVariable.previewMap.containsKey(cameraId)) { - lRealHandle = RealPlayModule.startRealPlay(loginId, chanNo, 0); + lRealHandle = RealPlayModule.startRealPlay(loginId, chanNo - 1, path); if (lRealHandle.longValue() <= 0) { log.error("鍙栨祦澶辫触" + getErrorCodePrint()); return ""; @@ -417,15 +443,11 @@ log.debug("鍙栨祦鎴愬姛"); GlobalVariable.previewMap.put(cameraId, lRealHandle.intValue()); } - if (!netsdk.CLIENT_SaveRealData(lRealHandle, path)) { - log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负: " + getErrorCodePrint()); - return ""; - } log.debug("褰曞儚寮�濮�"); } else { if (GlobalVariable.previewMap.containsKey(cameraId)) { LLong lRealHandle = new LLong(GlobalVariable.previewMap.get(cameraId)); - boolean b = netsdk.CLIENT_StopSaveRealData(lRealHandle); + RealPlayModule.stopRealPlay(lRealHandle); GlobalVariable.previewMap.remove(cameraId); } log.debug("褰曞儚鍋滄"); @@ -450,11 +472,11 @@ LLong lRealHandle; if (GlobalVariable.previewMap.containsKey(cameraId)) { lRealHandle = new LLong(GlobalVariable.previewMap.get(cameraId)); - netsdk.CLIENT_StopRealPlayEx(lRealHandle); + RealPlayModule.stopRealPlay(lRealHandle); GlobalVariable.previewMap.remove(cameraId); log.debug("鍋滄褰撳墠褰曞儚"); } - lRealHandle = RealPlayModule.startRealPlay1(loginId, chanNo - 1, path); + lRealHandle = RealPlayModule.startRealPlay(loginId, chanNo - 1, path); if (lRealHandle.longValue() <= 0) { log.error("鍙栨祦澶辫触" + getErrorCodePrint()); } @@ -485,7 +507,7 @@ LLong lRealHandle; if (GlobalVariable.previewMap.containsKey(cameraId)) { lRealHandle = new LLong(GlobalVariable.previewMap.get(cameraId)); - netsdk.CLIENT_StopRealPlayEx(lRealHandle); + RealPlayModule.stopRealPlay(lRealHandle); GlobalVariable.previewMap.remove(cameraId); log.debug("鍋滄褰撳墠褰曞儚"); } @@ -503,6 +525,29 @@ log.error("褰曞儚寮傚父" + ex.getMessage()); return ""; } + } + + @Override + public boolean recordStopNotToMinio(CameraCmd cmd) { + boolean result = false; + try { + String cameraId = cmd.getCameraId(); + if (!GlobalVariable.loginMap.containsKey(cameraId)) { + return false; + } + LLong lRealHandle; + if (GlobalVariable.previewMap.containsKey(cameraId)) { + lRealHandle = new LLong(GlobalVariable.previewMap.get(cameraId)); + RealPlayModule.stopRealPlay(lRealHandle); + GlobalVariable.previewMap.remove(cameraId); + log.debug("鍋滄褰撳墠褰曞儚"); + } + + result = true; + } catch (Exception ex) { + log.error("褰曞儚寮傚父" + ex.getMessage()); + } + return result; } /** @@ -595,14 +640,21 @@ LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId); try { CFG_VIDEO_IN_FOCUS cfg_video_in_focus = new CFG_VIDEO_IN_FOCUS(); - CFG_VIDEO_IN_FOCUS_UNIT[] stVideoInFocusUnit = new CFG_VIDEO_IN_FOCUS_UNIT[32]; - if (enable) { - stVideoInFocusUnit[0].nMode = 4;//鎵嬪姩鑱氱劍 - } else { - stVideoInFocusUnit[0].nMode = 2;//鎵嬪姩鑱氱劍 + cfg_video_in_focus.nVideoInFocusRealNum = 3;//閰嶇疆浣跨敤涓暟 + for (int i = 0; i < 3; i++) { + cfg_video_in_focus.stVideoInFocusUnit[i].nSensitivity = 1;//鑱氱劍鐏垫晱搴�, 0-楂�, 1-榛樿, 2-浣� + + cfg_video_in_focus.stVideoInFocusUnit[i].nIRCorrection = 2;//绾㈠鍏夎仛鐒︿慨姝�, 0-涓嶄慨姝�, 1-淇, 2-鑷姩淇 + cfg_video_in_focus.stVideoInFocusUnit[i].nFocusLimit = 10000;//鑱氱劍鏋侀檺鍊�, 鍗曚綅姣背 + if (enable) {//鑱氱劍妯″紡, 0-鍏抽棴, 1-杈呭姪鑱氱劍, 2-鑷姩鑱氱劍, 3-鍗婅嚜鍔ㄨ仛鐒�, 4-鎵嬪姩鑱氱劍 + cfg_video_in_focus.stVideoInFocusUnit[i].nMode = 4;//鎵嬪姩鑱氱劍 + cfg_video_in_focus.stVideoInFocusUnit[i].emFocusMode = 1;//鑱氱劍鏋侀檺Manual + } else { + cfg_video_in_focus.stVideoInFocusUnit[i].nMode = 2;//鑷姩鑱氱劍 + cfg_video_in_focus.stVideoInFocusUnit[i].emFocusMode = 0;//鑱氱劍鏋侀檺Auto + } } cfg_video_in_focus.nChannelIndex = chanNo - 1; - cfg_video_in_focus.stVideoInFocusUnit = stVideoInFocusUnit; boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, NetSDKLib.CFG_CMD_VIDEOIN_FOCUS, cfg_video_in_focus); if (!bool) { log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint()); @@ -614,6 +666,176 @@ } } + //閫忛浘 + @Override + public boolean controlDefogcfg(CameraCmd cmd) { + String cameraId = cmd.getCameraId(); + Integer chanNo = cmd.getChanNo(); + boolean enable = cmd.isEnable(); + if (!GlobalVariable.loginMap.containsKey(cameraId)) { + return false; + } + LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId); + try { + EM_NEW_CONFIG config = EM_NEW_CONFIG.CFG_CMD_VIDEOINDEFOG; + //CFG_VIDEOINDEFOG_LIST cfg_videoindefog_list=new CFG_VIDEOINDEFOG_LIST(); + boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, config.getValue(), null); + if (!bool) { + log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint()); + } + return bool; + } catch (Exception ex) { + log.error("鍒囨崲閫忛浘寮傚父:" + ex.getMessage()); + return false; + } + } + + //绾㈠ + @Override + public boolean controlInfrarecfg(CameraCmd cmd) { + String cameraId = cmd.getCameraId(); + Integer chanNo = cmd.getChanNo(); + boolean enable = cmd.isEnable(); + if (!GlobalVariable.loginMap.containsKey(cameraId)) { + return false; + } + 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); + if (!bool) { + log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint()); + } + return bool; + } catch (Exception ex) { + log.error("鍒囨崲绾㈠寮傚父:" + ex.getMessage()); + return false; + } + } + + //鑾峰彇鑱氱劍鍊� + @Override + public int getFocusPos(CameraCmd cmd) { + int result = 0; + try { + String cameraId = cmd.getCameraId(); + Integer chanNo = cmd.getChanNo(); + if (!GlobalVariable.loginMap.containsKey(cameraId)) { + return result; + } + 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()); + } + result = net_ptz_location_info.nFocusMapValue; + } catch (Exception ex) { + log.error("鑾峰彇鑱氱劍鍊煎紓甯�:" + ex.getMessage()); + } + return result; + } + + //璁剧疆鑱氱劍鍊� + @Override + public boolean setFocusPos(CameraCmd cmd) { + String cameraId = cmd.getCameraId(); + Integer chanNo = cmd.getChanNo(); + boolean enable = cmd.isEnable(); + if (!GlobalVariable.loginMap.containsKey(cameraId)) { + return false; + } + 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); + if (!bool) { + log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint()); + } + return bool; + } catch (Exception ex) { + log.error("璁剧疆鑱氱劍鍊煎紓甯�:" + ex.getMessage()); + return false; + } + } + + //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟 + @Override + public Map<String, Object> getVideoCompressionCfg(CameraCmd cmd) { + Map<String, Object> map = new HashMap<>(); + String cameraId = cmd.getCameraId(); + Integer chanNo = cmd.getChanNo(); + if (!GlobalVariable.loginMap.containsKey(cameraId)) { + return null; + } + LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId); + CFG_ENCODE_INFO cfg_encode_info = new CFG_ENCODE_INFO(); + cfg_encode_info.nChannelID = chanNo - 1; + boolean b = ConfigModule.GetNewDevConfig(loginId, chanNo - 1, CFG_CMD_ENCODE, cfg_encode_info); + if (b) { + int emCompression = cfg_encode_info.stuMainStream[0].stuVideoFormat.emCompression;//瑙嗛鏍煎紡 + String videoEncType = ""; + switch (emCompression) { + case 0: + videoEncType = "MPEG4"; + break; + case 1: + videoEncType = "MS-MPEG4"; + break; + case 2: + videoEncType = "MPEG2"; + break; + case 3: + videoEncType = "MPEG1"; + break; + case 4: + videoEncType = "H.263"; + break; + case 5: + videoEncType = "MJPG"; + break; + case 6: + videoEncType = "FCC-MPEG4"; + break; + case 7: + videoEncType = "鏍囧噯h264"; + break; + case 8: + videoEncType = "鏍囧噯h265"; + break; + case 9: + videoEncType = "SVAC"; + break; + default: + videoEncType = "鏈煡"; + break; + } + int nBitRate = cfg_encode_info.stuMainStream[0].stuVideoFormat.nBitRate; + int nWidth = cfg_encode_info.stuMainStream[0].stuVideoFormat.nWidth; + int nHeight = cfg_encode_info.stuMainStream[0].stuVideoFormat.nHeight; + String resolution = nWidth + "*" + nHeight; + float nFrameRate = cfg_encode_info.stuMainStream[0].stuVideoFormat.nFrameRate; + map.put("resolution", resolution);//鍒嗚鲸鐜� + map.put("videoBitrate", String.valueOf(nBitRate));//姣旂壒鐜� + map.put("videoEncType", videoEncType);//缂栫爜 + map.put("nFrameRate", String.valueOf(nFrameRate));//甯х巼 + } + return map; + } + // 璁惧鏂嚎鍥炶皟: 褰撹澶囧嚭鐜版柇绾挎椂锛孲DK浼氳皟鐢ㄨ鍑芥暟 private static class DisConnect implements NetSDKLib.fDisConnect { public void invoke(LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) { -- Gitblit v1.9.3