bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

双屏消费机

This commit is contained in:
jjLv 2025-04-09 09:53:15 +08:00
parent 635d31ab8d
commit e198fb86d7
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/vo/DeviceFullInfoVO.java
View File

@ -35,4 +35,18 @@ public class DeviceFullInfoVO {
private Integer versionCode; private Integer versionCode;
@ApiModelProperty("版本名称（MQTT上报）") @ApiModelProperty("版本名称（MQTT上报）")
private String versionName; 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;
} }

9
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DoubleScreenMachineMapper.xml
View File

@ -86,7 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ast.stall_name AS stallName, ast.stall_name AS stallName,
ast.stall_id AS stallId, ast.stall_id AS stallId,
di.version_code AS versionCode, 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 FROM device_info di
<!-- 根据条件动态选择INNER JOIN或LEFT JOIN device_bind --> <!-- 根据条件动态选择INNER JOIN或LEFT JOIN device_bind -->
<choose> <choose>