From 70464cc66f77cf847464ffe71f2fd456ee11b0fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 27 +++------------------------
1 files changed, 3 insertions(+), 24 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 4566e5c..bb515d1 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
@@ -16,11 +16,8 @@
*/
package org.sxkj.fw.device.service.impl;
-import lombok.AllArgsConstructor;
-import org.sxkj.fw.device.dto.FwDeviceAndTrackDTO;
+import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
-import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
-import org.sxkj.fw.device.service.IFwDeviceTrackService;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.mapper.FwDeviceMapper;
@@ -29,25 +26,19 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
-import org.sxkj.fw.device.wrapper.FwDeviceTrackWrapper;
-import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
-
import java.util.List;
/**
* 设备表 服务实现类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Service
-@AllArgsConstructor
public class FwDeviceServiceImpl extends BaseServiceImpl<FwDeviceMapper, FwDeviceEntity> implements IFwDeviceService {
- private final IFwDeviceTrackService fwDeviceTrackService;
-
@Override
- public IPage<FwDeviceVO> selectFwDevicePage(IPage<FwDeviceVO> page, FwDeviceVO fwDevice) {
+ public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
}
@@ -61,16 +52,4 @@
return fwDeviceList;
}
- @Override
- public Boolean saveFwDevice(FwDeviceAndTrackDTO dto) {
- // 保存设备信息
- FwDeviceEntity entity = FwDeviceWrapper.build().entityDTO(dto.getFwDeviceDTO());
- save(entity);
-
- // 保存设备跟踪信息
- FwDeviceTrackEntity trackEntity = FwDeviceTrackWrapper.build().entityDTO(dto.getFwDeviceTrackDTO());
- trackEntity.setDeviceId(entity.getId());
-
- return fwDeviceTrackService.save(trackEntity);
- }
}
--
Gitblit v1.9.3