Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -53,6 +53,9 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     @Autowired
     private BaseBuildFacilityTypeService baseBuildFacilityTypeService;
 
+    @Autowired
+    private DmpDeviceInfoService dmpDeviceInfoService;
+
     @Override
     public void add(BaseBuild baseBuild){
 //        if(checkNameUnique(baseBuild)){
@@ -89,6 +92,14 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         if(count > 0){
             throw new BusinessException("该建筑下面有关联建筑设施，不能删除");
         }
+
+        LambdaQueryWrapper<DmpDeviceInfo> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(DmpDeviceInfo::getBuildId,baseBuild.getBuildNum());
+        Integer count1 = dmpDeviceInfoService.count(queryWrapper1);
+        if(count1 > 0){
+            throw new BusinessException("该建筑下面有关联设备，不能删除");
+        }
+
         this.removeById(id);
 
     }