From 67397f33249a996c124e2e561e53c1f19974e1cb Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 04 Feb 2026 11:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
index 300420b..139c863 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
@@ -17,6 +17,7 @@
package org.sxkj.fw.record.service.impl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO;
import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
@@ -56,13 +57,13 @@
Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
// 3. 查询不在这些部门区域内的设备
Region byCode = RegionCache.getByCode(dept.getAreaCode());
- String regionName = byCode.getName();
- fwDroneAlarmRecord.setRegionName(regionName);
+ fwDroneAlarmRecord.setRegionName(byCode.getName());
+ fwDroneAlarmRecord.setCurrentDeptId(AuthUtil.getDeptId());
+ fwDroneAlarmRecord.setRegionCode(HeaderUtils.formatAreaCode(byCode.getCode()));
// 获取当前部门及其子部门列表
// List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
// fwDroneAlarmRecord.setDeptList(deptList);
// 获取共享给当前部门的设备编号列表
- fwDroneAlarmRecord.setCurrentDeptId(AuthUtil.getDeptId());
// 执行查询
return page.setRecords(baseMapper.selectFwDroneAlarmRecordPage(page, fwDroneAlarmRecord));
}
@@ -70,6 +71,10 @@
@Override
public List<FwDroneAlarmRecordExcel> exportFwDroneAlarmRecord(FwDroneAlarmRecordExportParam fwDroneAlarmRecord) {
+ Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
+ Region byCode = RegionCache.getByCode(dept.getAreaCode());
+ fwDroneAlarmRecord.setRegionCode(HeaderUtils.formatAreaCode(byCode.getCode()));
+ fwDroneAlarmRecord.setCurrentDeptId(AuthUtil.getDeptId());
List<FwDroneAlarmRecordExcel> fwDroneAlarmRecordList = baseMapper.exportFwDroneAlarmRecord(fwDroneAlarmRecord);
return fwDroneAlarmRecordList;
}
@@ -80,7 +85,7 @@
* @return
*/
@Override
- public AlarmStatisticsVO alarmTypeStatistics(String regionName, String currentDeptId) {
- return baseMapper.alarmTypeStatistics(regionName, currentDeptId);
+ public AlarmStatisticsVO alarmTypeStatistics(String regionCode, String currentDeptId) {
+ return baseMapper.alarmTypeStatistics(regionCode, currentDeptId);
}
}
--
Gitblit v1.9.3