修改通知去重复

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

@@ -112,8 +112,6 @@ public class MeetSwitchTaskImpl implements ITaskExcuteService {
                                 return;
                             }
                         }
-
-
                     }
 
                     //通知设备进行数据更新
@@ -153,11 +151,8 @@ public class MeetSwitchTaskImpl implements ITaskExcuteService {
                             log.info("会议结束提前通知 postMeet 返回结果：{}", JSON.toJSONString(rest));
                         }
                     }
-
                 }
-
             }
-
         }
     }
 

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

@@ -2,6 +2,8 @@ package com.mortals.xhx.daemon.task;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.ITask;
@@ -17,6 +19,9 @@ import com.mortals.xhx.module.basic.service.BasicSetService;
 import com.mortals.xhx.module.metting.model.MettingRecordEntity;
 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.service.RoomDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +48,8 @@ public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
     private BasicSetService basicSetService;
     @Autowired
     private ICacheService cacheService;
+    @Autowired
+    private RoomDeviceService roomDeviceService;
 
 
     @Override
@@ -90,10 +97,17 @@ public class SyncMeetStatusTaskImpl implements ITaskExcuteService {
                     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(pendRecordEntity.getDeviceCode()));
+                        uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomDeviceEntity.getDeviceCode()));
                         uploadDeviceReq.setAction("postMeet");
-                        messageFeign.downMsg(uploadDeviceReq);
+                        Rest<String> rest = messageFeign.downMsg(uploadDeviceReq);
+                        log.info("推送自动结束 postMeet  :{}", JSON.toJSONString(rest));
+
                     }
                 }