ard-work/pom.xml
@@ -93,7 +93,7 @@ <dependency> <groupId>com.dtflys.forest</groupId> <artifactId>forest-spring-boot-starter</artifactId> <version>1.5.28</version> <version>1.5.33</version> </dependency> <!--lombokä¾èµ--> <dependency> ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -7,12 +7,15 @@ import com.ruoyi.device.camera.domain.ArdCameras; import com.ruoyi.device.camera.domain.CameraCmd; import com.ruoyi.device.camera.service.IArdCamerasService; import com.ruoyi.device.hiksdk.service.IHikClientService; import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.inspect.service.IArdVideoInspectTaskService; import com.ruoyi.media.service.IVtduService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -41,7 +44,7 @@ @Api(tags = "ç¸æºç®¡çæ¥å£") public class ArdCamerasController extends BaseController { @Resource private HikClientServiceImpl sdk; private IHikClientService sdk; @Resource private IArdCamerasService ardCamerasService; @Resource @@ -90,11 +93,14 @@ @Log(title = "ç¸æºè®¾å¤", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ArdCameras camera) { //注é sdk.loginOut(camera.getId()); //ç»å½ sdk.login(camera); return toAjax(ardCamerasService.insertArdCameras(camera)); int i = ardCamerasService.insertArdCameras(camera); if(i>0) { //注é sdk.loginOut(camera.getId()); //弿¥ç»å½ sdk.asyncLogin(camera); } return toAjax(i); } /** @@ -106,10 +112,11 @@ @PutMapping public AjaxResult edit(@RequestBody ArdCameras camera) { int i = ardCamerasService.updateArdCameras(camera); if (i > 0) { if(i>0) { ArdCameras cameras = ardCamerasService.selectArdCamerasById(camera.getId()); sdk.loginOut(cameras.getId()); sdk.login(cameras); sdk.asyncLogin(cameras); } return toAjax(i); } @@ -122,7 +129,8 @@ @Log(title = "ç¸æºè®¾å¤", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { for (String id : ids) { for(String id :ids) { sdk.loginOut(id); } return toAjax(ardCamerasService.deleteArdCamerasByIds(ids)); ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
@@ -12,6 +12,8 @@ import com.ruoyi.device.camera.domain.CameraCmd; import com.ruoyi.device.channel.domain.ArdChannel; import com.ruoyi.device.channel.mapper.ArdChannelMapper; import com.ruoyi.device.hiksdk.service.IHikClientService; import com.ruoyi.media.service.IVtduService; import com.ruoyi.scheduling.domian.SchedulingParam; import com.ruoyi.utils.gis.GisUtil; import com.ruoyi.utils.tools.ArdTool; @@ -45,7 +47,8 @@ @Resource private ArdChannelMapper ardChannelMapper; @Resource private IVtduService vtduService; @PostConstruct public void loadCameras() { @@ -160,6 +163,8 @@ if (res > 0) { for (String id : ids) { redisCache.deleteObject(getCacheKey(id)); //å 餿µåªä½ vtduService.deleteVtduByCameraId(id); //å é¤å½åç¸æºçææéé ardChannelMapper.deleteArdChannelByDeviceId(id); } ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java
@@ -10,9 +10,13 @@ import com.ruoyi.device.channel.service.IArdChannelService; import com.ruoyi.device.hiksdk.common.GlobalVariable; import com.ruoyi.device.hiksdk.service.IHikClientService; import com.ruoyi.media.domain.Vtdu; import com.ruoyi.media.service.IVtduService; import com.ruoyi.utils.forest.MediaClient; import com.sun.jna.Pointer; import lombok.extern.slf4j.Slf4j; import javax.annotation.Resource; import java.util.Comparator; import java.util.List; import java.util.concurrent.PriorityBlockingQueue; @@ -35,6 +39,8 @@ @Override public int invoke(int lUserID, int dwResult, HCNetSDK.NET_DVR_DEVICEINFO_V30 lpDeviceinfo, Pointer pUser) { MediaClient mediaClient=SpringUtils.getBean(MediaClient.class); IVtduService vtduService = SpringUtils.getBean(IVtduService.class); IArdChannelService ardChannelService = SpringUtils.getBean(IArdChannelService.class); IHikClientService hikClientService = SpringUtils.getBean(IHikClientService.class); IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class); @@ -53,10 +59,33 @@ //è·åææ°éé List<ArdChannel> cameraChannelList = hikClientService.getCameraChannelList(camera); if (cameraChannelList.size() > 0) { //æ·»å éé for (ArdChannel channel : cameraChannelList) { channel.setId(IdUtils.simpleUUID()); ardChannelService.insertArdChannel(channel); } //é ç½®å°æµåªä½ for (ArdChannel channel : cameraChannelList) { String name = camera.getId() + "_" + channel.getChanNo(); String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/h264/ch" + channel.getChanNo() + "/main/av_stream"; Vtdu vtdu = vtduService.selectVtduByName(name); if (vtdu == null) { //æ·»å å°æµåªä½ 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 { if (!rtspSource.equals(vtdu.getRtspSource())) { //æ´æ°rtspå°å vtdu.setRtspSource(rtspSource); vtduService.updateVtdu(vtdu); } } } } //å建å¼å¯¼éå if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) { ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
@@ -17,8 +17,11 @@ public interface IHikClientService { void loadHCNetSDKLib(); //ç»å½ void login(ArdCameras cameras); //忥ç»å½ void syncLogin(ArdCameras cameras); //弿¥ç»å½ void asyncLogin(ArdCameras cameras); //ç»å½ææç¸æº void loginAll(); @@ -36,7 +39,7 @@ boolean setFocusPos(CameraCmd cmd); //è·åèç¦å¼ Map<String,Object> getFocusPos(CameraCmd cmd); Map<String, Object> getFocusPos(CameraCmd cmd); //设置é¢ç½®ä½ boolean setPreset(CameraCmd cmd); @@ -45,7 +48,7 @@ boolean gotoPreset(CameraCmd cmd); //è·åç æµåç¼©åæ° Map<String,String> getVideoCompressionCfg(CameraCmd cmd); Map<String, String> getVideoCompressionCfg(CameraCmd cmd); //éé¾ boolean controlDefogcfg(CameraCmd cmd); @@ -109,6 +112,7 @@ //è·åç¸æºééä¿¡æ¯ public List<ArdChannel> getCameraChannelList(ArdCameras camera); //è·åGISä¿¡æ¯æ°æ® public Map<String,Object> getGisInfo(CameraCmd cmd); public Map<String, Object> getGisInfo(CameraCmd cmd); } ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -1,14 +1,20 @@ package com.ruoyi.device.hiksdk.service.impl; import com.ruoyi.alarm.global.domain.GuidePriorityQueue; import com.ruoyi.alarm.global.domain.GuideTask; import com.ruoyi.common.annotation.SdkOperate; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.file.MimeTypeUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.device.camera.domain.CameraCmd; import com.ruoyi.device.camera.service.IArdCamerasService; import com.ruoyi.device.channel.domain.ArdChannel; import com.ruoyi.device.channel.service.IArdChannelService; import com.ruoyi.device.hiksdk.common.GlobalVariable; import com.ruoyi.device.camera.domain.ArdCameras; import com.ruoyi.media.domain.Vtdu; import com.ruoyi.media.service.IVtduService; import com.ruoyi.utils.gis.GisUtil; import com.ruoyi.device.hiksdk.sdk.HCNetSDK; import com.ruoyi.device.hiksdk.service.IHikClientService; @@ -30,6 +36,7 @@ import java.nio.ByteBuffer; import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.PriorityBlockingQueue; import static com.ruoyi.device.hiksdk.sdk.HCNetSDK.*; @@ -44,10 +51,12 @@ @Service public class HikClientServiceImpl implements IHikClientService { @Value("${minio.endpoint}") private static String endpoint; @Resource private IArdCamerasService ardCamerasService; @Resource private IArdChannelService ardChannelService; @Resource private IVtduService vtduService; private static HCNetSDK hCNetSDK; @@ -92,6 +101,7 @@ } } @Override /** * @æè¿° 注åç»å½ åªæ¯æåæ¥ç»éï¼ä¸å®æ¹ä¸å»ºè®®ç´æ¥å¨æ¤æ¥å£ä¸åèæ¶æä½ * @åæ° [dvrLogin] @@ -100,14 +110,13 @@ * @å建æ¶é´ 2023/1/17 16:12 * @ä¿®æ¹äººåå ¶å®ä¿¡æ¯ */ public ArdCameras login1(ArdCameras camera) { public void syncLogin(ArdCameras camera) { // åå§å if (!hCNetSDK.NET_DVR_Init()) { log.error("SDKåå§å失败"); } //æå°æµ·åº·sdkæ¥å¿ if (Platform.isWindows()) { String WIN_PATH = System.getProperty("user.dir") + File.separator + "ardLog" + File.separator + "logs" + File.separator; hCNetSDK.NET_DVR_SetLogToFile(3, WIN_PATH, true); } else { @@ -121,18 +130,84 @@ hCNetSDK.NET_DVR_SetConnectTime(2000, 1); hCNetSDK.NET_DVR_SetReconnect(100000, true); //设å¤ä¿¡æ¯, è¾åºåæ° NET_DVR_DEVICEINFO_V30 m_strDeviceInfo = new NET_DVR_DEVICEINFO_V30(); int lUserID = hCNetSDK.NET_DVR_Login_V30(m_sDeviceIP, m_sPort, m_sUsername, m_sPassword, m_strDeviceInfo); HCNetSDK.NET_DVR_DEVICEINFO_V40 m_strDeviceInfo = new HCNetSDK.NET_DVR_DEVICEINFO_V40(); HCNetSDK.NET_DVR_USER_LOGIN_INFO m_strLoginInfo = new HCNetSDK.NET_DVR_USER_LOGIN_INFO(); // 注å设å¤-ç»å½åæ°ï¼å æ¬è®¾å¤å°åãç»å½ç¨æ·ãå¯ç ç m_strLoginInfo.sDeviceAddress = new byte[HCNetSDK.NET_DVR_DEV_ADDRESS_MAX_LEN]; System.arraycopy(m_sDeviceIP.getBytes(), 0, m_strLoginInfo.sDeviceAddress, 0, m_sDeviceIP.length()); m_strLoginInfo.sUserName = new byte[HCNetSDK.NET_DVR_LOGIN_USERNAME_MAX_LEN]; System.arraycopy(m_sUsername.getBytes(), 0, m_strLoginInfo.sUserName, 0, m_sUsername.length()); m_strLoginInfo.sPassword = new byte[HCNetSDK.NET_DVR_LOGIN_PASSWD_MAX_LEN]; System.arraycopy(m_sPassword.getBytes(), 0, m_strLoginInfo.sPassword, 0, m_sPassword.length()); m_strLoginInfo.wPort = m_sPort; m_strLoginInfo.byVerifyMode = 0; m_strLoginInfo.byLoginMode = 0; //æ¯å¦å¼æ¥ç»å½ï¼0- å¦ï¼1- æ¯ windowsSDK鿝trueåfalse m_strLoginInfo.bUseAsynLogin = false; m_strLoginInfo.write(); //忥ç»å½ int lUserID = hCNetSDK.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo); if (lUserID < 0) { //éæ¾SDKèµæº hCNetSDK.NET_DVR_Cleanup(); int errorCode = hCNetSDK.NET_DVR_GetLastError(); log.error("ç»å½å¼å¸¸ï¼" + errorCode); log.debug(camera.getIp() + ":" + camera.getPort() + "ç»å½å¤±è´¥"); camera.setChanNum(0); camera.setLoginId(-1); camera.setState("0"); } else { if (GlobalVariable.loginMap.containsKey(camera.getId())) { GlobalVariable.loginMap.remove(camera.getId()); } //å é¤ç®¡çéé ardChannelService.deleteArdChannelByDeviceId(camera.getId()); GlobalVariable.loginMap.put(camera.getId(), lUserID); log.debug(camera.getIp() + ":" + camera.getPort() + "ç»å½æå"); camera.setLoginId(lUserID); camera.setState("1"); camera.setChanNum((int) m_strDeviceInfo.struDeviceV30.byChanNum); camera.setStartDChan((int) m_strDeviceInfo.struDeviceV30.byStartDChan); //è·åææ°éé List<ArdChannel> cameraChannelList = getCameraChannelList(camera); if (cameraChannelList.size() > 0) { for (ArdChannel channel : cameraChannelList) { channel.setId(IdUtils.simpleUUID()); ardChannelService.insertArdChannel(channel); } //æ·»å å°æµåªä½ for (ArdChannel channel : cameraChannelList) { String name = camera.getId() + "_" + channel.getChanNo(); String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/h264/ch" + channel.getChanNo() + "/main/av_stream"; Vtdu vtdu = vtduService.selectVtduByName(name); if (vtdu == null) { //æ·»å å°æµåªä½ 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 { if (!rtspSource.equals(vtdu.getRtspSource())) { //æ´æ°rtspå°å vtdu.setRtspSource(rtspSource); vtduService.updateVtdu(vtdu); } } } } //å建å¼å¯¼éå if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) { Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator(); PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator); GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue); } ardCamerasService.updateArdCameras(camera); } GlobalVariable.loginMap.remove(camera.getId()); GlobalVariable.loginMap.put(camera.getId(), lUserID); camera.setLoginId(lUserID); camera.setStartDChan((int) m_strDeviceInfo.byStartChan); return camera; } /** @@ -144,7 +219,7 @@ * @ä¿®æ¹äººåå ¶å®ä¿¡æ¯ */ @Override public void login(ArdCameras camera) { public void asyncLogin(ArdCameras camera) { // åå§å if (!hCNetSDK.NET_DVR_Init()) { log.error("SDKåå§å失败"); @@ -187,6 +262,7 @@ int errorCode = hCNetSDK.NET_DVR_GetLastError(); log.error("ç»å½å¼å¸¸ï¼" + errorCode); } } /** @@ -204,7 +280,8 @@ List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras()); for (ArdCameras camera : ardCameras) { Thread.sleep(500); login(camera); //弿¥ç»å½ asyncLogin(camera); } } catch (Exception ex) { log.error("åå§åç»å½ç¸æºå¼å¸¸ï¼" + ex.getMessage()); @@ -239,12 +316,17 @@ */ @Override public boolean isOnLine(CameraCmd cmd) { String cameraId = cmd.getCameraId(); if (!GlobalVariable.loginMap.containsKey(cameraId)) { try { String cameraId = cmd.getCameraId(); if (!GlobalVariable.loginMap.containsKey(cameraId)) { return false; } Integer userId = GlobalVariable.loginMap.get(cameraId); return hCNetSDK.NET_DVR_RemoteControl(userId, NET_DVR_CHECK_USER_STATUS, null, 0); } catch (Exception ex) { log.error("æ£æµå¨çº¿å¼å¸¸ï¼" + ex.getMessage()); return false; } Integer userId = GlobalVariable.loginMap.get(cameraId); return hCNetSDK.NET_DVR_RemoteControl(userId, HCNetSDK.NET_DVR_CHECK_USER_STATUS, null, 0); } /** @@ -466,7 +548,7 @@ * @ä¿®æ¹äººåå ¶å®ä¿¡æ¯ */ @Override public Map<String,String> getVideoCompressionCfg(CameraCmd cmd) { public Map<String, String> getVideoCompressionCfg(CameraCmd cmd) { String cameraId = cmd.getCameraId(); Integer chanNo = cmd.getChanNo(); if (!GlobalVariable.loginMap.containsKey(cameraId)) { @@ -474,7 +556,7 @@ } Integer userId = GlobalVariable.loginMap.get(cameraId); Map<String,String> map=new HashMap<>(); Map<String, String> map = new HashMap<>(); NET_DVR_COMPRESSIONCFG_V30 compressioncfg = new NET_DVR_COMPRESSIONCFG_V30(); compressioncfg.write(); Pointer pioint = compressioncfg.getPointer(); @@ -484,62 +566,139 @@ if (bool) { compressioncfg.read(); //ç æµç±»åï¼0-è§é¢æµï¼1-å¤åæµï¼0xfe- èªå¨ï¼åæºä¸è´ï¼ String streamType=""; switch(compressioncfg.struNormHighRecordPara.byStreamType) { case 0: streamType="è§é¢æµ";break; case 1: streamType="å¤åæµ";break; default:streamType="æªç¥";break; String streamType = ""; switch (compressioncfg.struNormHighRecordPara.byStreamType) { case 0: streamType = "è§é¢æµ"; break; case 1: streamType = "å¤åæµ"; break; default: streamType = "æªç¥"; break; } //è§é¢ç¼ç ç±»åï¼0-ç§æ264ï¼1-æ åh264ï¼2-æ åmpeg4ï¼7-M-JPEGï¼8-MPEG2ï¼9-SVACï¼10-æ åh265ï¼0xfe- èªå¨ï¼åæºä¸è´ï¼ï¼0xff-æ æ String videoEncType=""; switch (compressioncfg.struNormHighRecordPara.byVideoEncType) { case 0:videoEncType="ç§æ264";break; case 1:videoEncType="æ åh264";break; case 2:videoEncType="æ åmpeg4";break; case 7:videoEncType="M-JPEG";break; case 8:videoEncType="MPEG2";break; case 9:videoEncType="SVAC";break; case 10:videoEncType="æ åh265";break; default: videoEncType="æªç¥";break; String videoEncType = ""; switch (compressioncfg.struNormHighRecordPara.byVideoEncType) { case 0: videoEncType = "ç§æ264"; break; case 1: videoEncType = "æ åh264"; break; case 2: videoEncType = "æ åmpeg4"; break; case 7: videoEncType = "M-JPEG"; break; case 8: videoEncType = "MPEG2"; break; case 9: videoEncType = "SVAC"; break; case 10: videoEncType = "æ åh265"; break; default: videoEncType = "æªç¥"; break; } //è§é¢ç ç String videoBitrate=""; switch (compressioncfg.struNormHighRecordPara.dwVideoBitrate) { case 0:videoBitrate="ä¿ç";break; case 1:videoBitrate="16K(ä¿ç)";break; case 2:videoBitrate="32K";break; case 3:videoBitrate="48k";break; case 4:videoBitrate="64k";break; case 5:videoBitrate="80k";break; case 6:videoBitrate="96k";break; case 7:videoBitrate="128k";break; case 8:videoBitrate="160k";break; case 9:videoBitrate="192k";break; case 10:videoBitrate="224k";break; case 11:videoBitrate="256K";break; case 12:videoBitrate="320K";break; case 13:videoBitrate="384K";break; case 14:videoBitrate="448K";break; case 15:videoBitrate="512K";break; case 16:videoBitrate="640K";break; case 17:videoBitrate="768K";break; case 18:videoBitrate="896K";break; case 19:videoBitrate="1024K";break; case 20:videoBitrate="1280K";break; case 21:videoBitrate="1536K";break; case 22:videoBitrate="1792K";break; case 23:videoBitrate="2048K";break; case 24:videoBitrate="3072K";break; case 25:videoBitrate="4096K";break; case 26:videoBitrate="8192K";break; case 27:videoBitrate="16384K";break; default:videoBitrate="å ¶ä»";break; String videoBitrate = ""; switch (compressioncfg.struNormHighRecordPara.dwVideoBitrate) { case 0: videoBitrate = "ä¿ç"; break; case 1: videoBitrate = "16K(ä¿ç)"; break; case 2: videoBitrate = "32K"; break; case 3: videoBitrate = "48k"; break; case 4: videoBitrate = "64k"; break; case 5: videoBitrate = "80k"; break; case 6: videoBitrate = "96k"; break; case 7: videoBitrate = "128k"; break; case 8: videoBitrate = "160k"; break; case 9: videoBitrate = "192k"; break; case 10: videoBitrate = "224k"; break; case 11: videoBitrate = "256K"; break; case 12: videoBitrate = "320K"; break; case 13: videoBitrate = "384K"; break; case 14: videoBitrate = "448K"; break; case 15: videoBitrate = "512K"; break; case 16: videoBitrate = "640K"; break; case 17: videoBitrate = "768K"; break; case 18: videoBitrate = "896K"; break; case 19: videoBitrate = "1024K"; break; case 20: videoBitrate = "1280K"; break; case 21: videoBitrate = "1536K"; break; case 22: videoBitrate = "1792K"; break; case 23: videoBitrate = "2048K"; break; case 24: videoBitrate = "3072K"; break; case 25: videoBitrate = "4096K"; break; case 26: videoBitrate = "8192K"; break; case 27: videoBitrate = "16384K"; break; default: videoBitrate = "å ¶ä»"; break; } //è§é¢è¾åºå£å辨çï¼0- 1024x768ï¼1- 1280x720ï¼2-1280x1024ï¼3- 1680x1050ï¼4- 1920x1080ï¼5- 3840*2160 String resolution=""; String resolution = ""; switch (compressioncfg.struNormHighRecordPara.byResolution) { case 0: resolution = "DCIF(528*384/528*320)"; @@ -605,10 +764,10 @@ resolution = "ä¸å¨å½åå辨çç´¢å¼ï¼è¯·è系管çåæ·»å "; break; } map.put("resolution",resolution); map.put("videoBitrate",videoBitrate); map.put("videoEncType",videoEncType); map.put("streamType",streamType); map.put("resolution", resolution); map.put("videoBitrate", videoBitrate); map.put("videoEncType", videoEncType); map.put("streamType", streamType); } else { int code = hCNetSDK.NET_DVR_GetLastError(); ard-work/src/main/java/com/ruoyi/media/controller/MediaController.java
@@ -7,6 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.media.domain.Config; import com.ruoyi.media.domain.StreamInfo; import com.ruoyi.media.domain.Vtdu; import com.ruoyi.media.service.IMediaService; @@ -56,9 +57,9 @@ map.get("rtspUrl"); Vtdu vtdu = new Vtdu(); vtdu.setName(streamInfo.getName()); vtdu.setSourceUrl(streamInfo.getRtspSource()); vtdu.setRtspSource(streamInfo.getRtspSource()); vtdu.setIsCode(streamInfo.getIsCode()); vtdu.setCodeType(streamInfo.getMode()); vtdu.setMode(streamInfo.getMode()); vtdu.setRtspUrl(map.get("rtspUrl")); vtdu.setRtmpUrl(map.get("rtmpUrl")); vtdu.setWebrtcUrl(map.get("webrtcUrl")); @@ -78,9 +79,9 @@ Map<String, String> map = mediaService.editPath(streamInfo.getName(), streamInfo.getRtspSource(), streamInfo.getMode(), streamInfo.getIsCode()); Vtdu vtdu = new Vtdu(); vtdu.setName(streamInfo.getName()); vtdu.setSourceUrl(streamInfo.getRtspSource()); vtdu.setRtspSource(streamInfo.getRtspSource()); vtdu.setIsCode(streamInfo.getIsCode()); vtdu.setCodeType(streamInfo.getMode()); vtdu.setMode(streamInfo.getMode()); vtdu.setRtspUrl(map.get("rtspUrl")); vtdu.setRtmpUrl(map.get("rtmpUrl")); vtdu.setWebrtcUrl(map.get("webrtcUrl")); @@ -178,8 +179,6 @@ return getDataTable(mediaService.getPushStreamList()); } /** * è·åææµå表 */ @@ -191,4 +190,14 @@ startPage(); return getDataTable(mediaService.getPullStreamList()); } /** * é ç½®æµåªä½åæ° */ @PostMapping("/setConfig") @ApiOperation("é ç½®æµåªä½åæ°") @ApiOperationSupport(order = 8) public AjaxResult setConfig(@RequestBody Config config) { return AjaxResult.success(mediaService.setConfig(config)); } } ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java
@@ -1,7 +1,12 @@ package com.ruoyi.media.controller; import java.util.List; import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.media.service.IMediaService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -77,6 +82,12 @@ @PostMapping public AjaxResult add(@RequestBody Vtdu vtdu) { if (StringUtils.isEmpty(vtdu.getName())) { return AjaxResult.error("ééåç§°ä¸è½ä¸ºç©º"); } if (StringUtils.isEmpty(vtdu.getRtspSource())) { return AjaxResult.error("rtspå°åä¸è½ä¸ºç©º"); } return toAjax(vtduService.insertVtdu(vtdu)); } ard-work/src/main/java/com/ruoyi/media/domain/Config.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package com.ruoyi.media.domain; import lombok.Data; import java.util.List; /** * @Description: * @ClassName: Config * @Author: åèä¹ * @Date: 2023å¹´10æ13æ¥15:13:40 **/ @Data public class Config { private boolean webrtc; private List<String> webrtcICEHostNAT1To1IPs; private String webrtcICETCPMuxAddress; } ard-work/src/main/java/com/ruoyi/media/domain/StreamInfo.java
@@ -67,7 +67,7 @@ String remoteAddr; /** * æ¨¡å¼ * è§£ç æ¨¡å¼ */ String mode; ard-work/src/main/java/com/ruoyi/media/domain/Vtdu.java
@@ -27,7 +27,7 @@ * rtspæºå°å */ @Excel(name = "rtspæºå°å") private String sourceUrl; private String rtspSource; /** * æ¯å¦è½¬ç @@ -36,10 +36,10 @@ private String isCode; /** * è½¬ç æ¨¡å¼ * ç¼è§£ç æ¨¡å¼ */ @Excel(name = "è½¬ç æ¨¡å¼") private String codeType; @Excel(name = "ç¼è§£ç 模å¼") private String mode; /** * rtspææ¾å°å @@ -53,4 +53,8 @@ * webrtcææ¾å°å */ String webrtcUrl; /** * ç¸æºID */ String cameraId; } ard-work/src/main/java/com/ruoyi/media/mapper/VtduMapper.java
@@ -33,7 +33,7 @@ * @param vtdu æµåªä½ç®¡ç * @return ç»æ */ public int insertVtdu(Vtdu vtdu); public Integer insertVtdu(Vtdu vtdu); /** * ä¿®æ¹æµåªä½ç®¡ç @@ -41,7 +41,7 @@ * @param vtdu æµåªä½ç®¡ç * @return ç»æ */ public int updateVtdu(Vtdu vtdu); public Integer updateVtdu(Vtdu vtdu); /** * å 餿µåªä½ç®¡ç @@ -57,4 +57,11 @@ * @return ç»æ */ public int deleteVtduByNames(String[] names); /** * å 餿µåªä½ç®¡çä¿¡æ¯ * * @param cameraId ç¸æºID * @return ç»æ */ public int deleteVtduByCameraId(String cameraId); } ard-work/src/main/java/com/ruoyi/media/service/IMediaService.java
@@ -1,5 +1,6 @@ package com.ruoyi.media.service; import com.dtflys.forest.annotation.Var; import com.ruoyi.media.domain.*; import java.lang.reflect.MalformedParameterizedTypeException; @@ -11,12 +12,13 @@ * å¢å è·¯å¾ * name åç§° * rtspPath rtspå°å * mode 模å¼ï¼å®æ¶/æé * mode 模å¼ï¼gpu硬解ç /cpu软解ç * isCode æ¯å¦è½¬ç * åèä¹ * 2023/8/12 13:56:52 */ Map<String,String> addPath(String name, String sourceUrl, String mode, String isCode); Map<String, String> addPath(String name, String sourceUrl, String mode, String isCode); /** * ä¿®æ¹è·¯å¾ * name åç§° @@ -26,13 +28,17 @@ * åèä¹ * 2023/8/12 13:56:52 */ Map<String,String> editPath(String name, String sourceUrl, String mode, String isCode); Map<String, String> editPath(String name, String sourceUrl, String mode, String isCode); StreamInfo getPathInfo(String name); void removePath(String[] names); void removePath(String name); List<StreamInfo> paths(); List<String> getNameList(); RtspSession getRtspSessionById(String sessionId); @@ -49,4 +55,11 @@ Boolean kickRtmpSession(String sessionId); Boolean kickWebrtcSession(String sessionId); /** * é ç½®æµåªä½åæ° * åèä¹ * 2023/10/13 15:17:57 */ public String setConfig(Config config); } ard-work/src/main/java/com/ruoyi/media/service/IVtduService.java
@@ -58,4 +58,12 @@ * @return ç»æ */ public int deleteVtduByName(String name); /** * å 餿µåªä½ç®¡çä¿¡æ¯ * * @param cameraId ç¸æºID * @return ç»æ */ public int deleteVtduByCameraId(String cameraId); } ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
@@ -1,6 +1,9 @@ package com.ruoyi.media.service.impl; import com.alibaba.fastjson2.JSONObject; import com.dtflys.forest.Forest; import com.dtflys.forest.exceptions.ForestNetworkException; import com.dtflys.forest.exceptions.ForestRuntimeException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; @@ -16,6 +19,7 @@ import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @@ -36,147 +40,102 @@ @Service @Slf4j(topic = "cmd") @Order(2) public class MediaServiceImpl implements IMediaService, ApplicationRunner { @Resource VtduMapper vtduMapper; public class MediaServiceImpl implements IMediaService { @Resource MediaClient mediaClient; @Value("${mediamtx.host}") String mediamtxHost; @Value("${mediamtx.software_decoding}") Boolean softwareDecoding; /** * æ·»å æµåªä½ * name ç¸æºID * sourceUrl rtspå°å * isCode 0-ä¸è½¬ç 1-转ç * mode 0-gpu硬解ç 1-cpu软解ç * <p> * åèä¹ * 2023/10/12 9:03:41 */ @Override public void run(ApplicationArguments args) { try { log.debug("å¼å§å è½½æµåªä½å表"); List<StreamInfo> paths = paths(); for (StreamInfo path : paths) { mediaClient.removePath(path.getName()); } List<Vtdu> vtduList = vtduMapper.selectVtduList(new Vtdu()); for (Vtdu vtdu : vtduList) { Map<String, String> map = addPath(vtdu.getName(), vtdu.getSourceUrl(), vtdu.getCodeType(), vtdu.getIsCode()); vtdu.setRtspUrl(map.get("rtspUrl")); vtdu.setRtmpUrl(map.get("rtmpUrl")); vtdu.setWebrtcUrl(map.get("webrtcUrl")); vtdu.setUpdateTime(DateUtils.getNowDate()); vtduMapper.updateVtdu(vtdu); } } catch (Exception ex) { log.error("å è½½æµåªä½å表å¼å¸¸:" + ex.getMessage()); } } public Map<String, String> addPath(String name, String sourceUrl, String mode, String isCode) { @Override public Map<String,String> addPath(String name, String sourceUrl, String mode, String isCode) { String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name; String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name; String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name; Conf mediaInfo = new Conf(); String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/"; //-vcodec libx264 //æå®è§é¢ç¼ç å¨ä¸º libx264ï¼ä½¿ç¨ H.264 ç¼ç æ ¼å¼è¿è¡è§é¢å缩 //-preset ultrafast //--presetç忰䏻è¦è°èç¼ç é度åè´¨éçå¹³è¡¡ï¼æultrafastï¼è½¬ç é度æå¿«ï¼è§é¢å¾å¾ä¹ææ¨¡ç³ï¼ãsuperfastãveryfastãfasterãfastãmediumãslowãslowerãveryslowãplaceboè¿10个é项ï¼ä»å¿«å°æ ¢ //-r 25 //设置è¾åºè§é¢ç帧ç为 25 帧/ç§ //-g 20 //å ³é®å¸§é´é20 //-sc_threshold 0 //å°å ¶è®¾ç½®ä¸º0ï¼-sc_threshold 0ï¼ç¦ç¨åºæ¯ååæ£æµ //-rtsp_transport tcp //è¿ä¸ªé项åè¯ FFmpeg ä½¿ç¨ TCP ä½ä¸º RTSP çä¼ è¾åè®® //-threads 4: æå®è¦ä½¿ç¨ççº¿ç¨æ°ä¸º 4ã//è¿å 许 FFmpeg å¨å¤æ ¸å¤çå¨ä¸ä½¿ç¨å¤ä¸ªçº¿ç¨æ¥è¿è¡è§é¢ç¼ç ï¼ä»¥å å¿«é度ã // -i //ç¨äºæå®è¾å ¥åªä½æä»¶æè¾å ¥æµçå°å // -bf 0 ç¦ç¨B帧ï¼å 为webrtcå¨ç½é¡µè°ç¨æ¶æ§å¶å°ä¸ç´è¾åº WebRTC doesnât support H264 streams with B-frames //-f rtsp //è¿ä¸ªé项åè¯ FFmpeg è¾åºä¸º RTSP æ ¼å¼ã //-acodec opus //é³é¢è½¬ç opus //-acodec pcm_alaw //é³é¢è½¬ç PCMA(G711A) //-strict é项ç¨äºè®¾ç½®é³é¢ç¼è§£ç çä¸¥æ ¼çº§å«ï¼è -2 æ¯å ¶åæ°ä¹ä¸ã卿©æçæ¬ç FFmpeg ä¸ï¼-strict é项ç¨äºè®¾ç½®é³é¢ç¼è§£ç å¨çè¡ä¸ºï¼å ¶ä¸ -2 表示使ç¨éå¸¸ä¸¥æ ¼çæ¨¡å¼ã //CPU软解ç ç¼ç //String cmd = rootPath + "/lib/mediamtx/" +"ffmpeg -rtsp_transport tcp -i " + rtspPath + " -vcodec libx264 -preset:v ultrafast -r 25 -threads 4 -b:v 2048k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; //GPU硬解ç ç¼ç -hwaccel cuvid -c:v h264_cuvid 使ç¨cudaè§£ç -c:v h264_nvenc 使ç¨cudaç¼ç //String cmd = rootPath + "/lib/mediamtx/" + "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport udp -i " + rtspPath + " -c:v h264_nvenc -r 25 -threads 4 -b:v 2048k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; if (isCode.equals("1")) { String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 25 -sc_threshold 0 -threads 6 -b:v 2048k -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; if (!softwareDecoding) { cmd = "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; mediaInfo.setSource("publisher"); //é»è®¤è½¯è§£ç String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; if (mode.equals("0")) {//硬解ç cmd = "ffmpeg -hwaccel cuvid -c:v hevc_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; } if (mode.equals("0")) { mediaInfo.setRunondemand(cmd); mediaInfo.setRunondemandrestart(true); mediaInfo.setRunondemandcloseafter("5s"); } else { mediaInfo.setRunoninit(cmd); mediaInfo.setRunoninitrestart(true); } mediaInfo.setRunondemand(cmd); mediaInfo.setRunondemandrestart(true); mediaInfo.setRunondemandcloseafter("5s"); } else { mediaInfo.setSource(sourceUrl); mediaInfo.setSourceondemand(true); } mediaInfo.setMaxReaders(100); mediaInfo.setSourceprotocol("tcp"); mediaClient.addPath(name, mediaInfo); Map<String,String> map=new HashMap<>(); map.put("rtspUrl",rtspUrl); map.put("rtmpUrl",rtmpUrl); map.put("webrtcUrl",webrtcUrl); List<String> nameList=new ArrayList<>(); String paths = mediaClient.paths(); JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class); List<Items> items = jsonsRoot.getItems(); for (Items item : items) { nameList.add(item.getName()); } if(!nameList.contains(name)) { mediaClient.addPath(name, mediaInfo); } Map<String, String> map = new HashMap<>(); map.put("rtspUrl", rtspUrl); map.put("rtmpUrl", rtmpUrl); map.put("webrtcUrl", webrtcUrl); return map; } @Override public Map<String, String> editPath(String name, String sourceUrl, String mode, String isCode) { String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name; String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name; String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name; Map<String, String> map = new HashMap<>(); try { String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name; String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name; String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name; Conf mediaInfo = new Conf(); String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/"; //-vcodec libx264 //æå®è§é¢ç¼ç å¨ä¸º libx264ï¼ä½¿ç¨ H.264 ç¼ç æ ¼å¼è¿è¡è§é¢å缩 //-preset ultrafast //--presetç忰䏻è¦è°èç¼ç é度åè´¨éçå¹³è¡¡ï¼æultrafastï¼è½¬ç é度æå¿«ï¼è§é¢å¾å¾ä¹ææ¨¡ç³ï¼ãsuperfastãveryfastãfasterãfastãmediumãslowãslowerãveryslowãplaceboè¿10个é项ï¼ä»å¿«å°æ ¢ //-r 25 //设置è¾åºè§é¢ç帧ç为 25 帧/ç§ //-g 20 //å ³é®å¸§é´é20 //-sc_threshold 0 //å°å ¶è®¾ç½®ä¸º0ï¼-sc_threshold 0ï¼ç¦ç¨åºæ¯ååæ£æµ //-rtsp_transport tcp //è¿ä¸ªé项åè¯ FFmpeg ä½¿ç¨ TCP ä½ä¸º RTSP çä¼ è¾åè®® //-threads 4: æå®è¦ä½¿ç¨ççº¿ç¨æ°ä¸º 4ã//è¿å 许 FFmpeg å¨å¤æ ¸å¤çå¨ä¸ä½¿ç¨å¤ä¸ªçº¿ç¨æ¥è¿è¡è§é¢ç¼ç ï¼ä»¥å å¿«é度ã // -i //ç¨äºæå®è¾å ¥åªä½æä»¶æè¾å ¥æµçå°å // -bf 0 ç¦ç¨B帧ï¼å 为webrtcå¨ç½é¡µè°ç¨æ¶æ§å¶å°ä¸ç´è¾åº WebRTC doesnât support H264 streams with B-frames //-f rtsp //è¿ä¸ªé项åè¯ FFmpeg è¾åºä¸º RTSP æ ¼å¼ã //-acodec opus //é³é¢è½¬ç opus //CPU软解ç ç¼ç //String cmd = rootPath + "/lib/mediamtx/" +"ffmpeg -rtsp_transport tcp -i " + rtspPath + " -vcodec libx264 -preset:v ultrafast -r 25 -threads 4 -b:v 2048k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; //GPU硬解ç ç¼ç -hwaccel cuvid -c:v h264_cuvid 使ç¨cudaè§£ç -c:v h264_nvenc 使ç¨cudaç¼ç //String cmd = rootPath + "/lib/mediamtx/" + "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport udp -i " + rtspPath + " -c:v h264_nvenc -r 25 -threads 4 -b:v 2048k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; if (isCode.equals("1")) { mediaInfo.setSource("publisher"); String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 25 -sc_threshold 0 -threads 6 -b:v 2048k -acodec opus -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; if (!softwareDecoding) { cmd = "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -threads 6 -b:v 2048k -bf 0 -acodec opus -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; } if (mode.equals("0")) { Conf mediaInfo = new Conf(); String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/"; if (isCode.equals("1")) { mediaInfo.setSource("publisher"); //é»è®¤è½¯è§£ç String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; if (mode.equals("0")) {//硬解ç cmd = "ffmpeg -hwaccel cuvid -c:v hevc_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH"; } mediaInfo.setRunondemand(cmd); mediaInfo.setRunondemandcloseafter("5s"); mediaInfo.setRunondemandrestart(true); mediaInfo.setRunoninit(""); mediaInfo.setRunoninitrestart(false); mediaInfo.setRunondemandcloseafter("5s"); } else { mediaInfo.setRunoninit(cmd); mediaInfo.setRunoninitrestart(true); mediaInfo.setRunondemand(""); mediaInfo.setRunondemandrestart(false); mediaInfo.setSource(sourceUrl); } } else { mediaInfo.setSource(sourceUrl); mediaInfo.setSourceondemand(true); mediaInfo.setRunondemand(""); mediaInfo.setRunondemandrestart(false); mediaInfo.setRunoninit(""); mediaInfo.setRunoninitrestart(false); mediaInfo.setMaxReaders(100); mediaInfo.setSourceprotocol("tcp"); mediaClient.editPath(name, mediaInfo); // Map<String,String> map=new HashMap<>(); map.put("rtspUrl", rtspUrl); map.put("rtmpUrl", rtmpUrl); map.put("webrtcUrl", webrtcUrl); } catch (ForestNetworkException ex) { log.error(ex.getMessage()); } mediaInfo.setMaxReaders(100); mediaInfo.setSourceprotocol("tcp"); mediaClient.editPath(name, mediaInfo); Map<String,String> map=new HashMap<>(); map.put("rtspUrl",rtspUrl); map.put("rtmpUrl",rtmpUrl); map.put("webrtcUrl",webrtcUrl); return map; } @@ -215,6 +174,11 @@ } @Override public void removePath(String name) { mediaClient.removePath(name); } @Override public List<StreamInfo> paths() { String list = mediaClient.paths(); JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class); @@ -225,14 +189,9 @@ //ID String name = item.getName(); info.setName(name); String runOn; String runOn = ""; if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) { runOn = item.getConf().getRunondemand(); info.setMode("0"); } else { runOn = item.getConf().getRunoninit(); //runOn = item.getConf().getRunonready(); info.setMode("1"); } //RTSPæºå°å Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn); @@ -327,12 +286,9 @@ info.setRemoteAddr(rtspSession.getRemoteAddr()); } //RTSPæºå°å String runOn; String runOn = ""; if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) { runOn = item.getConf().getRunondemand(); } else { runOn = item.getConf().getRunoninit(); //runOn = item.getConf().getRunonready(); } Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn); if (matcher.find()) { @@ -492,5 +448,27 @@ return false; } } /** * è·åæµåªä½nameå表 * åèä¹ * 2023/10/13 14:19:07 */ @Override public List<String> getNameList() { List<String> nameList=new ArrayList<>(); String paths = mediaClient.paths(); JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class); List<Items> items = jsonsRoot.getItems(); for (Items item : items) { nameList.add(item.getName()); } return nameList; } /** * é ç½®æµåªä½åæ° */ @Override public String setConfig(Config config) { return mediaClient.setConfig(config); } } ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java
@@ -1,11 +1,19 @@ package com.ruoyi.media.service.impl; import java.util.HashMap; import java.util.List; import java.util.Map; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.media.service.IMediaService; import com.ruoyi.utils.forest.MediaClient; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.ruoyi.media.mapper.VtduMapper; import com.ruoyi.media.domain.Vtdu; @@ -20,9 +28,12 @@ * @date 2023-08-29 */ @Service @Slf4j public class VtduServiceImpl implements IVtduService { @Resource private VtduMapper vtduMapper; @Resource private IMediaService mediaService; /** * æ¥è¯¢æµåªä½ç®¡ç @@ -54,7 +65,16 @@ */ @Override public int insertVtdu(Vtdu vtdu) { vtdu.setCreateBy(SecurityUtils.getUserId()); log.info("æµåªä½ã" + vtdu.getName() + "ãééæ·»å "); Map<String, String> map = mediaService.addPath(vtdu.getName(), vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode()); vtdu.setRtspUrl(map.get("rtspUrl")); vtdu.setRtmpUrl(map.get("rtmpUrl")); vtdu.setWebrtcUrl(map.get("webrtcUrl")); vtdu.setName(vtdu.getName()); vtdu.setRtspSource(vtdu.getRtspSource()); vtdu.setIsCode(vtdu.getIsCode()); vtdu.setMode(vtdu.getMode()); vtdu.setCreateTime(DateUtils.getNowDate()); return vtduMapper.insertVtdu(vtdu); } @@ -67,7 +87,16 @@ */ @Override public int updateVtdu(Vtdu vtdu) { vtdu.setUpdateBy(SecurityUtils.getUserId()); log.info("æµåªä½ã" + vtdu.getName() + "ãééæ´æ°"); Map<String, String> map = mediaService.editPath(vtdu.getName(), vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode()); vtdu.setName(vtdu.getName()); vtdu.setRtspSource(vtdu.getRtspSource()); vtdu.setIsCode(vtdu.getIsCode()); vtdu.setMode(vtdu.getMode()); vtdu.setRtspUrl(map.get("rtspUrl")); vtdu.setRtmpUrl(map.get("rtmpUrl")); vtdu.setWebrtcUrl(map.get("webrtcUrl")); vtdu.setUpdateTime(DateUtils.getNowDate()); return vtduMapper.updateVtdu(vtdu); } @@ -80,6 +109,7 @@ */ @Override public int deleteVtduByNames(String[] names) { mediaService.removePath(names); return vtduMapper.deleteVtduByNames(names); } @@ -93,4 +123,23 @@ public int deleteVtduByName(String name) { return vtduMapper.deleteVtduByName(name); } /** * å 餿µåªä½ç®¡çä¿¡æ¯ * * @param cameraId ç¸æºID * @return ç»æ */ @Override public int deleteVtduByCameraId(String cameraId) { Vtdu vtdu = new Vtdu(); vtdu.setCameraId(cameraId); List<Vtdu> vtdus = vtduMapper.selectVtduList(vtdu); if (vtdus.size() > 0) { for (Vtdu v : vtdus) { mediaService.removePath(v.getName()); } } return vtduMapper.deleteVtduByCameraId(cameraId); } } ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java
@@ -1,7 +1,9 @@ package com.ruoyi.utils.forest; import com.dtflys.forest.annotation.*; import com.dtflys.forest.callback.OnError; import com.ruoyi.media.domain.Conf; import com.ruoyi.media.domain.Config; import com.ruoyi.media.domain.Items; /** @@ -16,70 +18,84 @@ /** * å¢å è·¯å¾ */ @Post("/config/paths/add/{name}") String addPath( @Var("name") String name, @JSONBody Conf body); @Post(url = "/config/paths/add/{name}") public String addPath(@Var("name") String name, @JSONBody Conf body); /** * ä¿®æ¹è·¯å¾ */ @Post("/config/paths/edit/{name}") String editPath( @Var("name") String name, @JSONBody Conf body); @Post(url = "/config/paths/edit/{name}", async = true) public String editPath(@Var("name") String name, @JSONBody Conf body); /** * ç§»é¤è·¯å¾ */ @Post("/config/paths/remove/{name}") String removePath(@Var("name") String name); public String removePath(@Var("name") String name); /** * è·åè·¯å¾è¯¦æ */ @Get("/paths/get/{name}") Items getPathInfo(@Var("name") String name); public Items getPathInfo(@Var("name") String name); /** * æ¥è¯¢ææè·¯å¾ */ @Get("/paths/list") String paths(); public String paths(); /** * æ¥è¯¢æærtspä¼è¯ */ @Get("/rtspsessions/list") String rtspsessions(); public String rtspsessions(); /** * æ¥è¯¢æærtspè¿æ¥ */ @Get("/rtspconns/list") String rtspconns(); public String rtspconns(); /** * æsessionIdæ¥è¯¢rtspä¼è¯ */ @Get("/rtspsessions/get/{sessionId}") String getRtspsessionById(@Var("sessionId") String sessionId); public String getRtspsessionById(@Var("sessionId") String sessionId); /** * æsessionIdæ¥è¯¢webrtcä¼è¯ */ @Get("/webrtcsessions/get/{sessionId}") String getWebrtcsessionById(@Var("sessionId") String sessionId); public String getWebrtcsessionById(@Var("sessionId") String sessionId); /** * æsessionIdæ¥è¯¢rtmpä¼è¯ */ @Get("/rtmpconns/get/{sessionId}") String getRtmpsessionById(@Var("sessionId") String sessionId); public String getRtmpsessionById(@Var("sessionId") String sessionId); /** * æsessionIdå é¤rtspä¼è¯ */ @Post("/rtspsessions/kick/{sessionId}") String kickRtspSessions(@Var("sessionId") String sessionId); public String kickRtspSessions(@Var("sessionId") String sessionId); /** * æsessionIdå é¤rtmpè¿æ¥ */ @Post("/rtmpconns/kick/{sessionId}") String kickRtmpSessions(@Var("sessionId") String sessionId); public String kickRtmpSessions(@Var("sessionId") String sessionId); /** * æsessionIdå é¤webrtcä¼è¯ */ @Post("/webrtcsessions/kick/{sessionId}") String kickWebrtcSessions(@Var("sessionId") String sessionId); public String kickWebrtcSessions(@Var("sessionId") String sessionId); /** * é ç½®æµåªä½åæ° */ @Post("/config/set") public String setConfig(@JSONBody Config config); } ard-work/src/main/resources/mapper/vtdu/VtduMapper.xml
@@ -6,12 +6,13 @@ <resultMap type="Vtdu" id="VtduResult"> <result property="name" column="name"/> <result property="sourceUrl" column="source_url"/> <result property="rtspSource" column="rtsp_source"/> <result property="isCode" column="is_code"/> <result property="codeType" column="code_type"/> <result property="mode" column="mode"/> <result property="rtspUrl" column="rtsp_url"/> <result property="rtmpUrl" column="rtmp_url"/> <result property="webrtcUrl" column="webrtc_url"/> <result property="cameraId" column="camera_id"/> <result property="createBy" column="create_by"/> <result property="createTime" column="create_time"/> <result property="updateBy" column="update_by"/> @@ -20,12 +21,13 @@ <sql id="selectVtduVo"> select name, source_url, rtsp_source, is_code, code_type, mode, rtsp_url, rtmp_url, webrtc_url, camera_id, create_by, create_time, update_by, @@ -37,9 +39,10 @@ <include refid="selectVtduVo"/> <where> <if test="name != null and name != ''">and name like '%'||#{name}||'%'</if> <if test="sourceUrl != null and sourceUrl != ''">and source_url = #{sourceUrl}</if> <if test="rtspSource != null and rtspSource != ''">and rtsp_source = #{rtspSource}</if> <if test="isCode != null and isCode != ''">and is_code = #{isCode}</if> <if test="codeType != null and codeType != ''">and code_type = #{codeType}</if> <if test="mode != null and mode != ''">and mode = #{mode}</if> <if test="cameraId != null and cameraId != ''">and camera_id = #{cameraId}</if> </where> </select> @@ -52,12 +55,13 @@ insert into vtdu <trim prefix="(" suffix=")" suffixOverrides=","> <if test="name != null">name,</if> <if test="sourceUrl != null">source_url,</if> <if test="rtspSource != null">rtsp_source,</if> <if test="isCode != null">is_code,</if> <if test="codeType != null">code_type,</if> <if test="mode != null">mode,</if> <if test="rtspUrl != null">rtsp_url,</if> <if test="rtmpUrl != null">rtmp_url,</if> <if test="webrtcUrl != null">webrtc_url,</if> <if test="cameraId != null">camera_id,</if> <if test="createBy != null">create_by,</if> <if test="createTime != null">create_time,</if> <if test="updateBy != null">update_by,</if> @@ -65,12 +69,13 @@ </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="name != null">#{name},</if> <if test="sourceUrl != null">#{sourceUrl},</if> <if test="rtspSource != null">#{rtspSource},</if> <if test="isCode != null">#{isCode},</if> <if test="codeType != null">#{codeType},</if> <if test="mode != null">#{mode},</if> <if test="rtspUrl != null">#{rtspUrl},</if> <if test="rtmpUrl != null">#{rtmpUrl},</if> <if test="webrtcUrl != null">#{webrtcUrl},</if> <if test="cameraId != null">#{cameraId},</if> <if test="createBy != null">#{createBy},</if> <if test="createTime != null">#{createTime},</if> <if test="updateBy != null">#{updateBy},</if> @@ -81,12 +86,13 @@ <update id="updateVtdu" parameterType="Vtdu"> update vtdu <trim prefix="SET" suffixOverrides=","> <if test="sourceUrl != null">source_url = #{sourceUrl},</if> <if test="rtspSource != null">rtsp_source = #{rtspSource},</if> <if test="isCode != null">is_code = #{isCode},</if> <if test="codeType != null">code_type = #{codeType},</if> <if test="mode != null">mode = #{mode},</if> <if test="rtspUrl != null">rtsp_url = #{rtspUrl},</if> <if test="rtmpUrl != null">rtmp_url = #{rtmpUrl},</if> <if test="webrtcUrl != null">webrtc_url = #{webrtcUrl},</if> <if test="cameraId != null">camera_id = #{cameraId},</if> <if test="createBy != null">create_by = #{createBy},</if> <if test="createTime != null">create_time = #{createTime},</if> <if test="updateBy != null">update_by = #{updateBy},</if> @@ -107,4 +113,9 @@ #{name} </foreach> </delete> <delete id="deleteVtduByCameraId" parameterType="String"> delete from vtdu where camera_id = #{cameraId} </delete> </mapper> ard-work/src/main/resources/templates/preview.html
@@ -107,6 +107,8 @@ </div> <script> console.log(RTCRtpReceiver.getCapabilities('video').codecs) console.log(RTCRtpReceiver.getCapabilities('audio').codecs) //whepæä½æ¹æ³ const linkToIceServers = (links) => ( (links !== null) ? links.split(', ').map((link) => { ruoyi-admin/src/main/resources/application.yml
@@ -44,7 +44,7 @@ global-config: banner: off # å ³émybatispluså¯å¨å¾æ db-config: #主é®ä¸ç¨MyBatis plusçéªè±ç®æ³,ç¨æ°æ®åºç主é®èªå¢ id-type: auto id-type: uuid # configuration: # # æ¯å¦å¼å¯èªå¨é©¼å³°å½åè§åæ å°:仿°æ®åºååå°Java屿§é©¼å³°å½åç类似æ å° # map-underscore-to-camel-case: true ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
@@ -1,15 +1,24 @@ package com.ruoyi.quartz.task; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.device.camera.domain.ArdCameras; import com.ruoyi.device.camera.domain.CameraCmd; import com.ruoyi.device.camera.service.IArdCamerasService; import com.ruoyi.device.channel.domain.ArdChannel; import com.ruoyi.device.hiksdk.service.IHikClientService; import com.ruoyi.media.domain.Items; import com.ruoyi.media.domain.JsonsRoot; import com.ruoyi.media.domain.Vtdu; import com.ruoyi.media.service.IMediaService; import com.ruoyi.media.service.IVtduService; import com.ruoyi.rongcloud.service.RongCloudService; import com.ruoyi.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; /** @@ -29,6 +38,10 @@ IArdCamerasService iArdCamerasService; @Resource IHikClientService iHikClientService; @Resource IVtduService vtduService; @Resource IMediaService mediaService; /** * åæ¥ç¸æºå¨çº¿ç¶æ @@ -36,21 +49,26 @@ * 2023/10/8 14:54:41 */ public void cameraState() { List<ArdCameras> ardCameras = iArdCamerasService.selectArdCamerasListNoDataScope(new ArdCameras()); for (ArdCameras camera : ardCameras) { CameraCmd cmd = new CameraCmd(); cmd.setCameraId(camera.getId()); boolean onLineNew = iHikClientService.isOnLine(cmd);//ç¸æºå®æ¶ç¶æ boolean onLineOld = "1".equals(camera.getState());//ç¸æºåå²ç¶æ //å½ç¶æåçååæ¶ï¼æ´æ°å®æ¶ç¶æ if (onLineNew != onLineOld) { if (onLineNew) { camera.setState("1"); } else { camera.setState("0"); try { List<ArdCameras> ardCameras = iArdCamerasService.selectArdCamerasListNoDataScope(new ArdCameras()); for (ArdCameras camera : ardCameras) { CameraCmd cmd = new CameraCmd(); cmd.setCameraId(camera.getId()); boolean onLineNew = iHikClientService.isOnLine(cmd);//ç¸æºå®æ¶ç¶æ boolean onLineOld = "1".equals(camera.getState());//ç¸æºåå²ç¶æ //å½ç¶æåçååæ¶ï¼æ´æ°å®æ¶ç¶æ if (onLineNew != onLineOld) { if (onLineNew) { camera.setState("1"); } else { camera.setState("0"); } iArdCamerasService.updateArdCameras(camera); } iArdCamerasService.updateArdCameras(camera); } } catch (Exception ex) { log.error("åæ¥ç¸æºå¨çº¿ç¶æå¼å¸¸:" + ex.getMessage()); } } @@ -80,4 +98,19 @@ log.error("èäºå¨çº¿æ¥å£å¼å¸¸ï¼" + ex.getMessage()); } } /** * 忥æµåªä½ * åèä¹ * 2023/10/13 14:13:53 */ public void vtdu() { List<String> nameList = mediaService.getNameList(); List<Vtdu> vtdus = vtduService.selectVtduList(new Vtdu()); for (Vtdu vtdu : vtdus) { if (!nameList.contains(vtdu.getName())) { mediaService.addPath(vtdu.getName(),vtdu.getRtspSource(),vtdu.getMode(),vtdu.getIsCode()); } } } }