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