Commit 4b7ce947 authored by 赵啸非's avatar 赵啸非

修改通知去重复

parent a6e54825
...@@ -119,7 +119,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec ...@@ -119,7 +119,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
protected void saveBefore(MettingRecordEntity entity, Context context) throws AppException { protected void saveBefore(MettingRecordEntity entity, Context context) throws AppException {
super.saveBefore(entity, context); super.saveBefore(entity, context);
checkStartAndEndTime(entity); checkStartAndEndTime(entity);
Boolean bool = checkExistStartMeetTime(entity); Boolean bool = checkExistStartMeetTime(entity);
if (bool) { if (bool) {
throw new AppException("当前会议室该时段已经存在等待或进行中的会议,请选择其它时间段!"); throw new AppException("当前会议室该时段已经存在等待或进行中的会议,请选择其它时间段!");
...@@ -134,6 +133,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec ...@@ -134,6 +133,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
boolean in = DateUtil.isIn(new Date(), entity.getMeetTimeStart(), entity.getMeetTimeEnd()); boolean in = DateUtil.isIn(new Date(), entity.getMeetTimeStart(), entity.getMeetTimeEnd());
if (in) { if (in) {
entity.setMeetStatus(MeetStatusEnum.进行中.getValue()); entity.setMeetStatus(MeetStatusEnum.进行中.getValue());
}
//发送推送通知 //发送推送通知
RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery(); RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery();
roomDeviceQuery.setRoomId(entity.getRoomId()); roomDeviceQuery.setRoomId(entity.getRoomId());
...@@ -146,7 +146,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec ...@@ -146,7 +146,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
messageFeign.downMsg(uploadDeviceReq); messageFeign.downMsg(uploadDeviceReq);
} }
} }
}
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment