Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -205,10 +205,17 @@ public class XfTermServiceImpl implements IXfTermService {
         //设备机号和设备名称必须唯一
         Long aLong = baseMapper.selectCount(Wrappers.<XfTerm>lambdaQuery()
             .ne(entity.getTermId() != null,XfTerm::getTermId, entity.getTermId())
-            .and(queryWrapper -> queryWrapper.eq(XfTerm::getTermNo, entity.getTermNo()).or().eq(XfTerm::getTermName, entity.getTermName())
+            .and(queryWrapper -> queryWrapper.eq(XfTerm::getTermNo, entity.getTermNo())
+                .or().eq(XfTerm::getTermName, entity.getTermName())
+                .or().eq(XfTerm::getTermIp, entity.getTermIp())
             ));
         if(aLong>0){
-            throw new ServiceException("设备机号重复");
+            throw new ServiceException("设备机号或设备名称或设备IP重复");
+        }
+        // 校验房间
+        PtRoomVo roomVo = roomService.queryById(entity.getRoomId());
+        if(roomVo==null){
+            throw new ServiceException("房间不存在");
         }
     }