From eeb3b5c9c794a35d7b7f3c8e56f9eef8eb8d3451 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 01 Apr 2026 17:20:19 +0800
Subject: [PATCH] opt:兼容人大金仓
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
index ad9b59d..08020e8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -46,6 +46,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -135,7 +136,7 @@
*/
@Override
public List<DeviceStatisticsVO> statisticalDeviceType(String regionCode, String currentDeptId) {
- return baseMapper.statisticalDeviceType(regionCode, currentDeptId);
+ return baseMapper.statisticalDeviceType(regionCode, currentDeptId, new Date());
}
/**
@@ -171,7 +172,7 @@
if (!AuthUtil.isAdministrator()) {
deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
}
- return baseMapper.getDeviceManufacturerStatistics(deptList);
+ return baseMapper.getDeviceManufacturerStatistics(deptList, AuthUtil.getDeptId());
}
/**
@@ -181,7 +182,7 @@
*/
@Override
public AlarmStatisticsVO statisticalDeviceAtt(String regionCode, String currentDeptId) {
- return baseMapper.statisticalDeviceAtt(regionCode, currentDeptId);
+ return baseMapper.statisticalDeviceAtt(regionCode, currentDeptId, new Date());
}
@Override
@@ -194,6 +195,11 @@
return fwAreaDivideService.existsAreaByDeviceId(deviceId);
}
+ @Override
+ public String selectAreaBindNameByDeviceId(Long deviceId) {
+ return fwAreaDivideService.selectAreaNameByDeviceId(deviceId);
+ }
+
/**
* 保存或更新设备信息
*
--
Gitblit v1.9.3