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

食堂-设备问题修改

This commit is contained in:
jjLv 2025-05-29 16:21:20 +08:00
parent d26e771078
commit 0c325cf111
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/domain/DeviceInfo.java
View File

@ -219,5 +219,5 @@ public class DeviceInfo extends BaseEntity {
private String stallId; private String stallId;
private String stallName; private String stallName;
private String recipeId; private String recipeId;
private String recipeName;
} }

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

@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="canteenName" column="canteen_name" /> <result property="canteenName" column="canteen_name" />
<result property="stallId" column="stall_id" /> <result property="stallId" column="stall_id" />
<result property="stallName" column="stall_name" /> <result property="stallName" column="stall_name" />
<result property="recipeName" column="recipe_name" />
<result property="recipeId" column="recipe_id" />
</resultMap> </resultMap>
<sql id="selectDeviceInfoVo"> <sql id="selectDeviceInfoVo">
@ -65,13 +67,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
heart_beat_time, last_update_time, di.create_by, di.create_time, di.update_by, di.update_time, heart_beat_time, last_update_time, di.create_by, di.create_time, di.update_by, di.update_time,
db.area_id, db.canteen_id, bc.canteen_name, db.stall_id, bs.stall_name, db.area_id, db.canteen_id, bc.canteen_name, db.stall_id, bs.stall_name,
if((UNIX_TIMESTAMP() - di.last_update_time) > 120, '2','1' ) AS online_state, if((UNIX_TIMESTAMP() - di.last_update_time) > 120, '2','1' ) AS online_state,
CONCAT(aaa.area_name, '/', ba.area_name) AS area_name CONCAT(aaa.area_name, '/', ba.area_name) AS area_name,
cr.recipe_name, crbd.recipe_id
from device_info di from device_info di
left join device_bind db on di.device_id = db.device_id left join device_bind db on di.device_id = db.device_id
left join basic_area ba on db.area_id = ba.area_id left join basic_area ba on db.area_id = ba.area_id
left join basic_area aaa on ba.parent_id = aaa.area_id left join basic_area aaa on ba.parent_id = aaa.area_id
left join basic_canteen bc on db.canteen_id = bc.canteen_id left join basic_canteen bc on db.canteen_id = bc.canteen_id
left join basic_stall bs on db.stall_id = bs.stall_id left join basic_stall bs on db.stall_id = bs.stall_id
left join cook_recipe_bind_device crbd on di.device_id = crbd.device_id
left join cook_recipe cr on crbd.recipe_id = cr.recipe_id
</sql> </sql>
<select id="selectDeviceInfoList" parameterType="com.bonus.canteen.core.device.domain.DeviceInfo" resultMap="DeviceInfoResult"> <select id="selectDeviceInfoList" parameterType="com.bonus.canteen.core.device.domain.DeviceInfo" resultMap="DeviceInfoResult">
@ -84,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="searchValue != null and searchValue != ''"> <if test="searchValue != null and searchValue != ''">
and (di.device_name like concat('%', #{searchValue}, '%') and (di.device_name like concat('%', #{searchValue}, '%')
or di.device_sn like concat('%', #{searchValue}, '%') or di.device_sn like concat('%', #{searchValue}, '%')
or di.device_number like concat('%', #{searchValue}, '%') or di.device_number like concat('%', #{searchValue}, '%'))
</if> </if>
</where> </where>
order by di.create_time desc order by di.create_time desc