From 0b378f2f211a828baf30c60348096a6497ae4356 Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Mon, 9 Jun 2025 17:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/admin/device/DeviceController.java   | 6 ++++++
 .../module/system/dal/dataobject/device/DeviceDO.java      | 3 +--
 .../yudao/module/system/dal/mysql/device/DeviceMapper.java | 2 ++
 .../yudao/module/system/service/device/DeviceService.java  | 4 ++++
 .../module/system/service/device/DeviceServiceImpl.java    | 7 ++++---
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java
index 25e77cd69c..03ed5706a0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java
@@ -66,6 +66,12 @@ public class DeviceController {
         DeviceDO device = deviceService.getDevice(id);
         return success(BeanUtils.toBean(device, DeviceRespVO.class));
     }
+    @GetMapping("/getDeviceId")
+    @Operation(summary = "根据设备编号获得设备详情")
+    public CommonResult<DeviceRespVO> getDeviceId(@RequestParam("devicecode") Integer devicecode) {
+        DeviceDO device = deviceService.getDeviceId(devicecode);
+        return success(BeanUtils.toBean(device, DeviceRespVO.class));
+    }
 
     @GetMapping("/page")
     @Operation(summary = "获得设备分页")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java
index 1d4ca9e022..d999bf8a15 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java
@@ -15,12 +15,11 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @TableName("tb_device")
 @KeySequence("tb_device_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class DeviceDO extends BaseDO {
+public class DeviceDO  {
 
     /**
      * 主键ID
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java
index 38820e5419..cffeafd480 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.system.dal.dataobject.device.DeviceDO;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.system.controller.admin.device.vo.*;
 
@@ -15,6 +16,7 @@ import cn.iocoder.yudao.module.system.controller.admin.device.vo.*;
  * @author 全智安
  */
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface DeviceMapper extends BaseMapperX<DeviceDO> {
 
     default PageResult<DeviceDO> selectPage(DevicePageReqVO reqVO) {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java
index 9cceec9641..7955814869 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java
@@ -43,6 +43,10 @@ public interface DeviceService {
      * @return 设备
      */
     DeviceDO getDevice(Integer id);
+    /*
+    * 根据设备编号查询设备
+    * */
+    DeviceDO getDeviceId(Integer devicecode);
 
     /**
      * 获得设备分页
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java
index b2653c9e41..ebd165a7f6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java
@@ -3,13 +3,10 @@ package cn.iocoder.yudao.module.system.service.device;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
 import cn.iocoder.yudao.module.system.controller.admin.device.vo.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.device.DeviceDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.system.dal.mysql.device.DeviceMapper;
@@ -65,6 +62,10 @@ public class DeviceServiceImpl implements DeviceService {
     public DeviceDO getDevice(Integer id) {
         return deviceMapper.selectById(id);
     }
+    @Override
+    public DeviceDO getDeviceId(Integer devicecode) {
+        return deviceMapper.selectOne(DeviceDO::getDevicecode, devicecode);
+    }
 
     @Override
     public PageResult<DeviceDO> getDevicePage(DevicePageReqVO pageReqVO) {