From 954a9eab8e7c2ca57218aba53773d9bbea9d88f4 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Tue, 27 Aug 2024 22:53:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A6=BB=E7=BA=BF=E4=B9=9F?= =?UTF-8?q?=E5=8F=AF=E7=BB=91=E5=AE=9A=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/web/service/IotService.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 a77e619fa..c4fdf7ebf 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 @@ -72,23 +72,23 @@ public class IotService { DeviceMsgDto result = new DeviceMsgDto(); - result.setAutomaticDoorClosingSwitch(Boolean.valueOf(resultMap.get("AutomaticDoorClosingSwitch"))); - result.setAutomaticDoorClosingTime(Integer.valueOf(resultMap.get("AutomaticDoorClosingTime"))); - result.setDoorRunningTimesSwitch(Boolean.valueOf(resultMap.get("DoorRunningTimesSwitch"))); - result.setResidualCountDown(Integer.valueOf(resultMap.get("ResidualCountDown"))); - result.setDoorRunningTimes(Integer.valueOf(resultMap.get("DoorRunningTimes"))); + result.setAutomaticDoorClosingSwitch(Boolean.valueOf(resultMap.get("AutomaticDoorClosingSwitch")==null?"false":resultMap.get("AutomaticDoorClosingSwitch"))); + result.setAutomaticDoorClosingTime(Integer.valueOf(resultMap.get("AutomaticDoorClosingTime")==null?"-1":resultMap.get("AutomaticDoorClosingTime"))); + result.setDoorRunningTimesSwitch(Boolean.valueOf(resultMap.get("DoorRunningTimesSwitch")==null?"false":resultMap.get("DoorRunningTimesSwitch"))); + result.setResidualCountDown(Integer.valueOf(resultMap.get("ResidualCountDown")==null?"-1":resultMap.get("ResidualCountDown"))); + 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.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.setCountDownConfig(Integer.valueOf(resultMap.get("CountDownConfig")==null?"-1":resultMap.get("CountDownConfig"))); + result.setLightSwitch(Boolean.valueOf(resultMap.get("LightSwitch")==null?"false":resultMap.get("LightSwitch"))); + result.setRemindCloseDoorConfig(Integer.valueOf(resultMap.get("RemindCloseDoorConfig")==null?"-1":resultMap.get("RemindCloseDoorConfig"))); + result.setRemindCloseDoorSwitch(Boolean.valueOf(resultMap.get("RemindCloseDoorSwitch")==null?"false":resultMap.get("RemindCloseDoorSwitch"))); + result.setPartOpenConfig(Integer.valueOf(resultMap.get("PartOpenConfig")==null?"-1":resultMap.get("PartOpenConfig"))); + result.setPartOpenSwitch(Boolean.valueOf(resultMap.get("PartOpenSwitch")==null?"false":resultMap.get("PartOpenSwitch"))); + 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.setRouteCorrectStatus(Boolean.valueOf(resultMap.get("RouteCorrectStatus"))); - result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity"))); - result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch"))); + result.setRouteCorrectStatus(Boolean.valueOf(resultMap.get("RouteCorrectStatus")==null?"false":resultMap.get("RouteCorrectStatus"))); + result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity")==null?"-1":resultMap.get("BounceSensitivity"))); + result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch")==null?"false":resultMap.get("IRSwitch"))); result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus")==null?"-1":resultMap.get("warningStatus"))); return result; }