修改通知去重复

smart-office-manager/src/main/java/com/mortals/xhx/daemon/task/MeetSwitchTaskImpl.java

@@ -94,22 +94,26 @@ public class MeetSwitchTaskImpl implements ITaskExcuteService {
 
                     MettingRecordEntity mettingRecordEntity = mettingRecordService.selectOne(mettingRecordQuery);
                     if (!ObjectUtils.isEmpty(mettingRecordEntity)) {
-                        if (basicSetEntity.getPostMeetStart() > 0) {
-                            //查看结束通知是否设置
-                            long mettingBetween = DateUtil.between(mettingRecordEntity.getMeetTimeStart(), new Date(), DateUnit.MINUTE);
+
+                        //判断会议是提前结束 还是自动结束
+                        if (basicSetEntity.getMeetEnd() == YesNoEnum.YES.getValue()) {
+                            long mettingBetween = DateUtil.between(mettingRecordEntity.getMeetTimeEnd(), new Date(), DateUnit.MINUTE);
                             if (mettingBetween <= basicSetEntity.getPostMeetStart()) {
                                 log.info("当前进行中的会议未结束，不推送下一个会议消息");
                                 return;
                             }
                         }
 
-                        if (basicSetEntity.getMeetEnd() == YesNoEnum.YES.getValue()) {
-                            long mettingBetween = DateUtil.between(mettingRecordEntity.getMeetTimeEnd(), new Date(), DateUnit.MINUTE);
+                        if (basicSetEntity.getPostMeetStart() > 0) {
+                            //查看结束通知是否设置
+                            long mettingBetween = DateUtil.between(mettingRecordEntity.getMeetTimeStart(), new Date(), DateUnit.MINUTE);
                             if (mettingBetween <= basicSetEntity.getPostMeetStart()) {
                                 log.info("当前进行中的会议未结束，不推送下一个会议消息");
                                 return;
                             }
                         }
+
+
                     }
 
                     //通知设备进行数据更新