From e198fb86d774f00e44d84416ed03023981eac2d9 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Wed, 9 Apr 2025 09:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E5=B1=8F=E6=B6=88=E8=B4=B9=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/device/vo/DeviceFullInfoVO.java | 14 ++++++++++++++ .../mapper/device/DoubleScreenMachineMapper.xml | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java index 3688450..f3a333e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java @@ -35,4 +35,18 @@ public class DeviceFullInfoVO { private Integer versionCode; @ApiModelProperty("版本名称（MQTT上报）") private String versionName; + @ApiModelProperty("设备ip") + private String deviceIp; + @ApiModelProperty("设备mac") + private String deviceMac; + @ApiModelProperty("设备网关") + private String deviceGateway; + @ApiModelProperty("设备sn") + private String deviceSn; + @ApiModelProperty("设备密码") + private String devicePwd; + @ApiModelProperty("设备地址") + private String deviceAddr; + @ApiModelProperty("设备key") + private String deviceKey; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml index eaa14b8..c9b4fe3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml @@ -86,7 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ast.stall_name AS stallName, ast.stall_id AS stallId, di.version_code AS versionCode, - di.device_state AS deviceState + di.device_state AS deviceState, + di.device_ip as deviceIp, + di.device_mac as deviceMac, + di.device_gateway AS deviceGateway, + di.device_sn AS deviceSn, + di.device_pwd as devicePwd, + di.device_addr AS deviceAddr, + di.device_key AS deviceKey FROM device_info di