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] =?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; }