修改通知去重复

smart-office-manager/src/main/java/com/mortals/xhx/common/utils/SendNotifyTask.java

+package com.mortals.xhx.common.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.util.HttpUtil;
+import com.mortals.xhx.common.pdu.UploadDeviceReq;
+import com.mortals.xhx.feign.device.IDeviceMessageFeign;
+import com.mortals.xhx.module.metting.model.MettingRecordEntity;
+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 com.mortals.xhx.utils.SpringUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
+
+
+@Slf4j
+@AllArgsConstructor
+public class SendNotifyTask implements Runnable {
+
+
+    private IDeviceMessageFeign messageFeign;
+
+    private RoomService roomService;
+
+    private RoomDeviceService roomDeviceService;
+
+    private MettingRecordEntity mettingRecordEntity;
+
+    public SendNotifyTask(MettingRecordEntity mettingRecordEntity) {
+        this.mettingRecordEntity = mettingRecordEntity;
+        this.messageFeign= SpringUtils.getBean(IDeviceMessageFeign.class);
+        this.roomService= SpringUtils.getBean(RoomService.class);
+        this.roomDeviceService= SpringUtils.getBean(RoomDeviceService.class);
+    }
+
+    @Override
+    public void run() {
+        try {
+            Thread.sleep(2000);
+            //手动结束会议 延迟发送刷新通知
+            UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+            RoomEntity roomEntity = roomService.get(mettingRecordEntity.getRoomId());
+            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("postMeet");
+                Rest<String> rest = messageFeign.downMsg(uploadDeviceReq);
+                log.info("手动结束会议记录后发送消息：{}", JSON.toJSONString(deviceList));
+            }
+
+        } catch (Exception e) {
+            log.error("异常:", e);
+        }
+    }
+}

smart-office-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

+package com.mortals.xhx.daemon.applicationservice;
+
+import com.mortals.framework.springcloud.service.IApplicationStartedService;
+import com.mortals.framework.util.ThreadPool;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class DemoStartedService implements IApplicationStartedService {
+
+
+    @Override
+    public void start() {
+        ThreadPool.getInstance().init(6);
+    }
+
+    @Override
+    public void stop() {
+        log.info("停止服务..");
+    }
+
+    @Override
+    public int getOrder() {
+        return 10;
+    }
+
+}

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.ThreadPool;
 import com.mortals.xhx.common.code.MeetStatusEnum;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.UploadDeviceReq;
+import com.mortals.xhx.common.utils.SendNotifyTask;
 import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.basic.model.BasicSetEntity;
 import com.mortals.xhx.module.basic.service.BasicSetService;
@@ -155,7 +157,9 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         //判断是否是手动结束会议
         MettingRecordEntity mettingRecordEntity = this.get(entity.getId());
         if (mettingRecordEntity.getMeetStatus() == MeetStatusEnum.进行中.getValue() && entity.getMeetStatus() == MeetStatusEnum.已结束.getValue()) {
-            //手动结束会议 发送刷新通知
+            SendNotifyTask sendNotifyTask = new SendNotifyTask(mettingRecordEntity);
+            ThreadPool.getInstance().execute(sendNotifyTask);
+/*            //手动结束会议 延迟发送刷新通知
             UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
             RoomEntity roomEntity = roomService.get(mettingRecordEntity.getRoomId(), context);
             if (!ObjectUtils.isEmpty(roomEntity)) {
@@ -164,7 +168,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                 uploadDeviceReq.setAction("postMeet");
                 Rest<String> rest = messageFeign.downMsg(uploadDeviceReq);
                 log.info("手动结束会议记录后发送消息：{}", JSON.toJSONString(deviceList));
-            }
+            }*/
         }else{
             checkStartAndEndTime(entity);
             Boolean bool = checkExistStartMeetTime(entity);
@@ -174,6 +178,11 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         }
     }
 
+    @Override
+    protected void updateAfter(MettingRecordEntity entity, Context context) throws AppException {
+        super.updateAfter(entity, context);
+    }
+
     @Override
     public int remove(Long[] ids, Context context) throws AppException {
         this.removeBefore(ids, context);