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

多语言修改

Browse Source
This commit is contained in:
zzc 2025-04-26 21:12:30 +08:00
parent 43e952cbe2
commit b0adf1fc4f
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
View File

@ -293,7 +293,7 @@ public class EqDeviceController extends BaseController {
String equipmentName = eqEquipmentLogBo.getEquipmentName(); String equipmentName = eqEquipmentLogBo.getEquipmentName();
Integer status = eqEquipmentLogBo.getStatus(); Integer status = eqEquipmentLogBo.getStatus();
// List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108", "1", "2", "112", "113"); // List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108", "1", "2", "112", "113");
List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108", "112", "113"); List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108","109","110","112", "113");
//设备id查询 //设备id查询
DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断 DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断

22
ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java
View File

@ -75,18 +75,18 @@ public class EqEquipmentLogBo extends BaseEntity {
* 14.设备故障 deviceException * 14.设备故障 deviceException
* *
* 101.烟雾报警 √ * 101.烟雾报警 √
* 102.红外触发报警√ * 102.红外保护被触发√
* 103.电机运行报警√ * 103.电机运转报警√
* 104.电机维修报警√ * 104.电机维修告警√
* 105.非APP开门提醒√ * 105.非APP开门√
* 106.非APP关门提醒√ * 106.非APP关门√
* 107.关门故障报警√ * 107.关门故障√
* 108.开门故障报警√ * 108.开门故障√
* 109.开门运行提醒 使用1 * 109.开门 使用1
* 110.关门运行提醒 使用2 * 110.关门 使用2
* 111.忘记关门提醒 * 111.忘记关门提醒
* 112.门体手动开启提醒√ * 112.门被手动打开√
* 113.半开门运行提醒√ * 113.半开门√
* 114.门体停止运行提醒 * 114.门体停止运行提醒
* *
* 500.设备离线 offline * 500.设备离线 offline

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

@ -332,21 +332,21 @@ logStatus.name11=红外故障
logStatus.name12=电机运转故障 logStatus.name12=电机运转故障
logStatus.name13=电机维护故障 logStatus.name13=电机维护故障
logStatus.name14=设备故障 logStatus.name14=设备故障
## 《故障状态》 ## 《日志告警状态》
logStatus.name101=烟雾报警 logStatus.name101=烟雾报警
logStatus.name102=红外触发报警 logStatus.name102=红外保护被触发
logStatus.name103=电机运行报警 logStatus.name103=电机运转报警
logStatus.name104=电机维修报警 logStatus.name104=电机维修告警
logStatus.name105=非APP开门提醒 logStatus.name105=非APP开门
logStatus.name106=非APP关门提醒 logStatus.name106=非APP关门
logStatus.name107=关门故障报警 logStatus.name107=关门故障
logStatus.name108=开门故障报警 logStatus.name108=开门故障
logStatus.name109=开门运行提醒 logStatus.name109=开门
logStatus.name110=关门运行提醒 logStatus.name110=关门
logStatus.name111=忘记关门提醒 logStatus.name111=忘记关门提醒(日志未用)
logStatus.name112=门体手动开启提醒 logStatus.name112=门被手动打开
logStatus.name113=半开门运行提醒 logStatus.name113=半开门
logStatus.name114=门体停止运行提醒 logStatus.name114=门体停止运行提醒(日志未用)
logStatus.name500=离线 logStatus.name500=离线
logStatus.name501=在线 logStatus.name501=在线