From cdb12634ef9f4a972bca62af1e4c3bf053c5e95a Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Sun, 21 Jul 2024 23:10:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/EqHomeController.java | 41 ++++++++++--------- .../resources/i18n/messages_en_US.properties | 21 ++++++++++ .../resources/i18n/messages_zh_CN.properties | 20 +++++++++ 3 files changed, 62 insertions(+), 20 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java index eebf3c80e..169749c6e 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java @@ -3,6 +3,7 @@ package org.dromara.web.controller.app; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MessageUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; @@ -100,7 +101,7 @@ public class EqHomeController extends BaseController { return R.ok(eqEquipmentService.queryById(bo.getEquipmentId())); } - /** + /** todo * 添加设备 * @param bo 传参用户id 分布id 设备编码 * @return @@ -152,25 +153,25 @@ public class EqHomeController extends BaseController { @GetMapping("/noInitDevicePage") public R> noInitDevicePage(){ List list = Arrays.asList( - "详情", - "行程未校准", - "设备未校准行程，将不能进行设备控制", - "行程校准教程", - "请在设备上操作", - "设置开门位置:", - "1.请长按“SET”键", - "观察:显示器显示”1”闪烁", - "2.再次按下\"SET\"键", - "观察:显示器显示为”1”常亮", - "3.长按\"UP\"键,使门至最大开门位置后松手停止", - "观察:门向开门方向运行,当门达到最大开门位置后", - "设置关门位置:", - "4.再次按下\"SET\"键", - "观察:显示器显示为”2”常亮", - "5.长按“向下”键至关闭位置后松手", - "观察:门向关门方向运行,当门达到关闭位置后停止", - "自动校验:", - "6.再次按下\"SET\"键" + MessageUtils.message("route.detail1"), + MessageUtils.message("route.detail2"), + MessageUtils.message("route.detail3"), + MessageUtils.message("route.detail4"), + MessageUtils.message("route.detail5"), + MessageUtils.message("route.detail6"), + MessageUtils.message("route.detail7"), + MessageUtils.message("route.detail8"), + MessageUtils.message("route.detail9"), + MessageUtils.message("route.detail10"), + MessageUtils.message("route.detail11"), + MessageUtils.message("route.detail12"), + MessageUtils.message("route.detail13"), + MessageUtils.message("route.detail14"), + MessageUtils.message("route.detail15"), + MessageUtils.message("route.detail16"), + MessageUtils.message("route.detail17"), + MessageUtils.message("route.detail18"), + MessageUtils.message("route.detail19") ); return R.ok(list); } diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties index f948c4ab8..30f49c1b5 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties @@ -59,3 +59,24 @@ tenant.number.not.blank=Tenant number cannot be blank tenant.not.exists=Sorry, your tenant does not exist. Please contact the administrator tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator tenant.expired=Sorry, your tenant has expired. Please contact the administrator. + + +route.detail1= details +route.detail2= Stroke uncalibrated +route.detail3= If the device is not calibrated, the device cannot be controlled +route.detail4= Stroke calibration tutorial +route.detail5= Please perform the operation on the device +route.detail6= Set the opening position: +route.detail7= 1. Hold down the SET key +route.detail8= Observation: The display displays "1" flashing +route.detail9= 2. Press the "SET" key again +route.detail10= Observe: The monitor is "1" on +route.detail11= 3. Long press the "UP" button to make the door to the maximum opening position and then release the hand to stop +route.detail12= Observation: The door runs in the direction of opening the door, when the door reaches the maximum opening position +route.detail13= Set the door closing position: +route.detail14= 4. Press the "SET" button again +route.detail15= Observe: The display is "2" steady on +route.detail16= 5. Press and hold the Down key to close the button and release +route.detail17= Observation: The door runs in the direction of closing, and stops when the door reaches the closed position +route.detail18= Automatic check: +route.detail19= 6. Press the "SET" button again 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 cce11c85d..da03d518b 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -59,3 +59,23 @@ tenant.number.not.blank=租户编号不能为空 tenant.not.exists=对不起, 您的租户不存在，请联系管理员 tenant.blocked=对不起，您的租户已禁用，请联系管理员 tenant.expired=对不起，您的租户已过期，请联系管理员 + +route.detail1=详情 +route.detail2=行程未校准 +route.detail3=设备未校准行程，将不能进行设备控制 +route.detail4=行程校准教程 +route.detail5=请在设备上操作 +route.detail6=设置开门位置: +route.detail7=1.请长按“SET”键 +route.detail8=观察:显示器显示”1”闪烁 +route.detail9=2.再次按下"SET"键 +route.detail10=观察:显示器显示为”1”常亮 +route.detail11=3.长按"UP"键,使门至最大开门位置后松手停止 +route.detail12=观察:门向开门方向运行,当门达到最大开门位置后 +route.detail13=设置关门位置: +route.detail14=4.再次按下”SET"键 +route.detail15=观察:显示器显示为”2”常亮 +route.detail16=5.长按“向下”键至关闭位置后松手 +route.detail17=观察:门向关门方向运行,当门达到关闭位置后停止 +route.detail18=自动校验: +route.detail19=6.再次按下"SET"键