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/wrapper/FwDeviceWrapper.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceWrapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceWrapper.java
index 6dd0ee5..c7a90a2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceWrapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceWrapper.java
@@ -18,15 +18,16 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.vo.FwDeviceVO;
import java.util.Objects;
/**
- * 反无设备表 包装类,返回视图层所需的字段
+ * 设备表 包装类,返回视图层所需的字段
*
- * @author AIX
- * @since 2026-01-06
+ * @author aix
+ * @since 2026-01-08
*/
public class FwDeviceWrapper extends BaseEntityWrapper<FwDeviceEntity, FwDeviceVO> {
@@ -36,14 +37,11 @@
@Override
public FwDeviceVO entityVO(FwDeviceEntity fwDevice) {
- FwDeviceVO fwDeviceVO = Objects.requireNonNull(BeanUtil.copy(fwDevice, FwDeviceVO.class));
+ return Objects.requireNonNull(BeanUtil.copy(fwDevice, FwDeviceVO.class));
+ }
- //User createUser = UserCache.getUser(fwDevice.getCreateUser());
- //User updateUser = UserCache.getUser(fwDevice.getUpdateUser());
- //fwDeviceVO.setCreateUserName(createUser.getName());
- //fwDeviceVO.setUpdateUserName(updateUser.getName());
-
- return fwDeviceVO;
+ public FwDeviceEntity entityDTO(FwDeviceDTO fwDevice) {
+ return Objects.requireNonNull(BeanUtil.copy(fwDevice, FwDeviceEntity.class));
}
--
Gitblit v1.9.3