ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmData.java
@@ -26,4 +26,5 @@ Double altitude; Integer count;//未读数 Integer total;//总数 String alarmType; } ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -293,7 +293,8 @@ .setLatitude(ardAlarmStealelec.getLatitude()) .setAltitude(ardAlarmStealelec.getAltitude()) .setCount(ardAlarmStealelec.getCount()) .setTotal(ardAlarmStealelec.getTotal()); .setTotal(ardAlarmStealelec.getTotal()) .setAlarmType("1001"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1001.size()>0) { @@ -310,7 +311,8 @@ .setLongitude(ardAlarmCamera.getLongitude()) .setLatitude(ardAlarmCamera.getLatitude()) .setCount(ardAlarmCamera.getCount()) .setTotal(ardAlarmCamera.getTotal()); .setTotal(ardAlarmCamera.getTotal()) .setAlarmType("1002"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1002.size()>0) { @@ -327,7 +329,8 @@ .setLongitude(ardAlarmRadar.getLongitude()) .setLatitude(ardAlarmRadar.getLatitude()) .setCount(ardAlarmRadar.getCount()) .setTotal(ardAlarmRadar.getTotal()); .setTotal(ardAlarmRadar.getTotal()) .setAlarmType("1003"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1003.size()>0) { @@ -344,7 +347,8 @@ .setLongitude(ardAlarmRadar.getLongitude()) .setLatitude(ardAlarmRadar.getLatitude()) .setCount(ardAlarmRadar.getCount()) .setTotal(ardAlarmRadar.getTotal()); .setTotal(ardAlarmRadar.getTotal()) .setAlarmType("1004"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1004.size()>0) { @@ -361,7 +365,8 @@ .setLongitude(ardAlarmExternal.getLongitude()) .setLatitude(ardAlarmExternal.getLatitude()) .setCount(ardAlarmExternal.getCount()) .setTotal(ardAlarmExternal.getTotal()); .setTotal(ardAlarmExternal.getTotal()) .setAlarmType("1005"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1005.size()>0) { @@ -378,7 +383,8 @@ .setLongitude(ardAlarmAccess.getLongitude()) .setLatitude(ardAlarmAccess.getLatitude()) .setCount(ardAlarmAccess.getCount()) .setTotal(ardAlarmAccess.getTotal()); .setTotal(ardAlarmAccess.getTotal()) .setAlarmType("1006"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1006.size()>0) { @@ -395,7 +401,8 @@ .setLongitude(ardAlarmRadar.getLongitude()) .setLatitude(ardAlarmRadar.getLatitude()) .setCount(ardAlarmRadar.getCount()) .setTotal(ardAlarmRadar.getTotal()); .setTotal(ardAlarmRadar.getTotal()) .setAlarmType("1007"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1007.size()>0) { @@ -412,7 +419,8 @@ .setLongitude(ardAlarmApponekey.getLongitude()) .setLatitude(ardAlarmApponekey.getLatitude()) .setCount(ardAlarmApponekey.getCount()) .setTotal(ardAlarmApponekey.getTotal()); .setTotal(ardAlarmApponekey.getTotal()) .setAlarmType("1009"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1009.size()>0) { @@ -430,7 +438,8 @@ .setLatitude(ardAlarmTube.getLatitude()) .setAltitude(ardAlarmTube.getAltitude()) .setCount(ardAlarmTube.getCount()) .setTotal(ardAlarmTube.getTotal()); .setTotal(ardAlarmTube.getTotal()) .setAlarmType("1014"); return globalAlarmData; }).collect(Collectors.toList()); if(alarmData1014.size()>0) { ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -385,6 +385,9 @@ NET_DVR_FOCUSMODE_CFG focusmodeCfg = new NET_DVR_FOCUSMODE_CFG(); Pointer point = focusmodeCfg.getPointer(); IntByReference ibrBytesReturned = new IntByReference(0); focusmodeCfg.byFocusMode=1; focusmodeCfg.byAutoFocusMode=0; focusmodeCfg.write(); boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, focusmodeCfg.size(), ibrBytesReturned); if (bool) { focusmodeCfg.read(); @@ -972,7 +975,14 @@ log.debug("设置聚焦模式成功"); return bool; } /** * @描述 获取聚焦模式 * @参数 [userId, channelNum] * @返回值 boolean * @创建人 刘苏义 * @创建时间 2023/1/18 13:07 * @修改人和其它信息 */ public String getFocusMode(CameraCmd cmd) { String cameraId = cmd.getCameraId(); Integer channelNum = cmd.getChannelNum(); ard-work/src/main/resources/templates/preview.html
@@ -68,6 +68,18 @@ height: 100%; object-fit: fill; } #loadingMessage { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); font-size: 24px; color: white; background-color: rgba(0, 0, 0, 0.7); padding: 10px 20px; border-radius: 5px; display: none; } </style> </head> <body> @@ -75,6 +87,7 @@ <div class="container" id="gridContainer"> <!-- 网格项目将由 JavaScript 动态生成 --> </div> <div id="loadingMessage">正在取流</div> <div class="container2"> <div class="button-container"> <button class="toggle-button" onclick="changeGrid(1, 1)">1x1</button> @@ -110,12 +123,23 @@ video.controls = true; video.autoplay = true; video.muted = true; video.loop= true; videoContainer.appendChild(video); gridItem.appendChild(videoContainer); gridContainer.appendChild(gridItem); video.addEventListener('loadedmetadata', function () { adjustGridItemSize(gridItem, gridItem.videoWidth, gridItem.videoHeight); }); video.addEventListener("click", function() { loadingMessage.style.display = "block"; video.play().then(function() { loadingMessage.style.display = "none"; }).catch(function(error) { console.error("Error playing the video:", error); loadingMessage.style.display = "none"; }); }); console.log(video.id) } @@ -384,6 +408,7 @@ client.stop(id); videoMap.delete(id); } function closeAllVideo(){ videoMap.forEach((val,key) => { console.log(val,key); ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
@@ -80,6 +80,9 @@ ptz.put("usernameZh", cmd.getOperatorZh()); ptz.put("operatorId", cmd.getOperator());//上锁用户id ptz.put("expirationRemainingSecond", secDatePoor); ptz.put("longitude",camera.getLongitude()); ptz.put("latitude",camera.getLatitude()); ptz.put("altitude",camera.getAltitude()); list.add(ptz); } }
