From 628cc1fa99e1b9d28c70de3fc7bdb7481d0951bf Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Tue, 8 Jul 2025 10:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java | 6 ++++++ .../equipment/service/impl/DeviceServiceImpl.java | 4 ++-- .../src/main/resources/mapper/equipment/DeviceMapper.xml | 8 +++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java index b68b96a..2eadc08 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java @@ -1,5 +1,6 @@ package com.fuyuanshen.equipment.domain.vo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data @@ -21,4 +22,9 @@ public class AppDeviceVo { * 设备MAC */ private String deviceMac; + + /** + * 通讯方式 0:4G;1:蓝牙 + */ + private Integer communicationMode; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index a3bc5e7..1e1476c 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -375,8 +375,8 @@ public class DeviceServiceImpl extends ServiceImpl impleme if(device == null){ throw new RuntimeException("请先将设备入库!!!"); } - DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType()); - String mode = deviceType.getCommunicationMode(); +// DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType()); +// String mode = deviceType.getCommunicationMode(); UpdateWrapper deviceUpdateWrapper = new UpdateWrapper<>(); deviceUpdateWrapper.eq("id", device.getId()) .set("binding_status", BindingStatusEnum.UNBOUND.getCode()); diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index b83c9ea..6316070 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -94,11 +94,9 @@