From 1c3d9f4f6d0dc330a80b199cfb824f41a048fe6c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 16:39:33 +0800
Subject: [PATCH] 设备权限优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java | 90 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
index 8f60a5c..5ffaa9a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
@@ -1,34 +1,43 @@
package org.sxkj.fw.cockpit.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Service;
import org.sxkj.fw.cockpit.service.ICockpitService;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.detection.entity.FwEffectEvalEntity;
+import org.sxkj.fw.detection.param.FwEffectEvalParam;
import org.sxkj.fw.detection.service.IFwEffectEvalService;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.service.IFwDeviceService;
+import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO;
+import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
import org.sxkj.fw.record.service.IFwDroneAlarmRecordService;
import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO;
+import org.sxkj.system.cache.RegionCache;
+import org.sxkj.system.cache.SysCache;
+import org.sxkj.system.entity.Dept;
+import org.sxkj.system.entity.Region;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Optional;
@Service
public class CockpitServiceImpl implements ICockpitService {
@Resource
- private IFwDroneAlarmRecordService fwDroneAlarmRecordService;
+ private IFwDroneAlarmRecordService fwDroneAlarmRecordService;
@Resource
- private IFwDeviceService fwDeviceService;
+ private IFwDeviceService fwDeviceService;
@Resource
- private IFwEffectEvalService fwEffectEvalService;
+ private IFwEffectEvalService fwEffectEvalService;
@Override
@@ -37,28 +46,89 @@
}
@Override
- public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
- return fwDeviceService.selectFwDevicePage(page, fwDevice);
+ public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) {
+ // List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ // fwDevice.setDeptList(deptList);
+ // fwDevice.setCurrentDeptId(AuthUtil.getDeptId());
+ Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
+ Region byCode = RegionCache.getByCode(dept.getAreaCode());
+ String regionName = byCode.getName();
+ fwDevice.setRegionName(regionName);
+ fwDevice.setCurrentDeptId(AuthUtil.getDeptId());
+ IPage<CockpitFwDeviceVO> cockpitFwDeviceVOIPage = fwDeviceService.selectCockpitDevicePage(page, fwDevice);
+ return cockpitFwDeviceVOIPage;
}
@Override
public List<DeviceStatisticsVO> statisticalDeviceType() {
- return fwDeviceService.statisticalDeviceType();
+ // List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
+ Region byCode = RegionCache.getByCode(dept.getAreaCode());
+ String regionName = byCode.getName();
+ return fwDeviceService.statisticalDeviceType(regionName, AuthUtil.getDeptId());
}
@Override
- public boolean saveOrUpdate(FwEffectEvalEntity fwEffectEvalEntity) {
+ public boolean interferenceAndExpulsion(FwEffectEvalParam fwEffectEvalParam) {
+ // 告警记录
+ FwDroneAlarmRecordEntity alarmRecordEntity = fwDroneAlarmRecordService.getById(fwEffectEvalParam.getAlarmRecordId());
+ // 设备信息
+ FwDeviceEntity device = fwDeviceService.getById(alarmRecordEntity.getDeviceId());
+ // 反制效果
+ FwEffectEvalEntity one = fwEffectEvalService.getOne(Wrappers.<FwEffectEvalEntity>lambdaQuery().eq(FwEffectEvalEntity::getAlarmRecordId, fwEffectEvalParam.getAlarmRecordId()));
+ FwEffectEvalEntity fwEffectEvalEntity = Optional.ofNullable(one)
+ .orElse(new FwEffectEvalEntity());
+
+ // 告警记录相关字段
+ fwEffectEvalEntity.setAlarmRecordId(fwEffectEvalParam.getAlarmRecordId());
+ fwEffectEvalEntity.setDroneName(alarmRecordEntity.getDroneName());
+ fwEffectEvalEntity.setDroneType(alarmRecordEntity.getDroneType());
+ fwEffectEvalEntity.setDroneDeviceCode(alarmRecordEntity.getDroneSerialNo());
+ fwEffectEvalEntity.setFindTime(alarmRecordEntity.getAlarmTime());
+
+ // 从参数获取反制方式，否则使用告警记录中的值
+ fwEffectEvalEntity.setCounterWay(fwEffectEvalParam.getCounterWay());
+ alarmRecordEntity.setCounterWay(fwEffectEvalParam.getCounterWay());
+ // 设备相关字段
+ fwEffectEvalEntity.setDeviceId(alarmRecordEntity.getDeviceId());
+ fwEffectEvalEntity.setDeviceSn(device.getDeviceSn());
+ fwEffectEvalEntity.setDeviceName(device.getDeviceName());
+ fwEffectEvalEntity.setDeviceModel(device.getDeviceModel());
+ fwEffectEvalEntity.setDeviceType(device.getDeviceType());
+ fwEffectEvalEntity.setDeployLongitude(device.getLongitude() != null ? Double.parseDouble(device.getLongitude()) : null);
+ fwEffectEvalEntity.setDeployLatitude(device.getLatitude() != null ? Double.parseDouble(device.getLatitude()) : null);
+ fwEffectEvalEntity.setAreaCode(device.getAreaCode());
+
+ // 反制效果及工作模式（从参数获取，否则使用默认值）
+ fwEffectEvalEntity.setCounterEffect("1"); // 1.success/2.fail
+ fwEffectEvalEntity.setCoverRadiusM(2500); // 覆盖范围（米）
+ fwEffectEvalEntity.setWorkMode("1"); // 1.机动/2.固定
+ fwDroneAlarmRecordService.updateById(alarmRecordEntity);
return fwEffectEvalService.saveOrUpdate(fwEffectEvalEntity);
}
@Override
public AlarmStatisticsVO statisticsAlarmsAndDeviceRecords() {
+ // List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
+ Region byCode = RegionCache.getByCode(dept.getAreaCode());
+ String regionName = byCode.getName();
// 设备统计
- AlarmStatisticsVO alarmStatisticsVO = fwDeviceService.statisticalDeviceAtt();
+ AlarmStatisticsVO alarmStatisticsVO = fwDeviceService.statisticalDeviceAtt(regionName, AuthUtil.getDeptId());
// 告警统计
- AlarmStatisticsVO alarmStatistics = fwDroneAlarmRecordService.alarmTypeStatistics();
+ AlarmStatisticsVO alarmStatistics = fwDroneAlarmRecordService.alarmTypeStatistics(regionName, AuthUtil.getDeptId());
alarmStatisticsVO.setHistoryAlarmCount(alarmStatistics.getHistoryAlarmCount());
alarmStatisticsVO.setRealTimeAlarmCount(alarmStatistics.getRealTimeAlarmCount());
return alarmStatisticsVO;
}
+
+ /**
+ *
+ * @param effectiveRangeKmIsNotNull
+ * @return
+ */
+ @Override
+ public List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull) {
+ return fwDeviceService.getDeviceOutStatistics(effectiveRangeKmIsNotNull);
+ }
}
--
Gitblit v1.9.3