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-29 09:27:24 +08:00
parent 253f49b998
commit ad7fe392f1
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,13 @@ public class DeviceFullInfoVO {
private Integer gateDefaultAmount; private Integer gateDefaultAmount;
@ApiModelProperty("设备状态") @ApiModelProperty("设备状态")
private String deviceState; private String deviceState;
private String recipeName;
private String areaName;
private String areaId;
private String canteenName;
private String canteenId;
private String stallName;
private String stallId;
@ApiModelProperty("绑定关系") @ApiModelProperty("绑定关系")
private List<DeviceBindVO> bindList; private List<DeviceBindVO> bindList;
@ApiModelProperty("菜谱信息") @ApiModelProperty("菜谱信息")

3
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
View File

@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_user su from sys_user su
left join acc_card ac on ac.user_id = su.user_id left join acc_card ac on ac.user_id = su.user_id
left join acc_info ai on ai.user_id = su.user_id left join acc_info ai on ai.user_id = su.user_id
<where> where ai.del_flag = '2'
<if test="type == 'user'"> <if test="type == 'user'">
<if test="time != null and time != ''"> <if test="time != null and time != ''">
AND su.update_time >= #{time} - INTERVAL 5 SECOND; AND su.update_time >= #{time} - INTERVAL 5 SECOND;
@ -31,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null and userId != '' and userId != 0 and userId != '0'"> <if test="userId != null and userId != '' and userId != 0 and userId != '0'">
AND su.user_id = #{userId} AND su.user_id = #{userId}
</if> </if>
</where>
</select> </select>
<select id="getMoneyList" resultType="com.bonus.canteen.core.android.vo.UserInfoVo"> <select id="getMoneyList" resultType="com.bonus.canteen.core.android.vo.UserInfoVo">
SELECT SELECT

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

@ -148,9 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="checkIsExist" resultType="java.lang.Integer"> <select id="checkIsExist" resultType="java.lang.Integer">
select count(1) select count(1)
from device_info from device_info
where (device_num like concat('%', #{keyWord}, '%') where (device_num = #{keyWord}
or device_name like concat('%', #{keyWord}, '%') or device_name = #{keyWord}
or device_sn like concat('%', #{keyWord}, '%')) or device_sn = #{keyWord})
<if test="deviceId != null and deviceId != ''"> <if test="deviceId != null and deviceId != ''">
and device_id != #{deviceId} and device_id != #{deviceId}
</if> </if>