修改通知去重复

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

@@ -63,7 +63,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         if (!ObjectUtils.isEmpty(meetTimeStart) && !ObjectUtils.isEmpty(meetTimeEnd)) {
             MettingRecordQuery mettingRecordQuery = new MettingRecordQuery();
             //mettingRecordQuery.setMeetStatus(MeetStatusEnum.等待中.getValue());
-            mettingRecordQuery.setMeetStatusList(Arrays.asList(MeetStatusEnum.等待中.getValue(),MeetStatusEnum.进行中.getValue()));
+            mettingRecordQuery.setMeetStatusList(Arrays.asList(MeetStatusEnum.等待中.getValue(), MeetStatusEnum.进行中.getValue()));
 
             mettingRecordQuery.setRoomId(entity.getRoomId());
             //查询当前日期是否存在会议室占用
@@ -92,7 +92,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                     throw new AppException("当前会议室该时段已经存在等待或进行中的会议，请选择其它时间段！");
                 }
             }
-
         }
 
         UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
@@ -122,7 +121,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
     @Override
     protected void findAfter(MettingRecordEntity params, PageInfo pageInfo, Context context, List<MettingRecordEntity> list) throws AppException {
         BasicSetEntity basicSetEntity = basicSetService.selectOne(new BasicSetEntity());
-        if (!ObjectUtils.isEmpty(basicSetEntity) &&!ObjectUtils.isEmpty(basicSetEntity.getPreMeetStart()) && basicSetEntity.getPreMeetStart() > 0) {
+        if (!ObjectUtils.isEmpty(basicSetEntity) && !ObjectUtils.isEmpty(basicSetEntity.getPreMeetStart()) && basicSetEntity.getPreMeetStart() > 0) {
             //会议开始前几分钟 通知设备进行数据更新
             MettingRecordQuery mettingRecordQuery = new MettingRecordQuery();
             //mettingRecordQuery.setFinishMethod(FinishMethodEnum.自动结束.getValue());
@@ -134,12 +133,12 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                     RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery();
                     roomDeviceQuery.setRoomId(recordEntity.getRoomId());
                     RoomDeviceEntity roomDeviceEntity = roomDeviceService.selectOne(roomDeviceQuery);
-                    if(!ObjectUtils.isEmpty(roomDeviceEntity)){
+                    if (!ObjectUtils.isEmpty(roomDeviceEntity)) {
                         UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
                         uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomDeviceEntity.getDeviceCode()));
                         uploadDeviceReq.setAction("preMeetStart");
                         uploadDeviceReq.setContent(JSON.toJSONString(recordEntity));
-                        log.info("preMeetStart send msg :{}",recordEntity.getDeviceCode());
+                        log.info("preMeetStart send msg :{}", recordEntity.getDeviceCode());
                         messageFeign.downMsg(uploadDeviceReq);
                     }
                 }
@@ -154,22 +153,49 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         super.saveBefore(entity, context);
         //判断 当前时间是否在开始与结束之间
         boolean in = DateUtil.isIn(new Date(), entity.getMeetTimeStart(), entity.getMeetTimeEnd());
-        if(in){
+        if (in) {
             entity.setMeetStatus(MeetStatusEnum.进行中.getValue());
             //发送推送通知
             RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery();
             roomDeviceQuery.setRoomId(entity.getRoomId());
             RoomDeviceEntity roomDeviceEntity = roomDeviceService.selectOne(roomDeviceQuery);
-            if(!ObjectUtils.isEmpty(roomDeviceEntity)){
+            if (!ObjectUtils.isEmpty(roomDeviceEntity)) {
                 UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
                 uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomDeviceEntity.getDeviceCode()));
                 uploadDeviceReq.setAction("preMeetStart");
                 uploadDeviceReq.setContent(JSON.toJSONString(entity));
-                log.info("preMeetStart send msg :{}",entity.getDeviceCode());
+                log.info("preMeetStart send msg :{}", entity.getDeviceCode());
+                messageFeign.downMsg(uploadDeviceReq);
+            }
+
+        }
+
+    }
+
+    @Override
+    public int remove(Long[] ids, Context context) throws AppException {
+        this.removeBefore(ids, context);
+
+        MettingRecordQuery mettingRecordQuery = new MettingRecordQuery();
+        mettingRecordQuery.setIdList(Arrays.asList(ids));
+
+        this.find(mettingRecordQuery).forEach(entity ->{
+            UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+            RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
+            if (!ObjectUtils.isEmpty(roomEntity)) {
+                uploadDeviceReq.setDeviceCodeList(roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i -> i.getDeviceCode()).collect(Collectors.toList()));
+                uploadDeviceReq.setAction("refreshMetting");
                 messageFeign.downMsg(uploadDeviceReq);
             }
+        });
 
+        int iRet = this.dao.delete(ids);
+        this.removeAfter(ids, context, iRet);
+        return iRet;
     }
 
+    @Override
+    protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
+        super.removeAfter(ids, context, result);
     }
 }
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java

@@ -88,6 +88,8 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
         }
     }
 
+
+
     public static void main(String[] args) {
         MettingRecordEntity mettingRecordEntity = new MettingRecordEntity();
         mettingRecordEntity.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));