修改通知去重复

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

@@ -65,7 +65,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
             MettingRecordQuery mettingRecordQuery = new MettingRecordQuery();
             //mettingRecordQuery.setMeetStatus(MeetStatusEnum.等待中.getValue());
             mettingRecordQuery.setMeetStatusList(Arrays.asList(MeetStatusEnum.等待中.getValue(), MeetStatusEnum.进行中.getValue()));
-
             mettingRecordQuery.setRoomId(entity.getRoomId());
             //查询当前日期是否存在会议室占用
             mettingRecordQuery.setMeetDate(entity.getMeetDate());
@@ -80,7 +79,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                 //校验时间段是否有重合
                 boolean bool = false;
                 for (MettingRecordEntity mettingRecord : list) {
-
                     //格式化分钟
                     Date meetTimeStart1 = DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeStart(), "yyyy-MM-dd HH:mm") + ":00");
                     Date meetTimeEnd1 = DateUtil.parseDateTime(DateUtil.format(mettingRecord.getMeetTimeEnd(), "yyyy-MM-dd HH:mm") + ":00");
@@ -103,7 +101,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                 }
             }
         }
-
         UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
         RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
         if (!ObjectUtils.isEmpty(roomEntity)) {
@@ -114,24 +111,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
     }
 
 
-    /**
-     * 判断两个时间范围是否有交集
-     *
-     * @param dynaStartTime  比较时间段开始时间
-     * @param dynaEndTime    比较时间段结束时间
-     * @param fixedStartTime 参考时间段开始时间
-     * @param fixedEndTime   参考时间段结束时间
-     * @return
-     */
-    public Boolean checkTimesHasOverlap(Date dynaStartTime, Date dynaEndTime, Date fixedStartTime, Date fixedEndTime) {
-
-        // dynaStartTime=DateUtil.date(dynaStartTime).getMinutes();
-
-
-        return !(dynaEndTime.getTime() <= fixedStartTime.getTime() || dynaStartTime.getTime() >= fixedEndTime.getTime());
-    }
-
-
    /* @Override
     protected void findAfter(MettingRecordEntity params, PageInfo pageInfo, Context context, List<MettingRecordEntity> list) throws AppException {
         BasicSetEntity basicSetEntity = basicSetService.selectOne(new BasicSetEntity());
@@ -165,6 +144,12 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
     @Override
     protected void saveBefore(MettingRecordEntity entity, Context context) throws AppException {
         super.saveBefore(entity, context);
+
+        int compare = DateUtil.compare(new Date(), entity.getMeetTimeEnd());
+        if (compare > 0) {
+            entity.setMeetStatus(MeetStatusEnum.已结束.getValue());
+        }
+
         //判断 当前时间是否在开始与结束之间
         boolean in = DateUtil.isIn(new Date(), entity.getMeetTimeStart(), entity.getMeetTimeEnd());
         if (in) {
@@ -180,9 +165,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
                 log.info("refreshMetting send msg :{}", roomDeviceEntity.getDeviceCode());
                 messageFeign.downMsg(uploadDeviceReq);
             }
-
         }
-
     }
 
 

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

@@ -69,8 +69,8 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
     protected void doListBefore(MettingRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         super.doListBefore(query, model, context);
 
-        query.setOrderColList(Arrays.asList(new OrderCol("roomId", OrderCol.DESCENDING),new OrderCol("meetTimeStart", OrderCol.DESCENDING)));
 /*        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("meetTimeStart", OrderCol.DESCENDING)));
         } else {
            // query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }*/