From 99227c34ea9967aacc087138795d1b99965b0345 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 14:36:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 3475c5f..d57c7f6 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
@@ -81,8 +81,8 @@
}
@Override
- public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status) {
- return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status);
+ public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack) {
+ return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
}
@@ -161,9 +161,14 @@
@Override
public boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity) {
if (fwDeviceEntity.getEffectiveRangeKm() == null || fwDeviceEntity.getEffectiveRangeKm().compareTo(BigDecimal.ZERO) == 0 ) {
- fwDeviceEntity.setLatitude(null);
- fwDeviceEntity.setLongitude(null);
+ 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