From bb645b81988365ded95ff660303f47d12d379bad Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 14:35:57 +0800
Subject: [PATCH] 反无设备优化出入口状态

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 b4d4a17..0e2c7d6 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
@@ -37,6 +37,8 @@
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.utils.StringUtil;
+
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -123,8 +125,8 @@
 	}
 
 	@Override
-	public List<DeviceStatisticsVO> getDeviceOutStatistics() {
-		return baseMapper.getDeviceOutStatistics();
+	public List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull) {
+		return baseMapper.getDeviceOutStatistics(effectiveRangeKmIsNotNull);
 	}
 
 	@Override
@@ -150,4 +152,23 @@
 	public boolean existsAreaBindByDeviceId(Long deviceId) {
 		return fwAreaDivideService.existsAreaByDeviceId(deviceId);
 	}
+
+	/**
+	 * 保存或更新设备信息
+	 * @param fwDeviceEntity
+	 * @return
+	 */
+	@Override
+	public boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity) {
+		if (fwDeviceEntity.getEffectiveRangeKm() == null || fwDeviceEntity.getEffectiveRangeKm().compareTo(BigDecimal.ZERO) == 0 ) {
+			fwDeviceEntity.setLatitude("");
+			fwDeviceEntity.setLongitude("");
+		}
+		return saveOrUpdate(fwDeviceEntity);
+	}
+
+	@Override
+	public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus) {
+		return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus) > 0;
+	}
 }

--
Gitblit v1.9.3