修改通知去重复

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

@@ -21,7 +21,9 @@ import com.mortals.xhx.module.metting.model.MettingRecordQuery;
 import com.mortals.xhx.module.metting.service.MettingRecordService;
 import com.mortals.xhx.module.room.model.RoomDeviceEntity;
 import com.mortals.xhx.module.room.model.RoomDeviceQuery;
+import com.mortals.xhx.module.room.model.RoomEntity;
 import com.mortals.xhx.module.room.service.RoomDeviceService;
+import com.mortals.xhx.module.room.service.RoomService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +32,7 @@ import org.springframework.util.ObjectUtils;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 同步更新会议状态
@@ -50,6 +53,8 @@ public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
     private ICacheService cacheService;
     @Autowired
     private RoomDeviceService roomDeviceService;
+    @Autowired
+    private RoomService roomService;
 
 
     @Override
@@ -74,6 +79,18 @@ public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
                 recordEntity.setUpdateTime(new Date());
                 recordEntity.setUpdateUserId(1L);
                 mettingRecordService.update(recordEntity);
+
+
+                UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+                RoomEntity roomEntity = roomService.get(recordEntity.getRoomId(), null);
+                if (!ObjectUtils.isEmpty(roomEntity)) {
+                    List<String> deviceList = roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i -> i.getDeviceCode()).collect(Collectors.toList());
+                    uploadDeviceReq.setDeviceCodeList(deviceList);
+                    uploadDeviceReq.setAction("refreshMetting");
+                    messageFeign.downMsg(uploadDeviceReq);
+
+                    log.info("推送等待--》进行中:{}", JSON.toJSONString(deviceList));
+                }
             }
         }
 
@@ -82,7 +99,7 @@ public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
         List<MettingRecordEntity> pendRecordEntities = mettingRecordService.find(mettingRecordQuery);
         for (MettingRecordEntity pendRecordEntity : pendRecordEntities) {
             int compare = DateUtil.compare(new Date(), pendRecordEntity.getMeetTimeEnd());
-            if(compare>0){
+            if (compare > 0) {
           /*  boolean in = DateUtil.isIn(new Date(), pendRecordEntity.getMeetTimeStart(), pendRecordEntity.getMeetTimeEnd());
             if (!in) {*/
                 //更新状态