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,17 +133,17 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec ...@@ -134,17 +133,17 @@ 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.setRoomId(entity.getRoomId()); RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery();
RoomDeviceEntity roomDeviceEntity = roomDeviceService.selectOne(roomDeviceQuery); roomDeviceQuery.setRoomId(entity.getRoomId());
if (!ObjectUtils.isEmpty(roomDeviceEntity)) { RoomDeviceEntity roomDeviceEntity = roomDeviceService.selectOne(roomDeviceQuery);
UploadDeviceReq uploadDeviceReq = new UploadDeviceReq(); if (!ObjectUtils.isEmpty(roomDeviceEntity)) {
uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomDeviceEntity.getDeviceCode())); UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
uploadDeviceReq.setAction("refreshMetting"); uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomDeviceEntity.getDeviceCode()));
log.info("refreshMetting send deviceList :{}", JSON.toJSONString(Arrays.asList(roomDeviceEntity.getDeviceCode()))); uploadDeviceReq.setAction("refreshMetting");
messageFeign.downMsg(uploadDeviceReq); log.info("refreshMetting send deviceList :{}", JSON.toJSONString(Arrays.asList(roomDeviceEntity.getDeviceCode())));
} messageFeign.downMsg(uploadDeviceReq);
} }
} }
......
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