diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/domain/DeviceInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/domain/DeviceInfo.java
index f479ca9..3728a9d 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/domain/DeviceInfo.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/domain/DeviceInfo.java
@@ -219,5 +219,5 @@ public class DeviceInfo extends BaseEntity {
private String stallId;
private String stallName;
private String recipeId;
-
+ private String recipeName;
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml
index ded86e5..5bb97a5 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/DeviceInfoMapper.xml
@@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -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,
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,
- 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
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 aaa on ba.parent_id = aaa.area_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 cook_recipe_bind_device crbd on di.device_id = crbd.device_id
+ left join cook_recipe cr on crbd.recipe_id = cr.recipe_id