diff --git a/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java b/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java index cb5d99c0a..7ef30306f 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java @@ -196,5 +196,13 @@ public class DeviceMsgDto { * 4.遥控器擦除完成 */ private Integer checkCodeStatus; + + /** + * 1.遥控器对码中 + * 2.遥控器对码完成 + * 3.遥控器擦除中 + * 4.遥控器擦除完成 + */ + private String checkCodeStatusStr; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java index 1b7ad5c23..b78783756 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java @@ -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; } 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 cb4b5c7df..ad77e80b7 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties @@ -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 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 24ed4a782..71afabbb3 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -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