Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart-office-platform

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

@@ -113,6 +113,8 @@ public class MeetSwitchTaskImpl implements ITaskExcuteService {
 
                     //通知设备进行数据更新
                     long expire = between * 60 == 0 ? between * 60 : 60;
+                    log.info("会议redis 设置过期时间:{}", expire);
+                    try {
                         boolean setnx = cacheService.setnx(RedisKey.KEY_METTING_START_CACHE, recordEntity.getId(), expire);
                         if (setnx) {
                             UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
@@ -122,6 +124,10 @@ public class MeetSwitchTaskImpl implements ITaskExcuteService {
                             log.info("preMeetStart send msg :{}", roomDeviceEntity.getDeviceCode());
                             messageFeign.downMsg(uploadDeviceReq);
                         }
+                    }catch (Exception e){
+                        log.error("设置异常",e);
+                    }
+
                 }
 
             }

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

@@ -119,7 +119,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
     protected void saveBefore(MettingRecordEntity entity, Context context) throws AppException {
         super.saveBefore(entity, context);
         checkStartAndEndTime(entity);
-
         Boolean bool = checkExistStartMeetTime(entity);
         if (bool) {
             throw new AppException("当前会议室该时段已经存在等待或进行中的会议，请选择其它时间段！");
@@ -134,6 +133,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         boolean in = DateUtil.isIn(new Date(), entity.getMeetTimeStart(), entity.getMeetTimeEnd());
         if (in) {
             entity.setMeetStatus(MeetStatusEnum.进行中.getValue());
+        }
         //发送推送通知
         RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery();
         roomDeviceQuery.setRoomId(entity.getRoomId());
@@ -146,7 +146,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
             messageFeign.downMsg(uploadDeviceReq);
         }
     }
-    }
 
 
     @Override