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

修改头像即设备状态值获取

Browse Source
This commit is contained in:
zzc 2024-08-15 22:36:46 +08:00
parent 5c8ce2ce18
commit 6cca5e16d2
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java
View File

@ -82,6 +82,7 @@ public class EqUserController extends BaseController {
TenantHelper.clearDynamic(); TenantHelper.clearDynamic();
} }
SysUserVo user = userService.selectUserById(loginUser.getUserId()); SysUserVo user = userService.selectUserById(loginUser.getUserId());
if (user.getAvatar()==null) user.setAvatar(0L);
if (ObjectUtil.isNull(user)) { if (ObjectUtil.isNull(user)) {
return R.fail("没有权限访问用户数据!"); return R.fail("没有权限访问用户数据!");
} }

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

@ -71,23 +71,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")));
result.setAutomaticDoorClosingTime(jsonObject.getInteger("AutomaticDoorClosingTime")); result.setAutomaticDoorClosingTime(Integer.valueOf(resultMap.get("AutomaticDoorClosingTime")));
result.setDoorRunningTimesSwitch(jsonObject.getInteger("DoorRunningTimesSwitch")); result.setDoorRunningTimesSwitch(Integer.valueOf(resultMap.get("DoorRunningTimesSwitch")));
result.setResidualCountDown(jsonObject.getInteger("ResidualCountDown")); result.setResidualCountDown(Integer.valueOf(resultMap.get("ResidualCountDown")));
result.setDoorRunningTimes(jsonObject.getInteger("DoorRunningTimes")); result.setDoorRunningTimes(Integer.valueOf(resultMap.get("DoorRunningTimes")));
result.setGarageException(jsonObject.getInteger("GarageException")); result.setGarageException(Integer.valueOf(resultMap.get("GarageException")));
result.setCountDownConfig(jsonObject.getInteger("CountDownConfig")); result.setCountDownConfig(Integer.valueOf(resultMap.get("CountDownConfig")));
result.setLightSwitch(jsonObject.getBoolean("LightSwitch")); result.setLightSwitch(Boolean.valueOf(resultMap.get("LightSwitch")));
result.setRemindCloseDoorConfig(jsonObject.getInteger("RemindCloseDoorConfig")); result.setRemindCloseDoorConfig(Integer.valueOf(resultMap.get("RemindCloseDoorConfig")));
result.setRemindCloseDoorSwitch(jsonObject.getBoolean("RemindCloseDoorSwitch")); result.setRemindCloseDoorSwitch(Boolean.valueOf(resultMap.get("RemindCloseDoorSwitch")));
result.setPartOpenConfig(jsonObject.getInteger("PartOpenConfig")); result.setPartOpenConfig(Integer.valueOf(resultMap.get("PartOpenConfig")));
result.setPartOpenSwitch(jsonObject.getBoolean("PartOpenSwitch")); result.setPartOpenSwitch(Boolean.valueOf(resultMap.get("PartOpenSwitch")));
result.setOpenPercentage(jsonObject.getInteger("OpenPercentage")); result.setOpenPercentage(Integer.valueOf(resultMap.get("OpenPercentage")));
result.setWorkState(jsonObject.getInteger("WorkState")); result.setWorkState(Integer.valueOf(resultMap.get("WorkState")));
result.setRouteCorrectStatus(jsonObject.getBoolean("RouteCorrectStatus")); result.setRouteCorrectStatus(Boolean.valueOf(resultMap.get("RouteCorrectStatus")));
result.setBounceSensitivity(jsonObject.getInteger("BounceSensitivity")); result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity")));
result.setIRSwitch(jsonObject.getBoolean("IRSwitch")); result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch")));
result.setWarningStatus(jsonObject.getInteger("warningStatus")); result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus")));
return result; return result;
} }

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

@ -163,8 +163,8 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
case 4: cmd = DeviceCtlCmd.OPT_CLOSE_GARAGE; break;//关门 case 4: cmd = DeviceCtlCmd.OPT_CLOSE_GARAGE; break;//关门
case 5: cmd = DeviceCtlCmd.OPT_TOGGLE_GARAGE; break;//门体运行状态循环切换 case 5: cmd = DeviceCtlCmd.OPT_TOGGLE_GARAGE; break;//门体运行状态循环切换
case 6: cmd = DeviceCtlCmd.OPT_RESUME_COUNTDOWN; break;//复位照明时长 case 6: cmd = DeviceCtlCmd.OPT_RESUME_COUNTDOWN; break;//复位照明时长
case 7: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关 case 7: cmd = DeviceCtlCmd.LightSwitch_true; break;//照明灯开关 开
case 8: cmd = DeviceCtlCmd.LightSwitch_true; break;//照明灯开关 开 case 8: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关
default: default:
return "指令类型错误"; return "指令类型错误";
} }