修改通知去重复

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

@@ -111,21 +111,26 @@ public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
                 //判断基础是否设置关闭切换通知，有则推送
                 if (!ObjectUtils.isEmpty(basicSetEntity.getMeetEnd()) && basicSetEntity.getMeetEnd() == YesNoEnum.YES.getValue()) {
                     //结束通知 通过redis 去重复
-                    long sub = DateUtil.between(pendRecordEntity.getMeetTimeStart(), pendRecordEntity.getMeetTimeEnd(), DateUnit.SECOND, true);
+
+                    RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery();
+                    roomDeviceQuery.setRoomId(pendRecordEntity.getRoomId());
+                    RoomDeviceEntity roomDeviceEntity = roomDeviceService.selectOne(roomDeviceQuery);
+                    if (ObjectUtils.isEmpty(roomDeviceEntity)) return;
+
+                    UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+                    uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomDeviceEntity.getDeviceCode()));
+                    uploadDeviceReq.setAction("postMeet");
+                    Rest<String> rest = messageFeign.downMsg(uploadDeviceReq);
+                    log.info("推送自动结束 postMeet  :{}", JSON.toJSONString(Arrays.asList(roomDeviceEntity.getDeviceCode())));
+
+
+         /*           long sub = DateUtil.between(pendRecordEntity.getMeetTimeStart(), pendRecordEntity.getMeetTimeEnd(), DateUnit.SECOND, true);
                     boolean setnx = cacheService.setnx(RedisKey.KEY_METTING_END_CACHE, pendRecordEntity.getId(), sub);
                     if (setnx) {
-                        RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery();
-                        roomDeviceQuery.setRoomId(pendRecordEntity.getRoomId());
-                        RoomDeviceEntity roomDeviceEntity = roomDeviceService.selectOne(roomDeviceQuery);
-                        if (ObjectUtils.isEmpty(roomDeviceEntity)) return;
-
-                        UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
-                        uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomDeviceEntity.getDeviceCode()));
-                        uploadDeviceReq.setAction("postMeet");
-                        Rest<String> rest = messageFeign.downMsg(uploadDeviceReq);
-                        log.info("推送自动结束 postMeet  :{}", JSON.toJSONString(Arrays.asList(roomDeviceEntity.getDeviceCode())));
-
-                    }
+
+                    }else{
+
+                    }*/
                 }
 
             }