From 1ca9656140c41165459dfb6f6b7606b3aa6a8747 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Wed, 24 Jul 2024 15:05:13 +0800
Subject: [PATCH] 三一车辆查询加入关联后bug修改提交
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 338 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 332 insertions(+), 6 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 1ef2e1a..b2070e5 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,21 +1,35 @@
package com.ruoyi.device.camera.service.impl;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
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.config.ARDConfig;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.CameraConstants;
+import com.ruoyi.common.constant.Constants;
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.file.FileUtils;
+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.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;
@@ -25,10 +39,13 @@
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.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import javax.validation.Validator;
/**
* 相机设备Service业务层处理
@@ -45,16 +62,21 @@
private SysDeptMapper sysDeptMapper;
@Resource
private RedisCache redisCache;
-
+ @Resource
+ private ISysDeptService deptService;
@Resource
private ArdChannelMapper ardChannelMapper;
@Resource
private IVtduService vtduService;
-
+ @Resource
+ protected Validator validator;
@PostConstruct
public void loadCameras() {
+ //清理本地录像缓存文件
+ String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+ FileUtils.deleteFolder(tempPath);
//清空相机缓存
Collection<String> cacheKeys = redisCache.keys(getCacheKey("*"));
redisCache.deleteObject(cacheKeys);
@@ -63,7 +85,24 @@
for (ArdCameras ardCamera : ardCameras) {
redisCache.setCacheObject(getCacheKey(ardCamera.getId()), ardCamera);
}
+ //清空流媒体
+ vtduService.clearVtdu();
+ }
+ /**
+ * @Author 刘苏义
+ * @Description 定时清理本地录像缓存文件（超过1天）
+ * @Date 2024/6/21 8:13
+ * @Param
+ * @return
+ */
+ //@Scheduled(cron = "0 0/10 * * * ?")
+ public void clearRecordTemp()
+ {
+ log.debug("定时清理本地录像缓存文件（超过1天）");
+ String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+ Path folderPath = Paths.get(tempPath);
+ FileUtils.deleteNonTodayFiles(folderPath);
}
/**
@@ -200,8 +239,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 + "、相机ID " + camera.getId() + " 导入成功");
+ } else if (isUpdateSupport) {
+ BeanValidators.validateWithException(validator, camera);
+ checkCameraDataScope(camera.getUserId());
+ camera.setUpdateBy(operName);
+ this.updateArdCameras(camera);
+ successNum++;
+ successMsg.append("<br/>" + successNum + "、相机ID " + camera.getId() + " 更新成功");
+ } else {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + "、相机ID " + camera.getId() + " 已存在");
+ }
+ } catch (Exception e) {
+ failureNum++;
+ String msg = "<br/>" + failureNum + "、相机ID " + 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) {
- List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+ //List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+ List<Long> subDeptIdList = sysDeptMapper.selectDeptIdBySub(SecurityUtils.getDeptId());//下属及本权限
+ List<Long> ownDeptIdList= sysDeptMapper.selectRoleDeptIdByUsersId(SecurityUtils.getUserId());//自定义权限
+ HashSet<Long> deptIdSet = new HashSet();//去重
+ deptIdSet.addAll(subDeptIdList);
+ deptIdSet.addAll(ownDeptIdList);
+ List<Long> deptIdList = new ArrayList();
+ deptIdList.addAll(deptIdSet);//符合条件的全部权限
+ List<ArdCameras> options = ardCamerasMapper.findTowerCamerasBySubAndOwnDeptIds(deptIdList);
for (ArdCameras camera :
options) {
ArdChannel ardChannel = new ArdChannel();
@@ -220,7 +345,6 @@
* @创建时间 2023/6/2 10:58
* @修改人和其它信息
*/
-
@Override
public Map getChildDeptAndCamera(Boolean disabled) {
Long deptId = SecurityUtils.getDeptId();
@@ -229,6 +353,33 @@
return map;
}
+ @Override
+ public List<Map<String, Object>> getChildDeptAndCameraOwn(Boolean disabled) {
+ Long deptId = SecurityUtils.getDeptId();
+ SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+ List<Long> ownDeptIdList = sysDeptMapper.selectRoleDeptIdByUsersId(SecurityUtils.getUserId());//自定义权限主键查询
+ ownDeptIdList.remove(SecurityUtils.getDeptId());//若自定义权限包含本级权限，则移除
+ Map<String, Object> map = fetchChildDepartments(sysDept, disabled, ownDeptIdList);//查询本权限及下属权限设备并在自定义权限中移除下属部门主键
+ Set<Long> pIdSet = new HashSet();//自定义权限主键的最该权限
+ for(Long deptIdn : ownDeptIdList){
+ List<SysDept> pSysDeptList = sysDeptMapper.getParentsDeptListByDeptId(deptIdn);
+ pIdSet.add(pSysDeptList.get(pSysDeptList.size() - 1).getDeptId());//获取
+ }
+ List<Map<String, Object>> result = new ArrayList();
+ result.add(map);
+ for(Long pId : pIdSet){
+ SysDept pSysDept = sysDeptMapper.selectDeptById(pId);
+ Map<String, Object> mapO = fetchChildDepartments(ownDeptIdList, pSysDept, disabled);
+ result.add(mapO);
+ }
+ return result;
+ }
+
+ @Override
+ public List<DeptAndCamerasDto> getChildDeptAndCamera() {
+ List<SysDept> depts = deptService.selectDeptList(new SysDept());
+ return fetchChildDepartments(depts);
+ }
/**
* @描述 递归查询
* @参数 [sysDept]
@@ -260,6 +411,7 @@
ardChannel.setDeviceId(camera.getId());
List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
if (ardChannels != null) {
+ ardChannels.stream().sorted();
camera.setChannelList(ardChannels);
}
Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
@@ -268,7 +420,112 @@
}
map.put("children", childList);
return map;
+ }
+ /**
+ * zns
+ *
+ * */
+ public Map<String, Object> fetchChildDepartments(SysDept sysDept, Boolean disabled, List<Long> ownDeptIdList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", sysDept.getDeptName());
+ map.put("deptId", sysDept.getDeptId());
+ map.put("disabled", disabled);
+ List<SysDept> sysDepts = sysDeptMapper.selectNextChildrenDeptById(sysDept.getDeptId());
+ for(SysDept sysDeptC : sysDepts){//若自定义权限包含下级权限，则移除
+ if(ownDeptIdList.contains(sysDeptC.getDeptId())){
+ ownDeptIdList.remove(sysDeptC.getDeptId());
+ }
+ }
+ List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasByDeptId(sysDept.getDeptId());
+ List<Object> childList = new ArrayList<>();
+ for (SysDept childDept : sysDepts) {
+ Map<String, Object> childMap = new HashMap<>();
+ childMap.put("name", childDept.getDeptName());
+ childMap.put("deptId", childDept.getDeptId());
+ childMap.put("disabled", disabled);
+ Map<String, Object> map1 = fetchChildDepartments(childDept, disabled);
+ childMap.putAll(map1);
+ childList.add(childMap);
+ }
+ 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) {
+ ardChannels.stream().sorted();
+ camera.setChannelList(ardChannels);
+ }
+ Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
+ childList.add(cameraMap);
+ }
+ }
+ map.put("children", childList);
+ return map;
+ }
+
+ public Map<String, Object> fetchChildDepartments(List<Long> ownDeptIdList, SysDept sysDept, Boolean disabled) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", sysDept.getDeptName());
+ map.put("deptId", sysDept.getDeptId());
+ map.put("disabled", disabled);
+ List<SysDept> sysDepts = sysDeptMapper.selectNextChildrenDeptByIdAndInList(sysDept.getDeptId(),ownDeptIdList);
+ List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasByDeptId(sysDept.getDeptId());
+ List<Object> childList = new ArrayList<>();
+ for (SysDept childDept : sysDepts) {
+ Map<String, Object> childMap = new HashMap<>();
+ childMap.put("name", childDept.getDeptName());
+ childMap.put("deptId", childDept.getDeptId());
+ childMap.put("disabled", disabled);
+ //Map<String, Object> map1 = fetchChildDepartments(childDept, disabled);
+ Map<String, Object> map1 = fetchChildDepartments(ownDeptIdList,childDept, disabled);
+ childMap.putAll(map1);
+ childList.add(childMap);
+ }
+ 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) {
+ ardChannels.stream().sorted();
+ camera.setChannelList(ardChannels);
+ }
+ Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
+ childList.add(cameraMap);
+ }
+ }
+ 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;
}
/**
@@ -283,7 +540,7 @@
public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
try {
double[] targetPosition = cmd.getTargetPosition();
- if (targetPosition == null || (targetPosition != null && targetPosition.length == 0)) {
+ if (targetPosition == null) {
log.debug("目标位置为空");
return new TreeMap<>();
}
@@ -298,7 +555,7 @@
continue;
}
double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double distance = GisUtil.getDistance(cmd.getTargetPosition(), camPosition);
+ double distance = GisUtil.getDistance(targetPosition, camPosition);
if (camera.getCamMaxVisibleDistance() == null) {
continue;
}
@@ -439,4 +696,73 @@
}
return CameraConstants.UNIQUE;
}
+
+ @Override
+ public List<Map<String, Object>> getCamerasByDeptId(Long deptId,String userId) {
+ List<Long> deptIdList = new ArrayList();
+ deptIdList.add(deptId);
+ deptIdList = getOwnAndChildrenDeptIdList(deptIdList,new ArrayList());//递归查询下属部门主键
+ //List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId,userId);
+ List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptIdList,userId);
+ return result;
+ }
+
+ public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
+ deptIdListr.addAll(deptIdList);
+ List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);
+ if(result.size() != 0){
+ deptIdListr.addAll(result);
+ result = getOwnAndChildrenDeptIdList(result,deptIdListr);
+ }
+ deptIdListr = deptIdListr.stream().distinct().collect(Collectors.toList());
+ return deptIdListr;
+ }
+
+ @Override
+ public Boolean getCameraOperationByCameraId(String id, String userId) {
+ Boolean result = ardCamerasMapper.getCameraOperationByCameraId(id,userId);
+ return result;
+ }
+
+ @Override
+ public Map<String, Object> getChannelByCameraId(String id) {
+ List<Map<String,Object>> result = ardCamerasMapper.getChannelByCameraId(id);
+ Map<String,Object> resultMap = new HashMap();
+ if(result.size() == 1){
+ resultMap.put("chanNo", result.get(0).get("chan_no"));
+ return resultMap;
+ }else{
+ String configValue = (String) result.get(0).get("config_value");
+ String beginTime = configValue.split("-")[0];
+ String endTime = configValue.split("-")[1];
+ Date now = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String nowDay = sdf.format(now);
+ try{
+ Long beginDate = sdf.parse(nowDay).getTime()
+ + Integer.parseInt(beginTime.split(":")[0]) * 60 * 60 *1000
+ + Integer.parseInt(beginTime.split(":")[1]) * 60 *1000;
+ Long endDate = sdf.parse(nowDay).getTime()
+ + Integer.parseInt(endTime.split(":")[0]) * 60 * 60 *1000
+ + Integer.parseInt(endTime.split(":")[1]) * 60 *1000;
+ if(now.getTime() >= beginDate && now.getTime() <= endDate){
+ result = result.stream().filter(map -> ((Integer)map.get("chan_no")) == 1).collect(Collectors.toList());
+ resultMap.put("chanNo", result.get(0).get("chan_no"));
+ return resultMap;
+ }else{
+ result = result.stream().filter(map -> ((Integer)map.get("chan_no")) == 2).collect(Collectors.toList());
+ resultMap.put("chanNo", result.get(0).get("chan_no"));
+ return resultMap;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ return resultMap;
+ }
+ }
+ }
+
+ @Override
+ public int resetCameraLoginId() {
+ return ardCamerasMapper.resetCameraLoginId();
+ }
}
--
Gitblit v1.9.3