opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 01:48:47 +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-08-28 14:10:55 +08:00
commit fd9e177273
4 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,7 +523,8 @@ public class EqTextController extends BaseController {
MessageUtils.message("ble.name68"), MessageUtils.message("ble.name68"),
MessageUtils.message("ble.name69"), MessageUtils.message("ble.name69"),
MessageUtils.message("ble.name70"), MessageUtils.message("ble.name70"),
MessageUtils.message("ble.name71") MessageUtils.message("ble.name71"),
MessageUtils.message("ble.name72")
)); ));
return R.ok(result); return R.ok(result);

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

@ -72,23 +72,23 @@ public class IotService {
DeviceMsgDto result = new DeviceMsgDto(); DeviceMsgDto result = new DeviceMsgDto();
result.setAutomaticDoorClosingSwitch(Boolean.valueOf(resultMap.get("AutomaticDoorClosingSwitch"))); result.setAutomaticDoorClosingSwitch(Boolean.valueOf(resultMap.get("AutomaticDoorClosingSwitch")==null?"false":resultMap.get("AutomaticDoorClosingSwitch")));
result.setAutomaticDoorClosingTime(Integer.valueOf(resultMap.get("AutomaticDoorClosingTime"))); result.setAutomaticDoorClosingTime(Integer.valueOf(resultMap.get("AutomaticDoorClosingTime")==null?"-1":resultMap.get("AutomaticDoorClosingTime")));
result.setDoorRunningTimesSwitch(Boolean.valueOf(resultMap.get("DoorRunningTimesSwitch"))); result.setDoorRunningTimesSwitch(Boolean.valueOf(resultMap.get("DoorRunningTimesSwitch")==null?"false":resultMap.get("DoorRunningTimesSwitch")));
result.setResidualCountDown(Integer.valueOf(resultMap.get("ResidualCountDown"))); result.setResidualCountDown(Integer.valueOf(resultMap.get("ResidualCountDown")==null?"-1":resultMap.get("ResidualCountDown")));
result.setDoorRunningTimes(Integer.valueOf(resultMap.get("DoorRunningTimes"))); result.setDoorRunningTimes(Integer.valueOf(resultMap.get("DoorRunningTimes")==null?"-1":resultMap.get("DoorRunningTimes")));
result.setGarageException(Integer.valueOf(resultMap.get("GarageException")==null?"-1":resultMap.get("GarageException"))); result.setGarageException(Integer.valueOf(resultMap.get("GarageException")==null?"-1":resultMap.get("GarageException")));
result.setCountDownConfig(Integer.valueOf(resultMap.get("CountDownConfig"))); result.setCountDownConfig(Integer.valueOf(resultMap.get("CountDownConfig")==null?"-1":resultMap.get("CountDownConfig")));
result.setLightSwitch(Boolean.valueOf(resultMap.get("LightSwitch"))); result.setLightSwitch(Boolean.valueOf(resultMap.get("LightSwitch")==null?"false":resultMap.get("LightSwitch")));
result.setRemindCloseDoorConfig(Integer.valueOf(resultMap.get("RemindCloseDoorConfig"))); result.setRemindCloseDoorConfig(Integer.valueOf(resultMap.get("RemindCloseDoorConfig")==null?"-1":resultMap.get("RemindCloseDoorConfig")));
result.setRemindCloseDoorSwitch(Boolean.valueOf(resultMap.get("RemindCloseDoorSwitch"))); result.setRemindCloseDoorSwitch(Boolean.valueOf(resultMap.get("RemindCloseDoorSwitch")==null?"false":resultMap.get("RemindCloseDoorSwitch")));
result.setPartOpenConfig(Integer.valueOf(resultMap.get("PartOpenConfig"))); result.setPartOpenConfig(Integer.valueOf(resultMap.get("PartOpenConfig")==null?"-1":resultMap.get("PartOpenConfig")));
result.setPartOpenSwitch(Boolean.valueOf(resultMap.get("PartOpenSwitch"))); result.setPartOpenSwitch(Boolean.valueOf(resultMap.get("PartOpenSwitch")==null?"false":resultMap.get("PartOpenSwitch")));
result.setOpenPercentage(Integer.valueOf(resultMap.get("OpenPercentage"))); result.setOpenPercentage(Integer.valueOf(resultMap.get("OpenPercentage")==null?"-1":resultMap.get("OpenPercentage")));
result.setWorkState(Integer.valueOf(resultMap.get("WorkState")==null?"-1":resultMap.get("WorkState"))); result.setWorkState(Integer.valueOf(resultMap.get("WorkState")==null?"-1":resultMap.get("WorkState")));
result.setRouteCorrectStatus(Boolean.valueOf(resultMap.get("RouteCorrectStatus"))); result.setRouteCorrectStatus(Boolean.valueOf(resultMap.get("RouteCorrectStatus")==null?"false":resultMap.get("RouteCorrectStatus")));
result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity"))); result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity")==null?"-1":resultMap.get("BounceSensitivity")));
result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch"))); result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch")==null?"false":resultMap.get("IRSwitch")));
result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus")==null?"-1":resultMap.get("warningStatus"))); result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus")==null?"-1":resultMap.get("warningStatus")));
return result; return result;
} }

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

@ -281,13 +281,13 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
String equipmentName = equipmentCode;//暂时不存设备名称 下面从其他接口获取并存入了 String equipmentName = equipmentCode;//暂时不存设备名称 下面从其他接口获取并存入了
equipmentCode = deviceByNameDto.getId().getId(); equipmentCode = deviceByNameDto.getId().getId();
LambdaQueryWrapper<EqEquipment> lqw = Wrappers.lambdaQuery();
lqw.eq( EqEquipment::getEquipmentCode,equipmentCode);
EqEquipmentVo eqEquipmentVo = baseMapper.selectVoOne(lqw);
if (eqEquipmentVo!=null) throw new RuntimeException(MessageUtils.message("message.fault.device.isbind"));
DeviceServerMsgDto deviceServerMsgDto = iotService.httpServerGetSend(equipmentCode); DeviceServerMsgDto deviceServerMsgDto = iotService.httpServerGetSend(equipmentCode);
if (!deviceServerMsgDto.getLineStatus()) throw new RuntimeException(MessageUtils.message("message.fault.device.offline")); if (!deviceServerMsgDto.getLineStatus()) {
System.out.println("设备离线");//设备离线也给添加设备
// throw new RuntimeException(MessageUtils.message("message.fault.device.offline"));
}
@ -316,7 +316,18 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
//判断是否获取到信息 无信息会抛异常 无需判断 //判断是否获取到信息 无信息会抛异常 无需判断
EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class); EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class);
baseMapper.insert(add);
LambdaQueryWrapper<EqEquipment> lqw = Wrappers.lambdaQuery();
lqw.eq( EqEquipment::getEquipmentCode,equipmentCode);
EqEquipmentVo eqEquipmentVo = baseMapper.selectVoOne(lqw);
// if (eqEquipmentVo!=null) throw new RuntimeException(MessageUtils.message("message.fault.device.isbind"));
if (eqEquipmentVo!=null){
assert add != null;
add.setEquipmentId(eqEquipmentVo.getEquipmentId());
baseMapper.updateById(add);
}else{
baseMapper.insert(add);
}
return true; return true;
} }

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

@ -482,3 +482,4 @@ ble.name68=4. 短按“SET”键；
ble.name69=观察：显示器显示“A”，此时设备开始配网； ble.name69=观察：显示器显示“A”，此时设备开始配网；
ble.name70=5.在APP上对设备进行配网，直至配网完成； ble.name70=5.在APP上对设备进行配网，直至配网完成；
ble.name71=观察：配网完成后显示器显示“11”，设备进入待机装填； ble.name71=观察：配网完成后显示器显示“11”，设备进入待机装填；
ble.name72=返回首页