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 2024-11-03 23:20:40 +08:00
parent 33e9e869b3
commit 61e15be833
3 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java
View File

@ -87,7 +87,12 @@ public class EqTextController extends BaseController {
MessageUtils.message("login.name6"), MessageUtils.message("login.name6"),
MessageUtils.message("login.name7"), MessageUtils.message("login.name7"),
MessageUtils.message("login.name8"), MessageUtils.message("login.name8"),
MessageUtils.message("login.name9") MessageUtils.message("login.name9"),
MessageUtils.message("login.name10"),
MessageUtils.message("login.name11"),
MessageUtils.message("login.name12"),
MessageUtils.message("login.name13"),
MessageUtils.message("login.name14")
)); ));
//《注册》register //《注册》register
@ -282,7 +287,9 @@ public class EqTextController extends BaseController {
MessageUtils.message("set.name27"), MessageUtils.message("set.name27"),
MessageUtils.message("set.name28"), MessageUtils.message("set.name28"),
MessageUtils.message("set.name29"), MessageUtils.message("set.name29"),
MessageUtils.message("set.name30") MessageUtils.message("set.name30"),
MessageUtils.message("set.name31"),
MessageUtils.message("set.name32")
)); ));
//《通用》setCommon //《通用》setCommon

27
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
View File

@ -420,15 +420,30 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
List<DeviceOtaPackages> list = iotService.httpOtaPackages(profileIdId); List<DeviceOtaPackages> list = iotService.httpOtaPackages(profileIdId);
DeviceOtaPackages lastOtaPackage = list.get(0); DeviceOtaPackages lastOtaPackage = list.get(0);
DeviceOtaPackages currentOtaPackage = null; DeviceOtaPackages currentOtaPackage = null;
//获取客户端属性
DeviceClientMsgDto clientMsg = iotService.httpClientGetSend(equipmentCode);
String currentVersion = clientMsg.getModelVersion();
//设备包版本id //设备包版本id
if (deviceDto.getFirmwareId()==null) throw new RuntimeException("设备未绑定OTA版本"); if (deviceDto.getFirmwareId()==null && StringUtils.isBlank(currentVersion)) throw new RuntimeException("设备未绑定OTA版本");
String currentPackageId = deviceDto.getFirmwareId().getId();
String lastPackageId = lastOtaPackage.getId().getId(); //3.判断设备是否需要升级
if (lastOtaPackage == null){
eqVersionBo.setNeedUpdate(false);
eqVersionBo.setCurrentVersion(currentVersion);
eqVersionBo.setLatestVersion(null);
}else{
eqVersionBo.setNeedUpdate(true);
eqVersionBo.setCurrentVersion(currentVersion);
eqVersionBo.setLatestVersion(lastOtaPackage.getVersion());
}
/*String lastPackageId = lastOtaPackage.getId().getId();
for (DeviceOtaPackages deviceOtaPackages : list) { for (DeviceOtaPackages deviceOtaPackages : list) {
if (deviceOtaPackages.getId().getId().equals(currentPackageId)) if (deviceOtaPackages.getVersion().equals(currentVersion))
currentOtaPackage = deviceOtaPackages; currentOtaPackage = deviceOtaPackages;
} }
if (currentOtaPackage == null) throw new RuntimeException("当前设备版本不存在"); if (currentOtaPackage == null) throw new RuntimeException("当前设备版本不存在与升级版本包中");
String currentPackageId = currentOtaPackage.getId().getId();
if (currentPackageId.equals(lastPackageId)){ if (currentPackageId.equals(lastPackageId)){
eqVersionBo.setNeedUpdate(false); eqVersionBo.setNeedUpdate(false);
eqVersionBo.setCurrentVersionId(currentPackageId); eqVersionBo.setCurrentVersionId(currentPackageId);
@ -439,7 +454,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
eqVersionBo.setCurrentVersion(currentOtaPackage.getVersion()); eqVersionBo.setCurrentVersion(currentOtaPackage.getVersion());
eqVersionBo.setLatestVersionId(lastPackageId); eqVersionBo.setLatestVersionId(lastPackageId);
eqVersionBo.setLatestVersion(lastOtaPackage.getVersion()); eqVersionBo.setLatestVersion(lastOtaPackage.getVersion());
} }*/
return eqVersionBo; return eqVersionBo;
} }

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

File diff suppressed because one or more lines are too long