From 0a93967d8028733169ef9bcad7207026d4dea74e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 11 三月 2024 16:07:57 +0800
Subject: [PATCH] 增加雷达报警引导优先ptz引导 修改海康红外开关接口命令值 优化坐标数组改为实体类
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 167 insertions(+), 8 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 e44f979..be6a3b9 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
@@ -3,18 +3,27 @@
import java.util.*;
import java.util.stream.Collectors;
+import com.ruoyi.alarm.global.domain.GuidePoint;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.constant.CameraConstants;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanValidators;
+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.domain.DeptAndCamerasDto;
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.system.service.ISysDeptService;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.device.camera.domain.ArdCameras;
@@ -24,10 +33,12 @@
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.utils.gis.Point;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import javax.validation.Validator;
/**
* 鐩告満璁惧Service涓氬姟灞傚鐞�
@@ -44,14 +55,18 @@
private SysDeptMapper sysDeptMapper;
@Resource
private RedisCache redisCache;
-
+ @Autowired
+ private ISysDeptService deptService;
@Resource
private ArdChannelMapper ardChannelMapper;
@Resource
private IVtduService vtduService;
+ @Autowired
+ protected Validator validator;
@PostConstruct
public void loadCameras() {
+
//娓呯┖鐩告満缂撳瓨
Collection<String> cacheKeys = redisCache.keys(getCacheKey("*"));
redisCache.deleteObject(cacheKeys);
@@ -81,7 +96,16 @@
*/
@Override
public ArdCameras selectArdCamerasById(String id) {
- return ardCamerasMapper.selectArdCamerasById(id);
+ ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(id);
+ if (ardCameras != null) {
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(ardCameras.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ if (ardChannels != null) {
+ ardCameras.setChannelList(ardChannels);
+ }
+ }
+ return ardCameras;
}
/**
@@ -188,8 +212,94 @@
return i;
}
+ @Override
+ public String importCameras(List<ArdCameras> ardCamerasList, Boolean isUpdateSupport, String operName) {
+ if (StringUtils.isNull(ardCamerasList) || ardCamerasList.size() == 0) {
+ throw new ServiceException("瀵煎叆浜曟暟鎹笉鑳戒负绌猴紒");
+ }
+ int successNum = 0;
+ int failureNum = 0;
+ StringBuilder successMsg = new StringBuilder();
+ StringBuilder failureMsg = new StringBuilder();
+ for (ArdCameras camera : ardCamerasList) {
+ try {
+ //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ String userId = SecurityUtils.getUserId();
+ camera.setUserId(userId);
+ // 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
+ ArdCameras u = ardCamerasMapper.selectArdCamerasById(camera.getId());
+ if (StringUtils.isNull(u)) {
+ BeanValidators.validateWithException(validator, camera);
+ camera.setCreateBy(operName);
+ this.insertArdCameras(camera);
+ successNum++;
+ successMsg.append("<br/>" + successNum + "銆佺浉鏈篒D " + camera.getId() + " 瀵煎叆鎴愬姛");
+ } else if (isUpdateSupport) {
+ BeanValidators.validateWithException(validator, camera);
+ checkCameraDataScope(camera.getUserId());
+ camera.setUpdateBy(operName);
+ this.updateArdCameras(camera);
+ successNum++;
+ successMsg.append("<br/>" + successNum + "銆佺浉鏈篒D " + camera.getId() + " 鏇存柊鎴愬姛");
+ } else {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + "銆佺浉鏈篒D " + camera.getId() + " 宸插瓨鍦�");
+ }
+ } catch (Exception e) {
+ failureNum++;
+ String msg = "<br/>" + failureNum + "銆佺浉鏈篒D " + camera.getId() + " 瀵煎叆澶辫触锛�";
+ failureMsg.append(msg + e.getMessage());
+ log.error(msg, e);
+ }
+ }
+ if (failureNum > 0) {
+ failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
+ throw new ServiceException(failureMsg.toString());
+ } else {
+ successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏� " + successNum + " 鏉★紝鏁版嵁濡備笅锛�");
+ }
+ return successMsg.toString();
+ }
+
+ /**
+ * 鏍￠獙鐩告満鏄惁鍏佽鎿嶄綔
+ *
+ * @param ardCameras 鐩告満淇℃伅
+ */
+ @Override
+ public void checkCameraAllowed(ArdCameras ardCameras) {
+ if (StringUtils.isNotNull(ardCameras.getId())) {
+ throw new ServiceException("涓嶅厑璁告搷浣滀簳");
+ }
+ }
+
+ /**
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param userId 鐢ㄦ埛id
+ */
+ @Override
+ public void checkCameraDataScope(String userId) {
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ ArdCameras camera = new ArdCameras();
+ camera.setUserId(userId);
+ List<ArdCameras> cameras = SpringUtils.getAopProxy(this).selectArdCamerasList(camera);
+ if (StringUtils.isEmpty(cameras)) {
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶浜曟暟鎹紒");
+ }
+ }
+ }
+
public List findOptions(ArdCameras ardCameras) {
- return ardCamerasMapper.findOptions(ardCameras);
+ List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+ for (ArdCameras camera :
+ options) {
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(camera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ camera.setChannelList(ardChannels);
+ }
+ return options;
}
/**
@@ -200,7 +310,6 @@
* @鍒涘缓鏃堕棿 2023/6/2 10:58
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
-
@Override
public Map getChildDeptAndCamera(Boolean disabled) {
Long deptId = SecurityUtils.getDeptId();
@@ -209,6 +318,11 @@
return map;
}
+ @Override
+ public List<DeptAndCamerasDto> getChildDeptAndCamera() {
+ List<SysDept> depts = deptService.selectDeptList(new SysDept());
+ return fetchChildDepartments(depts);
+ }
/**
* @鎻忚堪 閫掑綊鏌ヨ
* @鍙傛暟 [sysDept]
@@ -248,7 +362,34 @@
}
map.put("children", childList);
return map;
+ }
+ /**
+ * 鑾峰彇鎵�鏈夐儴闂ㄥ強閮ㄩ棬涓嬬殑鐩告満
+ * 鍒樿嫃涔�
+ * 2024/3/4 14:45:03
+ */
+ public List<DeptAndCamerasDto> fetchChildDepartments(List<SysDept> sysDepts) {
+
+ List<DeptAndCamerasDto> deptAndCamerasList = sysDepts.stream()
+ .map(sysDept -> {
+ List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasByDeptId(sysDept.getDeptId());
+ ardCameras.stream().forEach(ardCamera ->{
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(ardCamera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ if (ardChannels != null) {
+ ardCamera.setChannelList(ardChannels);
+ }
+ });
+ DeptAndCamerasDto deptAndCamerasDto = new DeptAndCamerasDto();
+ deptAndCamerasDto.setSysDept(sysDept);
+ deptAndCamerasDto.setArdCamerasList(ardCameras);
+ return deptAndCamerasDto;
+ })
+ .collect(Collectors.toList());
+
+ return deptAndCamerasList;
}
/**
@@ -262,8 +403,8 @@
@Override
public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
try {
- double[] targetPosition = cmd.getTargetPosition();
- if (targetPosition == null || (targetPosition != null && targetPosition.length == 0)) {
+ GuidePoint guidePoint = cmd.getTargetPosition();
+ if (guidePoint == null) {
log.debug("鐩爣浣嶇疆涓虹┖");
return new TreeMap<>();
}
@@ -278,7 +419,8 @@
continue;
}
double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double distance = GisUtil.getDistance(cmd.getTargetPosition(), camPosition);
+ double[] targetPosition = new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()};
+ double distance = GisUtil.getDistance(targetPosition, camPosition);
if (camera.getCamMaxVisibleDistance() == null) {
continue;
}
@@ -402,4 +544,21 @@
return null;
}
+ /**
+ * 鏍￠獙鐩告満鏄惁鍞竴
+ *
+ * @param camera 鐩告満
+ * @return 缁撴灉
+ */
+ @Override
+ public String checkCameraIpAndPortUnique(ArdCameras camera) {
+ String id = camera.getId();
+ String ip = camera.getIp();
+ Integer port = camera.getPort();
+ ArdCameras info = ardCamerasMapper.checkCameraIpAndPortUnique(ip, port);
+ if (StringUtils.isNotNull(info) && !info.getId().equals(id)) {
+ return CameraConstants.NOT_UNIQUE;
+ }
+ return CameraConstants.UNIQUE;
+ }
}
--
Gitblit v1.9.3