From 6a7b9d650a4c1526f6154db2cf843814a124e692 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Sun, 25 Aug 2024 23:32:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E4=BA=BA=E5=88=99=E5=8F=96=E4=BB=A3?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=BB=91=E5=AE=9A=E7=9A=84=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EqEquipmentServiceImpl.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) 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 439368bf9..f05ea1bb1 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 @@ -281,10 +281,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { String equipmentName = equipmentCode;//暂时不存设备名称 下面从其他接口获取并存入了 equipmentCode = deviceByNameDto.getId().getId(); - LambdaQueryWrapper 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); if (!deviceServerMsgDto.getLineStatus()) throw new RuntimeException(MessageUtils.message("message.fault.device.offline")); @@ -316,7 +313,18 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { //判断是否获取到信息 无信息会抛异常 无需判断 EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class); - baseMapper.insert(add); + + LambdaQueryWrapper 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; } From ecc0694ee1e8414c2096e6ebd2d2ff735d2642d0 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Mon, 26 Aug 2024 21:59:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/web/controller/app/EqTextController.java | 3 ++- ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java index 6846a8a21..86f0ef3d1 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java @@ -523,7 +523,8 @@ public class EqTextController extends BaseController { MessageUtils.message("ble.name68"), MessageUtils.message("ble.name69"), MessageUtils.message("ble.name70"), - MessageUtils.message("ble.name71") + MessageUtils.message("ble.name71"), + MessageUtils.message("ble.name72") )); return R.ok(result); diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties index e17aabff2..24ed4a782 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -482,3 +482,4 @@ ble.name68=4. 短按“SET”键； ble.name69=观察：显示器显示“A”，此时设备开始配网； ble.name70=5.在APP上对设备进行配网，直至配网完成； ble.name71=观察：配网完成后显示器显示“11”，设备进入待机装填； +ble.name72=返回首页 From 68e72cd4815561e98a441c3d447584d05f85aff4 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Mon, 26 Aug 2024 23:54:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E4=B9=9F=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/impl/EqEquipmentServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 f05ea1bb1..0dfed554f 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 @@ -284,7 +284,10 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { 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")); + } 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 4/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E4=B9=9F=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; }