diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java index fa7d85890..52c703a91 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java @@ -197,6 +197,7 @@ public class EqDeviceController extends BaseController { if (CollectionUtils.isEmpty(eqEquipmentVos)) return; EqEquipmentVo eqEquipmentVo = eqEquipmentVos.get(0); //日志数据组装 + eqEquipmentLogBo.setEquipmentId(eqEquipmentVo.getEquipmentId()); eqEquipmentLogBo.setEquipmentCode(equipmentCode); eqEquipmentLogBo.setEquipmentName(equipmentName); eqEquipmentLogBo.setUserId(eqEquipmentVo.getUserId()); diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties index b8702f3d9..e17aabff2 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -98,6 +98,8 @@ logStatus.name111=忘记关门提醒 logStatus.name112=门体手动开启提醒 logStatus.name113=半开门运行提醒 logStatus.name114=门体停止运行提醒 +logStatus.name500=离线 +logStatus.name501=在线 message.fault.device.notfound = 设备不存在 message.fault.device.isbind = 设备已绑定