From ca79df9cdd2cd5d102fb4cdc86d9e8219933550a Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Sat, 24 Aug 2024 23:50:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?saveDeviceLogs=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E8=AE=BE=E5=A4=87id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/web/controller/app/EqDeviceController.java | 1 + 1 file changed, 1 insertion(+) 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()); From dff97f807dfc9cebb7ac37d44888b8f1d2f7c3c7 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Sun, 25 Aug 2024 00:06:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties | 2 ++ 1 file changed, 2 insertions(+) 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 = 设备已绑定