From b80cff6055cd8c261393698deb897e86a6f4dc1d Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期二, 17 十月 2023 13:18:55 +0800 Subject: [PATCH] 1. 增加聚焦模式切换接口 2. 增加短时录像接口 3. 增加目标引导接口 4. 增加预置点设置调取接口 --- ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 154 insertions(+), 13 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java index 7a1a5be..e44f979 100644 --- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.camera.service.impl; -import java.time.LocalTime; import java.util.*; +import java.util.stream.Collectors; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.domain.entity.SysDept; @@ -10,15 +10,19 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.device.camera.domain.CameraCmd; -import com.ruoyi.device.hiksdk.common.GlobalVariable; -import com.ruoyi.system.domain.SysConfig; +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; import com.ruoyi.device.camera.domain.ArdCameras; import com.ruoyi.device.camera.mapper.ArdCamerasMapper; import com.ruoyi.device.camera.service.IArdCamerasService; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.utils.tools.GisTool; +import com.ruoyi.utils.gis.Point; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -41,9 +45,17 @@ @Resource private RedisCache redisCache; + @Resource + private ArdChannelMapper ardChannelMapper; + @Resource + private IVtduService vtduService; @PostConstruct public void loadCameras() { + //娓呯┖鐩告満缂撳瓨 + Collection<String> cacheKeys = redisCache.keys(getCacheKey("*")); + redisCache.deleteObject(cacheKeys); + //閲嶆柊鍔犺浇鐩告満鍒扮紦瀛� List<ArdCameras> ardCameras = selectArdCamerasListNoDataScope(new ArdCameras()); for (ArdCameras ardCamera : ardCameras) { redisCache.setCacheObject(getCacheKey(ardCamera.getId()), ardCamera); @@ -81,7 +93,18 @@ @Override @DataScope(deptAlias = "d", userAlias = "u") public List<ArdCameras> selectArdCamerasList(ArdCameras ardCameras) { - return ardCamerasMapper.selectArdCamerasList(ardCameras); + List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(ardCameras); + if (ardCamerasList.size() > 0) { + for (ArdCameras camera : ardCamerasList) { + ArdChannel ardChannel = new ArdChannel(); + ardChannel.setDeviceId(camera.getId()); + List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel); + if (ardChannels != null) { + camera.setChannelList(ardChannels); + } + } + } + return ardCamerasList; } /** @@ -137,11 +160,13 @@ @Override public int deleteArdCamerasByIds(String[] ids) { int res = ardCamerasMapper.deleteArdCamerasByIds(ids); - if(res>0) - { - for(String id:ids) - { + if (res > 0) { + for (String id : ids) { redisCache.deleteObject(getCacheKey(id)); + //鍒犻櫎娴佸獟浣� + vtduService.deleteVtduByCameraId(id); + //鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾 + ardChannelMapper.deleteArdChannelByDeviceId(id); } } return res; @@ -155,7 +180,12 @@ */ @Override public int deleteArdCamerasById(String id) { - return ardCamerasMapper.deleteArdCamerasById(id); + int i = ardCamerasMapper.deleteArdCamerasById(id); + if (i > 0) { + //鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾 + ardChannelMapper.deleteArdChannelByDeviceId(id); + } + return i; } public List findOptions(ArdCameras ardCameras) { @@ -206,6 +236,12 @@ } if (ardCameras.size() > 0) { for (ArdCameras camera : ardCameras) { + ArdChannel ardChannel = new ArdChannel(); + ardChannel.setDeviceId(camera.getId()); + List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel); + if (ardChannels != null) { + camera.setChannelList(ardChannels); + } Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera); childList.add(cameraMap); } @@ -242,16 +278,22 @@ continue; } double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()}; - double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition); + double distance = GisUtil.getDistance(cmd.getTargetPosition(), camPosition); if (camera.getCamMaxVisibleDistance() == null) { continue; } if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) { distanceMap.put(camera.getId(), distance); - camera.setChannel(ArdTool.getChannelBydayNightTime(dayNightTime)); + camera.setChanNo(ArdTool.getChannelBydayNightTime(dayNightTime)); ardCameras.put(distance, camera); } - + //鑾峰彇閫氶亾鍒楄〃 + ArdChannel ardChannel = new ArdChannel(); + ardChannel.setDeviceId(camera.getId()); + List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel); + if (ardChannels != null) { + camera.setChannelList(ardChannels); + } } return ardCameras; } catch (Exception ex) { @@ -260,5 +302,104 @@ return null; } + /** + * 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢� + * 鍒樿嫃涔� + * 2023/8/17 13:57:21 + */ + @Override + public List<ArdCameras> getNearCameras(SchedulingParam param) { + try { + Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId(); + Double longitude = param.getLongitude(); + Double latitude = param.getLatitude(); + if (longitude == null && latitude == null) { + log.debug("鍘熺偣鍧愭爣涓虹┖"); + return null; + } + Integer radius = param.getMonitoringRadius(); + if (radius == null) { + log.debug("鐩戞帶鍦堝崐寰勮窛绂讳负绌�"); + return null; + } + String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime"); + //鑾峰彇鎵�鏈夊厜鐢�(鎸夐儴闂�) + ArdCameras cameras = new ArdCameras(); + cameras.setDeptId(deptId); + List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(cameras); + //缁熻鎵�鏈夊厜鐢靛彲瑙嗚寖鍥村唴涓庢姤璀︾偣鐨勮窛绂� + List<ArdCameras> ardCameras = new ArrayList<>(); + for (ArdCameras camera : ardCamerasList) { + if (camera.getLongitude() == null && camera.getLatitude() == null) { + continue; + } + double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()}; + double distance = GisUtil.getDistance(new double[]{longitude, latitude}, camPosition); + if (distance <= radius) { + /*鑾峰彇閫氶亾鍒楄〃*/ + ArdChannel ardChannel = new ArdChannel(); + ardChannel.setDeviceId(camera.getId()); + List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel); + camera.setChannelList(ardChannels); + ardCameras.add(camera); + } + } + //杩囨护鍦ㄧ嚎鐩告満 + List<ArdCameras> onlineList = ardCameras.stream() + .filter(ardCamera -> (!ardCamera.getLoginId().equals(-1))) + .collect(Collectors.toList()); + return onlineList; + } catch (Exception ex) { + log.error("鑾峰彇闄勮繎鐩告満寮傚父:" + ex.getMessage()); + } + return null; + } + + /** + * 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢� + * 鍒樿嫃涔� + * 2023/8/17 13:57:21 + */ + @Override + public List<ArdCameras> getNearCamerasWithPolygon(SchedulingParam param) { + try { + Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId(); + List<Point> partitionLocation = param.getPartitionLocation(); + if (partitionLocation == null) { + log.debug("澶氳竟褰㈠潗鏍囬泦鍚堜负绌�"); + return null; + } + String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime"); + //鑾峰彇鎵�鏈夊厜鐢�(鎸夐儴闂�) + ArdCameras cameras = new ArdCameras(); + cameras.setDeptId(deptId); + List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(cameras); + List<ArdCameras> ardCameras = new ArrayList<>(); + for (ArdCameras camera : ardCamerasList) { + if (camera.getLongitude() == null && camera.getLatitude() == null) { + continue; + } + /*鍒ゆ柇鍧愭爣鏄惁鍦ㄥ杈瑰舰鑼冨洿鍐�*/ + Point camPosition = new Point(camera.getLongitude(), camera.getLatitude()); + boolean inPolygon = GisUtil.isInPolygon(camPosition, partitionLocation); + if (inPolygon) { + /*鑾峰彇閫氶亾鍒楄〃*/ + ArdChannel ardChannel = new ArdChannel(); + ardChannel.setDeviceId(camera.getId()); + List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel); + camera.setChannelList(ardChannels); + ardCameras.add(camera); + } + } + //杩囨护鍦ㄧ嚎鐩告満 + List<ArdCameras> onlineList = ardCameras.stream() + .filter(ardCamera -> (!ardCamera.getLoginId().equals(-1))) + .collect(Collectors.toList()); + return onlineList; + } catch (Exception ex) { + log.error("鑾峰彇闄勮繎鐩告満寮傚父:" + ex.getMessage()); + } + return null; + } } -- Gitblit v1.9.3