From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java
index 1b6fb45..9e28ab2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java
@@ -16,7 +16,10 @@
*/
package org.sxkj.fw.device.service.impl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.sxkj.fw.device.dto.FwDeviceTrackDTO;
import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
+import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.device.vo.FwDeviceTrackVO;
import org.sxkj.fw.device.excel.FwDeviceTrackExcel;
import org.sxkj.fw.device.mapper.FwDeviceTrackMapper;
@@ -25,30 +28,44 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+
import java.util.List;
/**
* 设备跟踪流转表 服务实现类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Service
public class FwDeviceTrackServiceImpl extends BaseServiceImpl<FwDeviceTrackMapper, FwDeviceTrackEntity> implements IFwDeviceTrackService {
+ @Autowired
+ private IFwDeviceService fwDeviceService;
+
@Override
- public IPage<FwDeviceTrackVO> selectFwDeviceTrackPage(IPage<FwDeviceTrackVO> page, FwDeviceTrackVO fwDeviceTrack) {
+ public IPage<FwDeviceTrackEntity> selectFwDeviceTrackPage(IPage<FwDeviceTrackEntity> page, FwDeviceTrackDTO fwDeviceTrack) {
+ // 分页查询直接透传到 Mapper
return page.setRecords(baseMapper.selectFwDeviceTrackPage(page, fwDeviceTrack));
}
@Override
public List<FwDeviceTrackExcel> exportFwDeviceTrack(Wrapper<FwDeviceTrackEntity> queryWrapper) {
+ // 导出不做额外转换，保持与导出字段一致
List<FwDeviceTrackExcel> fwDeviceTrackList = baseMapper.exportFwDeviceTrack(queryWrapper);
- //fwDeviceTrackList.forEach(fwDeviceTrack -> {
+ // fwDeviceTrackList.forEach(fwDeviceTrack -> {
// fwDeviceTrack.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwDeviceTrack.getType()));
//});
return fwDeviceTrackList;
}
+ @Override
+ public boolean saveOrUpdateFwDeviceTrack(FwDeviceTrackEntity fwDeviceTrackEntity) {
+ boolean b = saveOrUpdate(fwDeviceTrackEntity);
+ if (b) {
+ return fwDeviceService.updateTrackStatusByDeviceId(fwDeviceTrackEntity.getDeviceId(), 1, fwDeviceTrackEntity.getOutTarget(),fwDeviceTrackEntity.getOutTargetCode());
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3