From 6cca5e16d297ea275610333e83089951c80d1757 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Thu, 15 Aug 2024 22:36:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F=E5=8D=B3?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E5=80=BC=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/EqUserController.java | 1 + .../org/dromara/web/service/IotService.java | 34 +++++++++---------- .../service/impl/EqEquipmentServiceImpl.java | 4 +-- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java index eee9f556d..d31c61b3a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java @@ -82,6 +82,7 @@ public class EqUserController extends BaseController { TenantHelper.clearDynamic(); } SysUserVo user = userService.selectUserById(loginUser.getUserId()); + if (user.getAvatar()==null) user.setAvatar(0L); if (ObjectUtil.isNull(user)) { return R.fail("没有权限访问用户数据!"); } 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 a88a55000..4803f09af 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 @@ -71,23 +71,23 @@ public class IotService { DeviceMsgDto result = new DeviceMsgDto(); result.setAutomaticDoorClosingSwitch(Boolean.valueOf(resultMap.get("AutomaticDoorClosingSwitch"))); - result.setAutomaticDoorClosingTime(jsonObject.getInteger("AutomaticDoorClosingTime")); - result.setDoorRunningTimesSwitch(jsonObject.getInteger("DoorRunningTimesSwitch")); - result.setResidualCountDown(jsonObject.getInteger("ResidualCountDown")); - result.setDoorRunningTimes(jsonObject.getInteger("DoorRunningTimes")); - result.setGarageException(jsonObject.getInteger("GarageException")); - result.setCountDownConfig(jsonObject.getInteger("CountDownConfig")); - result.setLightSwitch(jsonObject.getBoolean("LightSwitch")); - result.setRemindCloseDoorConfig(jsonObject.getInteger("RemindCloseDoorConfig")); - result.setRemindCloseDoorSwitch(jsonObject.getBoolean("RemindCloseDoorSwitch")); - result.setPartOpenConfig(jsonObject.getInteger("PartOpenConfig")); - result.setPartOpenSwitch(jsonObject.getBoolean("PartOpenSwitch")); - result.setOpenPercentage(jsonObject.getInteger("OpenPercentage")); - result.setWorkState(jsonObject.getInteger("WorkState")); - result.setRouteCorrectStatus(jsonObject.getBoolean("RouteCorrectStatus")); - result.setBounceSensitivity(jsonObject.getInteger("BounceSensitivity")); - result.setIRSwitch(jsonObject.getBoolean("IRSwitch")); - result.setWarningStatus(jsonObject.getInteger("warningStatus")); + result.setAutomaticDoorClosingTime(Integer.valueOf(resultMap.get("AutomaticDoorClosingTime"))); + result.setDoorRunningTimesSwitch(Integer.valueOf(resultMap.get("DoorRunningTimesSwitch"))); + result.setResidualCountDown(Integer.valueOf(resultMap.get("ResidualCountDown"))); + result.setDoorRunningTimes(Integer.valueOf(resultMap.get("DoorRunningTimes"))); + result.setGarageException(Integer.valueOf(resultMap.get("GarageException"))); + result.setCountDownConfig(Integer.valueOf(resultMap.get("CountDownConfig"))); + result.setLightSwitch(Boolean.valueOf(resultMap.get("LightSwitch"))); + result.setRemindCloseDoorConfig(Integer.valueOf(resultMap.get("RemindCloseDoorConfig"))); + result.setRemindCloseDoorSwitch(Boolean.valueOf(resultMap.get("RemindCloseDoorSwitch"))); + result.setPartOpenConfig(Integer.valueOf(resultMap.get("PartOpenConfig"))); + result.setPartOpenSwitch(Boolean.valueOf(resultMap.get("PartOpenSwitch"))); + result.setOpenPercentage(Integer.valueOf(resultMap.get("OpenPercentage"))); + result.setWorkState(Integer.valueOf(resultMap.get("WorkState"))); + result.setRouteCorrectStatus(Boolean.valueOf(resultMap.get("RouteCorrectStatus"))); + result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity"))); + result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch"))); + result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus"))); return result; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index 5dc095bd0..0517b5c23 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -163,8 +163,8 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { case 4: cmd = DeviceCtlCmd.OPT_CLOSE_GARAGE; break;//关门 case 5: cmd = DeviceCtlCmd.OPT_TOGGLE_GARAGE; break;//门体运行状态循环切换 case 6: cmd = DeviceCtlCmd.OPT_RESUME_COUNTDOWN; break;//复位照明时长 - case 7: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关 - case 8: cmd = DeviceCtlCmd.LightSwitch_true; break;//照明灯开关 开 + case 7: cmd = DeviceCtlCmd.LightSwitch_true; break;//照明灯开关 开 + case 8: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关 default: return "指令类型错误"; }