opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 17:38:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.X' into 5.X

Browse Source
This commit is contained in:
sunyuehai 2024-09-10 11:31:11 +08:00
commit 6235b44459
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java
View File

@ -196,5 +196,13 @@ public class DeviceMsgDto {
* 4.遥控器擦除完成
*/
private Integer checkCodeStatus;
/**
* 1.遥控器对码中
* 2.遥控器对码完成
* 3.遥控器擦除中
* 4.遥控器擦除完成
*/
private String checkCodeStatusStr;
}

1
ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java
View File

@ -92,6 +92,7 @@ public class IotService {
result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus")==null?"-1":resultMap.get("warningStatus")));
result.setCheckCodeStatus(Integer.valueOf(resultMap.get("checkCodeStatus")==null?"-1":resultMap.get("checkCodeStatus")));
result.setCheckCodeStatusStr(MessageUtils.message("checkCodeStatusStr.name"+result.getCheckCodeStatus()));
return result;
}

6
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
View File

@ -61,7 +61,11 @@ tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator
tenant.expired=Sorry, your tenant has expired. Please contact the administrator.
## 清码状态
checkCodeStatusStr.name1=be checking
checkCodeStatusStr.name2=check complete
checkCodeStatusStr.name3=be clearing
checkCodeStatusStr.name4=clear complete
## "Login"
login.name0 = login

6
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -105,6 +105,12 @@ message.fault.device.notfound = 设备不存在
message.fault.device.isbind = 设备已绑定
message.fault.device.offline = 设备未连接 无法绑定
## 清码状态
checkCodeStatusStr.name1=遥控器对码中
checkCodeStatusStr.name2=遥控器对码完成
checkCodeStatusStr.name3=遥控器擦除中
checkCodeStatusStr.name4=遥控器擦除完成
#====== app =========
##《登录》login