From a23db55a94e251fbe47506c9a8b596ad0df48ed1 Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Wed, 3 Jul 2024 10:21:47 +0800 Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/service/impl/SysIotModelServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java index 7127ea29..30acdb91 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java @@ -70,6 +70,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { QueryWrapper sysIotModelQueryWrapper = new QueryWrapper<>(); sysIotModelQueryWrapper.eq("iot_model_code", sysIotModelDto.getIotModelCode()); + sysIotModelQueryWrapper.eq("id", sysIotModelDto.getId()); SysIotModel sysIotModelQuery = sysIotModelMapper.selectOne(sysIotModelQueryWrapper); if (!(sysIotModelQuery == null)){ throw new ServiceException("更新的物模型编码code重复"); @@ -88,8 +89,8 @@ public class SysIotModelServiceImpl implements SysIotModelService { public void deleteSysIotModel(SysIotModelDto sysIotModelDto) { sysIotModelMapper.deleteById(sysIotModelDto.getId()); // 删除绑定的物模型属性和动作 - sysIotModelFieldMapper.delete(new QueryWrapper().eq("iot_model_id",sysIotModelDto.getId())); - sysIotModelServiceMapper.delete(new QueryWrapper().eq("iot_model_id",sysIotModelDto.getId())); +// sysIotModelFieldMapper.delete(new QueryWrapper().eq("iot_model_id",sysIotModelDto.getId())); +// sysIotModelServiceMapper.delete(new QueryWrapper().eq("iot_model_id",sysIotModelDto.getId())); } @Override @@ -156,6 +157,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { QueryWrapper sysIotModelFieldQueryWrapper = new QueryWrapper<>(); sysIotModelFieldQueryWrapper.eq("attribute_code", sysIotModelFieldDto.getAttributeCode()); + sysIotModelFieldQueryWrapper.eq("id", sysIotModelFieldDto.getId()); SysIotModelField sysIotModelFieldQuery = sysIotModelFieldMapper.selectOne(sysIotModelFieldQueryWrapper); if (!(sysIotModelFieldQuery == null)){ throw new ServiceException("物模型属性修改的code已经存在"); @@ -220,6 +222,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { QueryWrapper sysIotModelFieldQueryWrapper = new QueryWrapper<>(); sysIotModelFieldQueryWrapper.eq("service_code", sysIotModelServiceDto.getServiceCode()); + sysIotModelFieldQueryWrapper.eq("id", sysIotModelServiceDto.getId()); SysIotModelField sysIotModelFieldQuery = sysIotModelFieldMapper.selectOne(sysIotModelFieldQueryWrapper); if (!(sysIotModelFieldQuery == null)){ throw new ServiceException("物模型动作更新code已经存在");