修改通知去重复

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

@@ -61,8 +61,6 @@ public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
         mettingRecordQuery.setMeetStatus(MeetStatusEnum.等待中.getValue());
         List<MettingRecordEntity> recordEntities = mettingRecordService.find(mettingRecordQuery);
         for (MettingRecordEntity recordEntity : recordEntities) {
-
-
             if (new Date().getTime() > recordEntity.getMeetTimeStart().getTime()) {
                 //更新状态
                 recordEntity.setMeetStatus(MeetStatusEnum.进行中.getValue());
@@ -73,18 +71,19 @@ public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
         }
 
         mettingRecordQuery = new MettingRecordQuery();
-        //mettingRecordQuery.setFinishMethod(FinishMethodEnum.自动结束.getValue());
         mettingRecordQuery.setMeetStatus(MeetStatusEnum.进行中.getValue());
         List<MettingRecordEntity> pendRecordEntities = mettingRecordService.find(mettingRecordQuery);
         for (MettingRecordEntity pendRecordEntity : pendRecordEntities) {
-            boolean in = DateUtil.isIn(new Date(), pendRecordEntity.getMeetTimeStart(), pendRecordEntity.getMeetTimeEnd());
-            if (!in) {
+            int compare = DateUtil.compare(new Date(), pendRecordEntity.getMeetTimeEnd());
+            if(compare>0){
+          /*  boolean in = DateUtil.isIn(new Date(), pendRecordEntity.getMeetTimeStart(), pendRecordEntity.getMeetTimeEnd());
+            if (!in) {*/
                 //更新状态
                 pendRecordEntity.setMeetStatus(MeetStatusEnum.已结束.getValue());
                 pendRecordEntity.setFinishMethod(FinishMethodEnum.自动结束.getValue());
                 pendRecordEntity.setUpdateTime(new Date());
                 pendRecordEntity.setUpdateUserId(1L);
-                mettingRecordService.update(pendRecordEntity);
+                mettingRecordService.getDao().update(pendRecordEntity);
                 //判断基础是否设置关闭切换通知，有则推送
                 if (!ObjectUtils.isEmpty(basicSetEntity.getMeetEnd()) && basicSetEntity.getMeetEnd() == YesNoEnum.YES.getValue()) {
                     //结束通知 通过redis 去重复